newer junit

This commit is contained in:
Julian Dolby 2015-04-06 10:00:44 -04:00
parent 65b62d3f28
commit c2b62f2ddc
21 changed files with 21 additions and 22 deletions

View File

@ -36,7 +36,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.7</version> <version>4.11</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -35,7 +35,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.7</version> <version>4.11</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -61,7 +61,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.7</version> <version>4.11</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -38,7 +38,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.7</version> <version>4.11</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -38,7 +38,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.7</version> <version>4.11</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -35,7 +35,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.7</version> <version>4.11</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -35,7 +35,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.7</version> <version>4.11</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -20,7 +20,7 @@ public class AliasingTest extends DroidBenchCGTest {
super(androidLibs, androidJavaJar, apkFile, uncalled); super(androidLibs, androidJavaJar, apkFile, uncalled);
} }
@Parameters // (name="DroidBench: {2}") @Parameters(name="DroidBench: {2}")
public static Collection<Object[]> generateData() throws IOException { public static Collection<Object[]> generateData() throws IOException {
return DroidBenchCGTest.generateData(null, androidJavaLib(), "Aliasing"); return DroidBenchCGTest.generateData(null, androidJavaLib(), "Aliasing");
} }

View File

@ -20,7 +20,7 @@ public class AndroidSpecificTest extends DroidBenchCGTest {
super(androidLibs, androidJavaJar, apkFile, uncalled); super(androidLibs, androidJavaJar, apkFile, uncalled);
} }
@Parameters // (name="DroidBench: {2}") @Parameters(name="DroidBench: {2}")
public static Collection<Object[]> generateData() throws IOException { public static Collection<Object[]> generateData() throws IOException {
return DroidBenchCGTest.generateData(null, androidJavaLib(), "AndroidSpecific"); return DroidBenchCGTest.generateData(null, androidJavaLib(), "AndroidSpecific");
} }

View File

@ -20,7 +20,7 @@ public class ArraysAndListsTest extends DroidBenchCGTest {
super(androidLibs, androidJavaJar, apkFile, uncalled); super(androidLibs, androidJavaJar, apkFile, uncalled);
} }
@Parameters // (name="DroidBench: {2}") @Parameters(name="DroidBench: {2}")
public static Collection<Object[]> generateData() throws IOException { public static Collection<Object[]> generateData() throws IOException {
return DroidBenchCGTest.generateData(null, androidJavaLib(), "ArraysAndLists"); return DroidBenchCGTest.generateData(null, androidJavaLib(), "ArraysAndLists");
} }

View File

@ -20,7 +20,7 @@ public class CallbacksTest extends DroidBenchCGTest {
super(androidLibs, androidJavaJar, apkFile, uncalled); super(androidLibs, androidJavaJar, apkFile, uncalled);
} }
@Parameters // (name="DroidBench: {2}") @Parameters(name="DroidBench: {2}")
public static Collection<Object[]> generateData() throws IOException { public static Collection<Object[]> generateData() throws IOException {
return DroidBenchCGTest.generateData(null, androidJavaLib(), "Callbacks"); return DroidBenchCGTest.generateData(null, androidJavaLib(), "Callbacks");
} }

View File

@ -17,10 +17,9 @@ import com.ibm.wala.types.MethodReference;
public class EmulatorDetectionTest extends DroidBenchCGTest { public class EmulatorDetectionTest extends DroidBenchCGTest {
public EmulatorDetectionTest(URI[] androidLibs, File androidJavaJar, String apkFile, Set<MethodReference> uncalled) { public EmulatorDetectionTest(URI[] androidLibs, File androidJavaJar, String apkFile, Set<MethodReference> uncalled) {
super(androidLibs, androidJavaJar, apkFile, uncalled); super(androidLibs, androidJavaJar, apkFile, uncalled);
// TODO Auto-generated constructor stub
} }
@Parameters // (name="DroidBench: {2}") @Parameters(name="DroidBench: {2}")
public static Collection<Object[]> generateData() throws IOException { public static Collection<Object[]> generateData() throws IOException {
return DroidBenchCGTest.generateData(null, androidJavaLib(), "EmulatorDetection"); return DroidBenchCGTest.generateData(null, androidJavaLib(), "EmulatorDetection");
} }

View File

@ -20,7 +20,7 @@ public class FieldAndObjectSensitivityTest extends DroidBenchCGTest {
super(androidLibs, androidJavaJar, apkFile, uncalled); super(androidLibs, androidJavaJar, apkFile, uncalled);
} }
@Parameters // (name="DroidBench: {2}") @Parameters(name="DroidBench: {2}")
public static Collection<Object[]> generateData() throws IOException { public static Collection<Object[]> generateData() throws IOException {
return DroidBenchCGTest.generateData(null, androidJavaLib(), "FieldAndObjectSensitivity"); return DroidBenchCGTest.generateData(null, androidJavaLib(), "FieldAndObjectSensitivity");
} }

View File

@ -20,7 +20,7 @@ public class GeneralJavaTest extends DroidBenchCGTest {
super(androidLibs, androidJavaJar, apkFile, uncalled); super(androidLibs, androidJavaJar, apkFile, uncalled);
} }
@Parameters // (name="DroidBench: {2}") @Parameters(name="DroidBench: {2}")
public static Collection<Object[]> generateData() throws IOException { public static Collection<Object[]> generateData() throws IOException {
return DroidBenchCGTest.generateData(null, androidJavaLib(), "GeneralJava"); return DroidBenchCGTest.generateData(null, androidJavaLib(), "GeneralJava");
} }

