fixed integration test initialization

Author: StevenArzt

soot-infoflow-integration/test/soot/jimple/infoflow/collections/test/junit/AliasListTests.java

@@ -3,41 +3,42 @@
 import java.util.Collections;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import soot.jimple.infoflow.IInfoflow;
 import soot.jimple.infoflow.InfoflowConfiguration;
 
 public class AliasListTests extends FlowDroidTests {
-    @Override
-    protected void setConfiguration(InfoflowConfiguration config) {
-
-    }
-
-    private static final String testCodeClass = "soot.jimple.infoflow.collections.test.AliasListTestCode";
-
-    @Test(timeout = 30000)
-    public void testShiftOnAlias1() {
-        IInfoflow infoflow = initInfoflow();
-        infoflow.getConfig().getPathConfiguration().setPathReconstructionMode(InfoflowConfiguration.PathReconstructionMode.Fast);
-        String epoint = "<" + testCodeClass + ": void " + getCurrentMethod() + "()>";
-        infoflow.computeInfoflow(appPath, libPath, Collections.singleton(epoint), sources, sinks);
-        Assert.assertEquals(getExpectedResultsForMethod(epoint), infoflow.getResults().size());
-        Assert.assertTrue(containsStmtString(infoflow.getResults(), "get(int)>(0)"));
-        Assert.assertTrue(containsStmtString(infoflow.getResults(), "get(int)>(1)"));
-        Assert.assertFalse(containsStmtString(infoflow.getResults(), "get(int)>(2)"));
-    }
-
-    @Test(timeout = 30000)
-    public void testShiftOnAlias2() {
-        IInfoflow infoflow = initInfoflow();
-        infoflow.getConfig().getPathConfiguration().setPathReconstructionMode(InfoflowConfiguration.PathReconstructionMode.Fast);
-        String epoint = "<" + testCodeClass + ": void " + getCurrentMethod() + "()>";
-        infoflow.computeInfoflow(appPath, libPath, Collections.singleton(epoint), sources, sinks);
-        Assert.assertEquals(getExpectedResultsForMethod(epoint), infoflow.getResults().size());
-        Assert.assertTrue(containsStmtString(infoflow.getResults(), "get(int)>(0)"));
-        Assert.assertTrue(containsStmtString(infoflow.getResults(), "get(int)>(1)"));
-        Assert.assertFalse(containsStmtString(infoflow.getResults(), "get(int)>(2)"));
-    }
+	@Override
+	protected void setConfiguration(InfoflowConfiguration config) {
+
+	}
+
+	private static final String testCodeClass = "soot.jimple.infoflow.collections.test.AliasListTestCode";
+
+	@Test(timeout = 30000)
+	public void testShiftOnAlias1() {
+		IInfoflow infoflow = initInfoflow();
+		infoflow.getConfig().getPathConfiguration()
+				.setPathReconstructionMode(InfoflowConfiguration.PathReconstructionMode.Fast);
+		String epoint = "<" + testCodeClass + ": void " + getCurrentMethod() + "()>";
+		infoflow.computeInfoflow(appPath, libPath, Collections.singleton(epoint), sources, sinks);
+		Assert.assertEquals(getExpectedResultsForMethod(epoint), infoflow.getResults().size());
+		Assert.assertTrue(containsStmtString(infoflow.getResults(), "get(int)>(0)"));
+		Assert.assertTrue(containsStmtString(infoflow.getResults(), "get(int)>(1)"));
+		Assert.assertFalse(containsStmtString(infoflow.getResults(), "get(int)>(2)"));
+	}
+
+	@Test(timeout = 30000)
+	public void testShiftOnAlias2() {
+		IInfoflow infoflow = initInfoflow();
+		infoflow.getConfig().getPathConfiguration()
+				.setPathReconstructionMode(InfoflowConfiguration.PathReconstructionMode.Fast);
+		String epoint = "<" + testCodeClass + ": void " + getCurrentMethod() + "()>";
+		infoflow.computeInfoflow(appPath, libPath, Collections.singleton(epoint), sources, sinks);
+		Assert.assertEquals(getExpectedResultsForMethod(epoint), infoflow.getResults().size());
+		Assert.assertTrue(containsStmtString(infoflow.getResults(), "get(int)>(0)"));
+		Assert.assertTrue(containsStmtString(infoflow.getResults(), "get(int)>(1)"));
+		Assert.assertFalse(containsStmtString(infoflow.getResults(), "get(int)>(2)"));
+	}
 }

soot-infoflow-integration/test/soot/jimple/infoflow/collections/test/junit/FlowDroidTests.java

