Skip to content

Commit

Permalink
Remove "extends TestCase" from TrustedCertificateStoreTest. (#1167)
Browse files Browse the repository at this point in the history
Upstreams https://r.android.com/2730693

This may be causing an issue wherein the test framework looks for unparameterized versions of tests which are nonexistent.
  • Loading branch information
prbprbprb authored Sep 12, 2023
1 parent 514d4d9 commit 932d847
Showing 1 changed file with 9 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import javax.security.auth.x500.X500Principal;
import junit.framework.TestCase;
import org.conscrypt.java.security.TestKeyStore;
import org.junit.After;
import org.junit.Before;
Expand All @@ -56,9 +55,17 @@
import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

@SuppressWarnings("unused")
@RunWith(Parameterized.class)
public class TrustedCertificateStoreTest extends TestCase {
public class TrustedCertificateStoreTest {
private static final Random tempFileRandom = new Random();

private static File dirTest;
Expand Down Expand Up @@ -409,7 +416,6 @@ public static Object[] data() {
private TrustedCertificateStore store;

@Before
@Override
public void setUp() throws Exception {
dirTest = Files.createTempDirectory("cert-store-test").toFile();
dirSystem = new File(dirTest, "system");
Expand All @@ -430,7 +436,6 @@ private void createStore() {
}

@After
@Override
public void tearDown() {
cleanStore();
}
Expand Down

0 comments on commit 932d847

Please sign in to comment.