Merge branch 'develop' of github.com:secure-software-engineering/FlowDroid into develop

Author: StevenArzt

soot-infoflow-android/test/soot/jimple/infoflow/android/test/droidBench/AliasingTest.java

@@ -18,13 +18,18 @@
 
 import soot.jimple.infoflow.results.InfoflowResults;
 
-public class AliasingTest extends JUnitTests {
+public abstract class AliasingTest extends JUnitTests {
 
 	@Test(timeout=300000)
 	public void runTestFlowSensitivity1() throws IOException, XmlPullParserException {
+		int expected = 0;
+		// See also HeapTests#innerFieldReductionTestNegative
+		if (mode == TestResultMode.FLOWDROID_BACKWARDS)
+			expected = 1;
+
 		InfoflowResults res = analyzeAPKFile("Aliasing/FlowSensitivity1.apk");
 		if (res != null)
-			Assert.assertEquals(0, res.size());
+			Assert.assertEquals(expected, res.size());
 	}
 
 	@Test(timeout=300000)

soot-infoflow-android/test/soot/jimple/infoflow/android/test/droidBench/AndroidSpecificTest.java

@@ -18,7 +18,7 @@
 
 import soot.jimple.infoflow.results.InfoflowResults;
 
-public class AndroidSpecificTest extends JUnitTests {
+public abstract class AndroidSpecificTest extends JUnitTests {
 
 	@Test // (timeout=300000)
 	public void runTestApplicationModeling1() throws IOException, XmlPullParserException {

soot-infoflow-android/test/soot/jimple/infoflow/android/test/droidBench/ArrayAndListTest.java

@@ -18,7 +18,7 @@
 
 import soot.jimple.infoflow.results.InfoflowResults;
 
-public class ArrayAndListTest extends JUnitTests {
+public abstract class ArrayAndListTest extends JUnitTests {
 
 	@Test(timeout=300000)
 	public void runTestArrayAccess1() throws IOException, XmlPullParserException {

soot-infoflow-android/test/soot/jimple/infoflow/android/test/droidBench/CallbackTest.java

@@ -22,7 +22,7 @@
 import soot.jimple.infoflow.android.InfoflowAndroidConfiguration;
 import soot.jimple.infoflow.results.InfoflowResults;
 
-public class CallbackTest extends JUnitTests {
+public abstract class CallbackTest extends JUnitTests {
 
 	@Test(timeout = 300000)
 	public void runTestAnonymousClass1() throws IOException, XmlPullParserException {

soot-infoflow-android/test/soot/jimple/infoflow/android/test/droidBench/EmulatorDetectionTest.java

@@ -18,7 +18,7 @@
 
 import soot.jimple.infoflow.results.InfoflowResults;
 
-public class EmulatorDetectionTest extends JUnitTests {
+public abstract class EmulatorDetectionTest extends JUnitTests {
 
 	@Test(timeout=300000)
 	public void runTestBattery1() throws IOException, XmlPullParserException {

soot-infoflow-android/test/soot/jimple/infoflow/android/test/droidBench/FieldAndObjectSensitivityTest.java

@@ -18,7 +18,7 @@
 
 import soot.jimple.infoflow.results.InfoflowResults;
 
-public class FieldAndObjectSensitivityTest extends JUnitTests {
+public abstract class FieldAndObjectSensitivityTest extends JUnitTests {
 
 	@Test(timeout=300000)
 	public void runTestFieldSensitivity1() throws IOException, XmlPullParserException {

soot-infoflow-android/test/soot/jimple/infoflow/android/test/droidBench/FieldSourceTest.java

@@ -8,7 +8,7 @@
 
 import soot.jimple.infoflow.results.InfoflowResults;
 
-public class FieldSourceTest extends JUnitTests {
+public abstract class FieldSourceTest extends JUnitTests {
 
 	@Test
 	public void runTestFlowSensitivity1() throws IOException, XmlPullParserException {

soot-infoflow-android/test/soot/jimple/infoflow/android/test/droidBench/GeneralJavaTest.java

@@ -19,7 +19,7 @@
 
 import soot.jimple.infoflow.results.InfoflowResults;
 
-public class GeneralJavaTest extends JUnitTests {
+public abstract class GeneralJavaTest extends JUnitTests {
 
 	@Test(timeout=300000)
 	public void runTestClone1() throws IOException, XmlPullParserException {

soot-infoflow-android/test/soot/jimple/infoflow/android/test/droidBench/ImplicitFlowTest.java

@@ -20,7 +20,7 @@
 import soot.jimple.infoflow.results.InfoflowResults;
 
 //@Ignore("not implemented yet")
-public class ImplicitFlowTest extends JUnitTests {
+public abstract class ImplicitFlowTest extends JUnitTests {
 
 	@Test(timeout = 300000)
 	public void runTestImplicitFlow1() throws IOException, XmlPullParserException {

soot-infoflow-android/test/soot/jimple/infoflow/android/test/droidBench/InterAppCommunicationTest.java

@@ -9,70 +9,108 @@
 import java.io.IOException;
 
 @Ignore("Buggy, call graph problem")
-public class InterAppCommunicationTest extends JUnitTests {
+public abstract class InterAppCommunicationTest extends JUnitTests {
     @Test(timeout=300000)
     public void runTestEchoer() throws IOException, XmlPullParserException {
+        int expected = 3;
+        if (mode != TestResultMode.DROIDBENCH)
+            expected = 0;
         InfoflowResults res = analyzeAPKFile("InterAppCommunication/Echoer.apk");
-        Assert.assertEquals(3, res.size());
+        Assert.assertEquals(expected, res.size());
     }
 
     @Test(timeout=300000)
     public void runTestSendSMS() throws IOException, XmlPullParserException {
+        int expected = 3;
+        if (mode != TestResultMode.DROIDBENCH)
+            expected = 2;
         InfoflowResults res = analyzeAPKFile("InterAppCommunication/SendSMS.apk");
-        Assert.assertEquals(3, res.size());
+        Assert.assertEquals(expected, res.size());
     }
 
     @Test(timeout=300000)
     public void runTestStartActivityForResult1() throws IOException, XmlPullParserException {
+        int expected = 6;
+        if (mode != TestResultMode.DROIDBENCH)
+            expected = 2;
         InfoflowResults res = analyzeAPKFile("InterAppCommunication/StartActivityForResult1.apk");
-        Assert.assertEquals(6, res.size());
+        Assert.assertEquals(expected, res.size());
     }
 
     @Test(timeout=300000)
     public void runTestCollector() throws IOException, XmlPullParserException {
+        int expected = 2;
+        if (mode != TestResultMode.DROIDBENCH)
+            expected = 0;
         InfoflowResults res = analyzeAPKFile("InterAppCommunication/Collector/Collector.apk");
-        Assert.assertEquals(2, res.size());
+        Assert.assertEquals(expected, res.size());
     }
 
     @Test(timeout=300000)
     public void runTestDeviceId_Broadcast1() throws IOException, XmlPullParserException {
+        int expected = 1;
+        if (mode != TestResultMode.DROIDBENCH)
+            expected = 0;
         InfoflowResults res = analyzeAPKFile("InterAppCommunication/Device Id leakage/DeviceId_Broadcast1.apk");
-        Assert.assertEquals(1, res.size());
+        Assert.assertEquals(expected, res.size());
     }
 
     @Test(timeout=300000)
     public void runTestDeviceId_contentProvider1() throws IOException, XmlPullParserException {
+        int expected = 1;
+        // TODO: where are the false positives from?https://github.com/secure-software-engineering/DroidBench
+
+        if (mode == TestResultMode.FLOWDROID_BACKWARDS)
+            expected = 2;
+        else if (mode == TestResultMode.FLOWDROID_FORWARDS) {
+            expected = 3;
+        }
         InfoflowResults res = analyzeAPKFile("InterAppCommunication/Device Id leakage/DeviceId_contentProvider1.apk");
-        Assert.assertEquals(2, res.size());
+        Assert.assertEquals(expected, res.size());
     }
 
     @Test(timeout=300000)
     public void runTestDeviceId_OrderedIntent1() throws IOException, XmlPullParserException {
+        int expected = 1;
+        if (mode != TestResultMode.DROIDBENCH)
+            expected = 0;
         InfoflowResults res = analyzeAPKFile("InterAppCommunication/Device Id leakage/DeviceId_OrderedIntent1.apk");
-        Assert.assertEquals(1, res.size());
+        Assert.assertEquals(expected, res.size());
     }
 
     @Test(timeout=300000)
     public void runTestDeviceId_Service() throws IOException, XmlPullParserException {
+        int expected = 1;
+        if (mode != TestResultMode.DROIDBENCH)
+            expected = 0;
         InfoflowResults res = analyzeAPKFile("InterAppCommunication/Device Id leakage/DeviceId_Service1.apk");
-        Assert.assertEquals(1, res.size());
+        Assert.assertEquals(expected, res.size());
     }
 
     @Test(timeout=300000)
     public void runTestLocation1() throws IOException, XmlPullParserException {
+        int expected = 2;
+        if (mode != TestResultMode.DROIDBENCH)
+            expected = 0;
         InfoflowResults res = analyzeAPKFile("InterAppCommunication/Location leakage/Location1.apk");
-        Assert.assertEquals(2, res.size());
+        Assert.assertEquals(expected, res.size());
     }
 
     @Test(timeout=300000)
     public void runTestLocation1_Broadcast() throws IOException, XmlPullParserException {
+        int expected = 2;
+        if (mode != TestResultMode.DROIDBENCH)
+            expected = 0;
         InfoflowResults res = analyzeAPKFile("InterAppCommunication/Location leakage/Location_Broadcast1.apk");
-        Assert.assertEquals(2, res.size());
+        Assert.assertEquals(expected, res.size());
     }
 
     @Test(timeout=300000)
     public void runTestLocation_Service1() throws IOException, XmlPullParserException {
+        int expected = 2;
+        if (mode != TestResultMode.DROIDBENCH)
+            expected = 0;
         InfoflowResults res = analyzeAPKFile("InterAppCommunication/Location leakage/Location_Service1.apk");
-        Assert.assertEquals(2, res.size());
+        Assert.assertEquals(expected, res.size());
     }
 }