@@ -196,11 +196,11 @@ protected boolean containsStmtString(InfoflowResults res, String substr) {
 	 * 
 	 * @return The directory in which the FlowDroid main project is located
 	 */
-	public static File getIntegrationRoot() {
-		File testRoot = new File(".");
-		if (!new File(testRoot, "src").exists())
+	public static File getIntegrationRoot() throws IOException {
+		File testRoot = new File(".").getCanonicalFile();
+		if (!new File(testRoot, "testAPKs").exists())
 			testRoot = new File(testRoot, "soot-infoflow-integration");
-		if (!new File(testRoot, "src").exists())
+		if (!new File(testRoot, "testAPKs").exists())
 			throw new RuntimeException(String.format("Test root not found in %s", testRoot.getAbsolutePath()));
 		return testRoot;
 	}

soot-infoflow-integration/test/soot/jimple/infoflow/integration/test/junit/river/BaseJUnitTests.java

@@ -5,6 +5,7 @@
 import java.util.Collection;
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 
 import soot.SootMethod;
 import soot.jimple.infoflow.AbstractInfoflow;
@@ -35,6 +36,39 @@ protected boolean isEntryPointMethod(SootMethod method) {
 		}
 	}
 
+	@BeforeClass
+	public static void setUp() throws IOException {
+		File f = getIntegrationRoot();
+		StringBuilder appPathBuilder = new StringBuilder();
+		addTestPathes(f, appPathBuilder);
+
+		File fi = new File(f, "../soot-infoflow");
+		if (!fi.getCanonicalFile().equals(f.getCanonicalFile())) {
+			addTestPathes(fi, appPathBuilder);
+		}
+		fi = new File(f, "../soot-infoflow-summaries");
+		if (!fi.getCanonicalFile().equals(f.getCanonicalFile())) {
+			addTestPathes(fi, appPathBuilder);
+		}
+		fi = new File("soot-infoflow");
+		if (fi.exists()) {
+			addTestPathes(fi, appPathBuilder);
+		}
+		fi = new File("soot-infoflow-summaries");
+		if (fi.exists()) {
+			addTestPathes(fi, appPathBuilder);
+		}
+		appPath = appPathBuilder.toString();
+
+		StringBuilder libPathBuilder = new StringBuilder();
+		addRtJarPath(libPathBuilder);
+		libPath = libPathBuilder.toString();
+		if (libPath.isEmpty())
+			throw new RuntimeException("Could not find rt.jar!");
+
+		initializeSourceSinks();
+	}
+
 	@Before
 	public void resetSootAndStream() throws IOException {
 		soot.G.reset();

soot-infoflow-integration/test/soot/jimple/infoflow/integration/test/junit/river/RiverBaseJUnitTests.java

@@ -3,11 +3,11 @@
 import soot.jimple.infoflow.InfoflowConfiguration;
 
 public abstract class RiverBaseJUnitTests extends BaseJUnitTests {
-	
-    @Override
-    protected void setConfiguration(InfoflowConfiguration config) {
-        config.setAdditionalFlowsEnabled(true);
-        config.getPathConfiguration().setPathReconstructionMode(InfoflowConfiguration.PathReconstructionMode.Fast);
-    }
-    
+
+	@Override
+	protected void setConfiguration(InfoflowConfiguration config) {
+		config.setAdditionalFlowsEnabled(true);
+		config.getPathConfiguration().setPathReconstructionMode(InfoflowConfiguration.PathReconstructionMode.Fast);
+	}
+
 }

soot-infoflow-summaries/test/soot/jimple/infoflow/test/methodSummary/junit/BaseSummaryTaintWrapperTests.java

@@ -5,7 +5,6 @@
 import static org.junit.Assert.fail;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -94,7 +93,7 @@ private void checkInfoflow(IInfoflow infoflow, int resultCount) {
 
 	protected abstract AbstractInfoflow createInfoflowInstance();
 
-	protected IInfoflow initInfoflow() throws FileNotFoundException, XMLStreamException {
+	protected IInfoflow initInfoflow() throws IOException, XMLStreamException {
 		IInfoflow result = createInfoflowInstance();
 		result.getConfig().getAccessPathConfiguration().setUseRecursiveAccessPaths(false);
 		IInfoflowConfig testConfig = new IInfoflowConfig() {
@@ -190,10 +189,18 @@ private static void appendWithSeparator(StringBuilder sb, File f) throws IOExcep
 	 * 
 	 * @return The directory in which StubDroid is located
 	 */
-	public static File getTestRoot() {
-		File testRoot = new File(".");
-		if (!new File(testRoot, "testSummaries").exists())
-			testRoot = new File(testRoot, "soot-infoflow-summaries");
+	public static File getTestRoot() throws IOException {
+		File testRoot = new File(".").getCanonicalFile();
+		if (!new File(testRoot, "testSummaries").exists()) {
+			// Try a subfolder
+			File subFolder = new File(testRoot, "soot-infoflow-summaries");
+			if (subFolder.exists())
+				testRoot = subFolder;
+			else {
+				// Try a sibling folder
+				testRoot = new File(testRoot.getParentFile(), "soot-infoflow-summaries");
+			}
+		}
 		if (!new File(testRoot, "testSummaries").exists())
 			throw new RuntimeException(String.format("Test root not found in %s", testRoot.getAbsolutePath()));
 		return testRoot;

soot-infoflow-summaries/test/soot/jimple/infoflow/test/methodSummary/junit/HierarchyTests.java

@@ -4,6 +4,7 @@
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
@@ -18,7 +19,7 @@ public class HierarchyTests {
 	protected final IMethodSummaryProvider testProvider;
 	protected final IMethodSummaryProvider manualProvider;
 
-	public HierarchyTests() {
+	public HierarchyTests() throws IOException {
 		File testRoot = BaseSummaryTaintWrapperTests.getTestRoot();
 		testProvider = new EagerSummaryProvider(new File(testRoot, "testSummaries"));
 		manualProvider = new EagerSummaryProvider(new File(testRoot, "summariesManual"));

soot-infoflow/test/soot/jimple/infoflow/test/junit/JUnitTests.java

@@ -90,6 +90,10 @@ public static void setUp() throws IOException {
 		if (libPath.isEmpty())
 			throw new RuntimeException("Could not find rt.jar!");
 
+		initializeSourceSinks();
+	}
+
+	protected static void initializeSourceSinks() {
 		sources = new ArrayList<String>();
 		sources.add(sourcePwd);
 		sources.add(sourceUserData);