hopefully fixes the test locator

Author: StevenArzt

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

@@ -16,6 +16,7 @@
 import soot.jimple.infoflow.sourcesSinks.definitions.ISourceSinkDefinition;
 import soot.jimple.infoflow.sourcesSinks.manager.BaseSourceSinkManager;
 import soot.jimple.infoflow.taintWrappers.ITaintPropagationWrapper;
+import soot.jimple.infoflow.test.base.AbstractJUnitTests;
 import soot.jimple.infoflow.test.junit.JUnitTests;
 
 /**
@@ -111,13 +112,8 @@ protected SetupApplication initApplication(File apkFile) {
 	 * 
 	 * @return The directory in which the FlowDroid main project is located
 	 */
-	public static File getIntegrationRoot() {
-		File testRoot = new File(".");
-		if (!new File(testRoot, "testAPKs").exists())
-			testRoot = new File(testRoot, "soot-infoflow-integration");
-		if (!new File(testRoot, "testAPKs").exists())
-			throw new RuntimeException(String.format("Test root not found in %s", testRoot.getAbsolutePath()));
-		return testRoot;
+	public static File getIntegrationRoot() throws IOException {
+		return AbstractJUnitTests.getInfoflowRoot(BaseJUnitTests.class, "soot-infoflow-integration");
 	}
 
 }

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

@@ -28,6 +28,7 @@
 import soot.jimple.infoflow.config.ConfigForTest;
 import soot.jimple.infoflow.results.InfoflowResults;
 import soot.jimple.infoflow.taintWrappers.EasyTaintWrapper;
+import soot.jimple.infoflow.test.base.AbstractJUnitTests;
 
 /**
  * abstract super class of all test cases which handles initialization, keeps
@@ -58,7 +59,7 @@ public abstract class JUnitTests {
 
 	@BeforeClass
 	public static void setUp() throws IOException {
-		File f = new File(".");
+		File f = AbstractJUnitTests.getInfoflowRoot(JUnitTests.class, "soot-infoflow-summaries");
 		File testSrc1 = new File(f, "bin");
 		File testSrc4 = new File(f, "testBin");
 		File testSrc2 = new File(f, "build" + File.separator + "classes");

soot-infoflow/test/soot/jimple/infoflow/test/base/AbstractJUnitTests.java

@@ -16,6 +16,8 @@
 import java.io.File;
 import java.io.IOException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import jakarta.servlet.http.HttpServlet;
@@ -28,6 +30,8 @@
  */
 public abstract class AbstractJUnitTests {
 
+	protected static final Logger logger = LoggerFactory.getLogger(AbstractJUnitTests.class);
+
 	/**
 	 * Appends the given path to the given {@link StringBuilder} if it exists
 	 * 
@@ -89,4 +93,57 @@ protected static void addRtJarPath(StringBuilder libPathBuilder) throws IOExcept
 		appendWithSeparator(libPathBuilder, new File(springJAR));
 	}
 
+	/**
+	 * Gets the root of the current project from a reference class located in that
+	 * project
+	 * 
+	 * @param referenceClass The reference class
+	 * @param moduleName     The name of the FlowDroid module for which to get the
+	 *                       root folder
+	 * @return The root folder of the project
+	 * @throws IOException
+	 */
+	public static File getInfoflowRoot(Class<?> referenceClass, String moduleName) throws IOException {
+		File classFile = new File(referenceClass.getProtectionDomain().getCodeSource().getLocation().getPath());
+		File f = classFile;
+		if (f.exists()) {
+			while (!f.getName().equals(moduleName) && f.getParentFile() != null)
+				f = f.getParentFile();
+
+			// The project root must exist and must not be the file system root
+			if (f.exists() && f.getParentFile() != null)
+				return f;
+
+			logger.warn("Finding project root from class file {} failed", classFile);
+		} else
+			logger.warn("Class file {} does not exist", classFile);
+		return getInfoflowRoot(moduleName);
+	}
+
+	/**
+	 * Gets the root in which the FlowDroid main project is located
+	 * 
+	 * @param moduleName The name of the FlowDroid module for which to get the root
+	 *                   folder
+	 * @return The directory in which the FlowDroid main project is located
+	 */
+	public static File getInfoflowRoot(String moduleName) throws IOException {
+		File testRoot = new File(".").getCanonicalFile();
+
+		if (!new File(testRoot, "src").exists()) {
+			// Try a subfolder
+			File subFolder = new File(testRoot, moduleName);
+			if (subFolder.exists())
+				testRoot = subFolder;
+			else {
+				// Try a sibling folder
+				testRoot = new File(testRoot.getParentFile(), moduleName);
+			}
+		}
+
+		if (!new File(testRoot, "src").exists())
+			throw new RuntimeException(String.format("Test root not found in %s", testRoot.getAbsolutePath()));
+		return testRoot;
+	}
+
 }

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

@@ -74,18 +74,10 @@ public static void setUp() throws IOException {
 		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();
@@ -210,20 +202,7 @@ protected void onlyForwards(IInfoflow infoflow, String message) {
 	 * @throws IOException
 	 */
 	public static File getInfoflowRoot(Class<?> referenceClass) throws IOException {
-		File classFile = new File(referenceClass.getProtectionDomain().getCodeSource().getLocation().getPath());
-		File f = classFile;
-		if (f.exists()) {
-			while (!f.getName().equals("soot-infoflow") && f.getParentFile() != null)
-				f = f.getParentFile();
-
-			// The project root must exist and must not be the file system root
-			if (f.exists() && f.getParentFile() != null)
-				return f;
-
-			logger.warn("Finding project root from class file {} failed", classFile);
-		} else
-			logger.warn("Class file {} does not exist", classFile);
-		return getInfoflowRoot();
+		return getInfoflowRoot(referenceClass, "soot-infoflow");
 	}
 
 	/**
@@ -232,22 +211,7 @@ public static File getInfoflowRoot(Class<?> referenceClass) throws IOException {
 	 * @return The directory in which the FlowDroid main project is located
 	 */
 	public static File getInfoflowRoot() throws IOException {
-		File testRoot = new File(".").getCanonicalFile();
-
-		if (!new File(testRoot, "src").exists()) {
-			// Try a subfolder
-			File subFolder = new File(testRoot, "soot-infoflow");
-			if (subFolder.exists())
-				testRoot = subFolder;
-			else {
-				// Try a sibling folder
-				testRoot = new File(testRoot.getParentFile(), "soot-infoflow");
-			}
-		}
-
-		if (!new File(testRoot, "src").exists())
-			throw new RuntimeException(String.format("Test root not found in %s", testRoot.getAbsolutePath()));
-		return testRoot;
+		return getInfoflowRoot("soot-infoflow");
 	}
 
 }