diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/util/WalaTestCase.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/util/WalaTestCase.java index 6e8981146..d32e82ea2 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/util/WalaTestCase.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/util/WalaTestCase.java @@ -10,7 +10,8 @@ *******************************************************************************/ package com.ibm.wala.core.tests.util; -import org.junit.After;import org.junit.Assert; +import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.runner.JUnitCore; diff --git a/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DroidBenchCGTest.java b/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DroidBenchCGTest.java index a58859b1b..d1f369f6d 100644 --- a/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DroidBenchCGTest.java +++ b/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DroidBenchCGTest.java @@ -111,7 +111,7 @@ public abstract class DroidBenchCGTest extends DalvikCallGraphTestBase { private final File androidJavaJar; - private final String apkFile; + public final String apkFile; private final Set uncalled; @@ -122,16 +122,20 @@ public abstract class DroidBenchCGTest extends DalvikCallGraphTestBase { this.uncalled = uncalled; } - @Test - public void test() throws IOException, ClassHierarchyException, CancelException, InvalidClassFileException, IllegalArgumentException, URISyntaxException { + @Test + public void runTest() throws IOException, ClassHierarchyException, CancelException, InvalidClassFileException, IllegalArgumentException, URISyntaxException { System.err.println("testing " + apkFile + "..."); Pair> x = makeAPKCallGraph(androidLibs, androidJavaJar, apkFile, new NullProgressMonitor(), ReflectionOptions.ONE_FLOW_TO_CASTS_APPLICATION_GET_METHOD); //System.err.println(x.fst); Set bad = assertUserCodeReachable(x.fst, uncalled); - Assert.assertTrue(bad + " should be empty", bad.isEmpty()); + assertion(bad + " should be empty", bad.isEmpty()); System.err.println("...success testing " + apkFile); } - + + protected void assertion(String string, boolean empty) { + Assert.assertTrue(string, empty); + } + private static final Set skipTests = HashSetFactory.make(); static { // serialization issues