View File

@ -20,7 +20,7 @@ public class ImplicitFlowsTest extends DroidBenchCGTest {
super(androidLibs, androidJavaJar, apkFile, uncalled); super(androidLibs, androidJavaJar, apkFile, uncalled);
} }
@Parameters // (name="DroidBench: {2}") @Parameters(name="DroidBench: {2}")
public static Collection<Object[]> generateData() throws IOException { public static Collection<Object[]> generateData() throws IOException {
return DroidBenchCGTest.generateData(null, androidJavaLib(), "ImplicitFlows"); return DroidBenchCGTest.generateData(null, androidJavaLib(), "ImplicitFlows");
} }

View File

@ -19,7 +19,7 @@ public class InterAppCommunicationTest extends DroidBenchCGTest {
super(androidLibs, androidJavaJar, apkFile, uncalled); super(androidLibs, androidJavaJar, apkFile, uncalled);
} }
@Parameters // (name="DroidBench: {2}") @Parameters(name="DroidBench: {2}")
public static Collection<Object[]> generateData() throws IOException { public static Collection<Object[]> generateData() throws IOException {
return DroidBenchCGTest.generateData(null, androidJavaLib(), "InterAppCommunication"); return DroidBenchCGTest.generateData(null, androidJavaLib(), "InterAppCommunication");
} }

View File

@ -20,7 +20,7 @@ public class InterComponentCommunicationTest extends DroidBenchCGTest {
super(androidLibs, androidJavaJar, apkFile, uncalled); super(androidLibs, androidJavaJar, apkFile, uncalled);
} }
@Parameters // (name="DroidBench: {2}") @Parameters(name="DroidBench: {2}")
public static Collection<Object[]> generateData() throws IOException { public static Collection<Object[]> generateData() throws IOException {
return DroidBenchCGTest.generateData(null, androidJavaLib(), "InterComponentCommunication"); return DroidBenchCGTest.generateData(null, androidJavaLib(), "InterComponentCommunication");
} }

View File

@ -20,7 +20,7 @@ public class LifecycleTest extends DroidBenchCGTest {
super(androidLibs, androidJavaJar, apkFile, uncalled); super(androidLibs, androidJavaJar, apkFile, uncalled);
} }
@Parameters // (name="DroidBench: {2}") @Parameters(name="DroidBench: {2}")
public static Collection<Object[]> generateData() throws IOException { public static Collection<Object[]> generateData() throws IOException {
return DroidBenchCGTest.generateData(null, androidJavaLib(), "Lifecycle"); return DroidBenchCGTest.generateData(null, androidJavaLib(), "Lifecycle");
} }

View File

@ -20,7 +20,7 @@ public class ReflectionTest extends DroidBenchCGTest {
super(androidLibs, androidJavaJar, apkFile, uncalled); super(androidLibs, androidJavaJar, apkFile, uncalled);
} }
@Parameters // (name="DroidBench: {2}") @Parameters(name="DroidBench: {2}")
public static Collection<Object[]> generateData() throws IOException { public static Collection<Object[]> generateData() throws IOException {
return DroidBenchCGTest.generateData(null, androidJavaLib(), "Reflection"); return DroidBenchCGTest.generateData(null, androidJavaLib(), "Reflection");
} }

View File

@ -20,7 +20,7 @@ public class ThreadingTest extends DroidBenchCGTest {
super(androidLibs, androidJavaJar, apkFile, uncalled); super(androidLibs, androidJavaJar, apkFile, uncalled);
} }
@Parameters // (name="DroidBench: {2}") @Parameters(name="DroidBench: {2}")
public static Collection<Object[]> generateData() throws IOException { public static Collection<Object[]> generateData() throws IOException {
return DroidBenchCGTest.generateData(null, androidJavaLib(), "Threading"); return DroidBenchCGTest.generateData(null, androidJavaLib(), "Threading");
} }

View File

@ -27,7 +27,7 @@
</profile> </profile>
</profiles> </profiles>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>