improved the code to find the test root

Author: StevenArzt

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

@@ -68,7 +68,7 @@ public void resetSootAndStream() throws IOException {
 	}
 
 	public static void commonSetup() throws IOException {
-		File rootDir = getIntegrationRoot();
+		File rootDir = getIntegrationRoot(FlowDroidTests.class);
 		File testSrc = new File(new File(rootDir, "build"), "testclasses");
 		if (!testSrc.exists()) {
 			Assert.fail("Test aborted - none of the test sources are available");
@@ -191,6 +191,24 @@ protected boolean containsStmtString(InfoflowResults res, String substr) {
 		return false;
 	}
 
+	/**
+	 * Gets the root of the current project from a reference class located in that
+	 * project
+	 * 
+	 * @param referenceClass The reference class
+	 * @return The root folder of the project
+	 * @throws IOException
+	 */
+	public static File getIntegrationRoot(Class<?> referenceClass) throws IOException {
+		File f = new File(referenceClass.getProtectionDomain().getCodeSource().getLocation().getPath());
+		if (f.exists()) {
+			while (!f.getName().equals("soot-infoflow-integration") && f.getParentFile() != null)
+				f = f.getParentFile();
+			return f;
+		}
+		return getIntegrationRoot();
+	}
+
 	/**
 	 * Gets the root in which the FlowDroid main project is located
 	 * 

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

@@ -62,7 +62,7 @@ public abstract class JUnitTests extends AbstractJUnitTests {
 
 	@BeforeClass
 	public static void setUp() throws IOException {
-		File f = getInfoflowRoot();
+		File f = getInfoflowRoot(JUnitTests.class);
 		StringBuilder appPathBuilder = new StringBuilder();
 		addTestPathes(f, appPathBuilder);
 
@@ -197,6 +197,24 @@ protected void onlyForwards(IInfoflow infoflow, String message) {
 		Assume.assumeTrue("Test is only applicable on forwards analysis: " + message, infoflow instanceof Infoflow);
 	}
 
+	/**
+	 * Gets the root of the current project from a reference class located in that
+	 * project
+	 * 
+	 * @param referenceClass The reference class
+	 * @return The root folder of the project
+	 * @throws IOException
+	 */
+	public static File getInfoflowRoot(Class<?> referenceClass) throws IOException {
+		File f = new File(referenceClass.getProtectionDomain().getCodeSource().getLocation().getPath());
+		if (f.exists()) {
+			while (!f.getName().equals("soot-infoflow") && f.getParentFile() != null)
+				f = f.getParentFile();
+			return f;
+		}
+		return getInfoflowRoot();
+	}
+
 	/**
 	 * Gets the root in which the FlowDroid main project is located
 	 *