From 1867b5742546bdf1ead8de2612612120b8181d99 Mon Sep 17 00:00:00 2001
From: Julian Dolby <juliandolby@gmail.com>
Date: Thu, 20 Sep 2018 14:48:06 -0400
Subject: [PATCH] move utility so other tests can use it

---
 .../shrike/DynamicCallGraphTestBase.java      | 17 +--------------
 .../wala/core/tests/util/WalaTestCase.java    | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/shrike/DynamicCallGraphTestBase.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/shrike/DynamicCallGraphTestBase.java
index 8635d5173..36eb91e99 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/shrike/DynamicCallGraphTestBase.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/shrike/DynamicCallGraphTestBase.java
@@ -48,21 +48,6 @@ public abstract class DynamicCallGraphTestBase extends WalaTestCase {
   
   protected boolean testPatchCalls = false;
   
-  protected static String getClasspathEntry(String elt) {
-    for (String s : System.getProperty("java.class.path").split(File.pathSeparator)) {
-      if (s.indexOf(elt) >= 0) {
-        File e = new File(s);
-         Assert.assertTrue(elt + " expected to exist", e.exists());
-        if (e.isDirectory() && !s.endsWith("/")) {
-          s = s + "/";
-        }
-        return s;
-      }
-    }
-    Assert.assertFalse("cannot find " + elt, true);
-    return null;
-  }
-  
   private boolean instrumentedJarBuilt = false;
   
   private java.nio.file.Path instrumentedJarLocation;
@@ -88,7 +73,7 @@ public abstract class DynamicCallGraphTestBase extends WalaTestCase {
       
       String rtJar = null;
       for(String jar : WalaProperties.getJ2SEJarFiles()) {
-        if (jar.endsWith("rt.jar") || jar.endsWith("classes.jar")) {
+        if (jar.endsWith(File.separator + "rt.jar") || jar.endsWith(File.separator + "classes.jar")) {
           rtJar = jar;
         }
       }
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/util/WalaTestCase.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/util/WalaTestCase.java
index f7b3b8b0b..ddac9e1ed 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/util/WalaTestCase.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/util/WalaTestCase.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package com.ibm.wala.core.tests.util;
 
+import java.io.File;
 import java.io.IOException;
 
 import org.junit.After;
@@ -90,6 +91,26 @@ public abstract class WalaTestCase {
     JUnitCore.runClasses(testClass);
   }
 
+  protected static String getClasspathEntry(String elt) {
+    String result = null;
+    for (String s : System.getProperty("java.class.path").split(File.pathSeparator)) {
+      if (s.indexOf(elt) >= 0) {
+        File e = new File(s);
+         Assert.assertTrue(elt + " expected to exist", e.exists());
+        if (e.isDirectory() && !s.endsWith("/")) {
+          s = s + "/";
+        }
+        if (result == null) {
+          result = s;
+        } else {
+          result += File.pathSeparator + s;
+        }
+      }
+    }
+    Assert.assertFalse("cannot find " + elt, result == null);
+    return result;
+  }
+
   protected <T> void assertEquals(T x, T y) {
     Assert.assertEquals("Expecting " + x + ", but got " + y, x, y);
   }