more directory excludes

Author: StevenArzt

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

@@ -299,7 +299,6 @@ public void setSootOptions(Options options, InfoflowConfiguration config) {
 
 	@BeforeClass
 	public static void setUp() throws IOException {
-		final String sep = System.getProperty("path.separator");
 		File f = new File(".");
 		File testSrc1 = new File(f, "bin");
 		File testSrc2 = new File(f, "testBin");
@@ -310,9 +309,29 @@ public static void setUp() throws IOException {
 			fail("Test aborted - none of the test sources are available");
 		}
 
-		appPath = testSrc1.getCanonicalPath() + sep + testSrc2.getCanonicalPath() + sep + testSrc3.getCanonicalPath()
-				+ sep + testSrc4.getCanonicalPath();
+		StringBuilder appPathBuilder = new StringBuilder();
+		appendWithSeparator(appPathBuilder, testSrc1);
+		appendWithSeparator(appPathBuilder, testSrc2);
+		appendWithSeparator(appPathBuilder, testSrc3);
+		appendWithSeparator(appPathBuilder, testSrc4);
+		appPath = appPathBuilder.toString();
+
 		libPath = System.getProperty("java.home") + File.separator + "lib" + File.separator + "rt.jar";
 	}
 
+	/**
+	 * Appends the given path to the given {@link StringBuilder} if it exists
+	 * 
+	 * @param sb The {@link StringBuilder} to which to append the path
+	 * @param f  The path to append
+	 * @throws IOException
+	 */
+	private static void appendWithSeparator(StringBuilder sb, File f) throws IOException {
+		if (f.exists()) {
+			if (sb.length() > 0)
+				sb.append(System.getProperty("path.separator"));
+			sb.append(f.getCanonicalPath());
+		}
+	}
+
 }

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

@@ -47,8 +47,6 @@ public abstract class TestHelper {
 
 	@BeforeClass
 	public static void setUp() throws IOException {
-		final String sep = System.getProperty("path.separator");
-
 		File f = new File(".");
 		File testSrc1 = new File(f, "testBin");
 		File testSrc2 = new File(f, "build" + File.separator + "testclasses");