Fix getSpecFile() to work with URLs and adjust installer unpacker

5 files changed, 5 insertions, 5 deletions

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/Ajc160Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc160/Ajc160Tests.java
index 5f5162b0d..31d2ba8eb 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc160/Ajc160Tests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc160/Ajc160Tests.java
@@ -147,7 +147,7 @@ public class Ajc160Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 		return XMLBasedAjcTestCase.loadSuite(Ajc160Tests.class);
 	}
 
-	protected File getSpecFile() {
+	protected java.net.URL getSpecFile() {
 		return getClassResource("ajc160.xml");
 	}
 
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/AnnotationValueMatchingTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc160/AnnotationValueMatchingTests.java
index d26cb9856..bcaed869b 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc160/AnnotationValueMatchingTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc160/AnnotationValueMatchingTests.java
@@ -49,7 +49,7 @@ public class AnnotationValueMatchingTests extends XMLBasedAjcTestCase {
 	    return XMLBasedAjcTestCase.loadSuite(AnnotationValueMatchingTests.class);
 	}
 
-	protected File getSpecFile() {
+	protected java.net.URL getSpecFile() {
 	    return getClassResource("annotationValueMatching.xml");
 	}
 }
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/NewFeatures.java b/tests/src/test/java/org/aspectj/systemtest/ajc160/NewFeatures.java
index 03c8d4f50..acdcf3cc6 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc160/NewFeatures.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc160/NewFeatures.java
@@ -27,7 +27,7 @@ public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase {
     return XMLBasedAjcTestCase.loadSuite(NewFeatures.class);
   }
 
-  protected File getSpecFile() {
+  protected java.net.URL getSpecFile() {
     return getClassResource("newfeatures-tests.xml");
   }
 
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/ParameterAnnotationMatchingTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc160/ParameterAnnotationMatchingTests.java
index 95a3f218f..c87697138 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc160/ParameterAnnotationMatchingTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc160/ParameterAnnotationMatchingTests.java
@@ -92,7 +92,7 @@ public class ParameterAnnotationMatchingTests extends XMLBasedAjcTestCase {
 	    return XMLBasedAjcTestCase.loadSuite(ParameterAnnotationMatchingTests.class);
 	}
 
-	protected File getSpecFile() {
+	protected java.net.URL getSpecFile() {
 	    return getClassResource("parameterAnnotations.xml");
 	}
 }
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/SanityTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc160/SanityTests.java
index 45eac49ce..157fdc6ce 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc160/SanityTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc160/SanityTests.java
@@ -156,7 +156,7 @@ public class SanityTests extends org.aspectj.testing.XMLBasedAjcTestCase {
 		return XMLBasedAjcTestCase.loadSuite(SanityTests.class);
 	}
 
-	protected File getSpecFile() {
+	protected java.net.URL getSpecFile() {
 		return getClassResource("sanity-tests.xml");
 	}