diff options
Diffstat (limited to 'tests/src/test/java')
122 files changed, 164 insertions, 139 deletions
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc10x/Ajc10xTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc10x/Ajc10xTests.java index 1fb6b7045..1ee946099 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc10x/Ajc10xTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc10x/Ajc10xTests.java @@ -22,7 +22,7 @@ public class Ajc10xTests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc10x.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc11/Ajc11Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc11/Ajc11Tests.java index ff19e7954..6b1013780 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc11/Ajc11Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc11/Ajc11Tests.java @@ -22,7 +22,7 @@ public class Ajc11Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(Ajc11Tests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc11.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java index 633d4cc56..8b11ccfba 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java @@ -19,7 +19,7 @@ public class Ajc120Tests extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(Ajc120Tests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc120.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java index f7dddd8f7..1301ed779 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java @@ -9,7 +9,7 @@ * ******************************************************************/ package org.aspectj.systemtest.ajc121; -import java.io.File; +import java.net.URL; import junit.framework.Test; @@ -21,7 +21,7 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(Ajc121Tests.class); } - protected File getSpecFile() { + protected URL getSpecFile() { return getClassResource("ajc121.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java index e9348f49c..aa77443a1 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java @@ -48,7 +48,7 @@ public class AccBridgeMethods extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(AccBridgeMethods.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java index c9998d6c9..3fc84da3b 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java @@ -30,7 +30,7 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(Ajc150Tests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java index 466567641..a8a578d38 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java @@ -28,7 +28,7 @@ public class AnnotationBinding extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(AnnotationBinding.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java index 4301a44c0..00eea99db 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java @@ -11,6 +11,7 @@ package org.aspectj.systemtest.ajc150; import java.io.File; +import java.net.URL; import junit.framework.Test; @@ -26,7 +27,7 @@ public class AnnotationPointcutsTests extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(AnnotationPointcutsTests.class); } - protected File getSpecFile() { + protected URL getSpecFile() { return getClassResource("ajc150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java index e1d83a6cc..d045bb4c9 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java @@ -25,7 +25,7 @@ public class AnnotationRuntimeTests extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(AnnotationRuntimeTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java index d09a477b8..fb7a30071 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java @@ -24,7 +24,7 @@ public class Annotations extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(Annotations.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java index cec4665a7..5961f64fa 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java @@ -34,7 +34,7 @@ public class AnnotationsBinaryWeaving extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(AnnotationsBinaryWeaving.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java index 46a261e24..e03f507d8 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java @@ -26,7 +26,7 @@ public class Autoboxing extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(Autoboxing.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java index 662394969..9231b0130 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java @@ -62,7 +62,7 @@ public class CovarianceTests extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(CovarianceTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } private boolean verbose = false; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java index 28d48c6ca..cc6d446ea 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java @@ -27,7 +27,7 @@ public class DeclareAnnotationTests extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(DeclareAnnotationTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java index 7f7f8bac4..f866bfc75 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java @@ -36,7 +36,7 @@ public class Enums extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(Enums.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java index 6209298c1..a0c213462 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java @@ -36,7 +36,7 @@ public class GenericITDsDesign extends XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericsTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericsTests.java index 907e3d7a5..34bdd455c 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericsTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericsTests.java @@ -183,7 +183,7 @@ public class GenericsTests extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(GenericsTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java index 57e053b9b..fe1f5649f 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java @@ -22,7 +22,7 @@ public class HasMember extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(HasMember.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java index a9322b086..ed3428c45 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java @@ -26,7 +26,7 @@ public class MigrationTests extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(MigrationTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } /** diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java index 84b014392..eeef4a4a9 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java @@ -25,7 +25,7 @@ public class PerTypeWithinTests extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(PerTypeWithinTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/RuntimeAnnotations.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/RuntimeAnnotations.java index 676c2b014..93cfb03ce 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/RuntimeAnnotations.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/RuntimeAnnotations.java @@ -15,7 +15,7 @@ public class RuntimeAnnotations extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(RuntimeAnnotations.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java index 71b82f4e4..f6002bde7 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java @@ -22,7 +22,7 @@ public class StaticImports extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(StaticImports.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java index 0a830018e..490915b48 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java @@ -22,7 +22,7 @@ public class SuppressedWarnings extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(SuppressedWarnings.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java index 7592f7c6d..726688b87 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java @@ -29,7 +29,7 @@ public class VarargsTests extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(VarargsTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java index bfbc289f6..371823063 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc150.ataspectj; -import java.io.File; +import java.net.URL; import junit.framework.Test; @@ -27,7 +27,7 @@ public class AtAjAnnotationGenTests extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(AtAjAnnotationGenTests.class); } - protected File getSpecFile() { + protected URL getSpecFile() { return getClassResource("annotationgen.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java index 966642da2..808d14f37 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java @@ -12,6 +12,7 @@ package org.aspectj.systemtest.ajc150.ataspectj; import java.io.File; +import java.net.URL; import junit.framework.Test; @@ -27,7 +28,7 @@ public class AtAjLTWTests extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(org.aspectj.systemtest.ajc150.ataspectj.AtAjLTWTests.class); } - protected File getSpecFile() { + protected URL getSpecFile() { return getClassResource("ltw.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java index 0f13e8f8b..b1b131859 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java @@ -21,7 +21,7 @@ import org.aspectj.testing.XMLBasedAjcTestCase; */ public class AtAjMisuseTests extends XMLBasedAjcTestCase { - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("misuse.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java index 794fce907..e69219cc4 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java @@ -28,7 +28,7 @@ public class AtAjSyntaxTests extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(AtAjSyntaxTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("syntax.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/CoverageTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/CoverageTests.java index 534c7e57d..6f3e032e3 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/CoverageTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/CoverageTests.java @@ -1,6 +1,7 @@ package org.aspectj.systemtest.ajc150.ataspectj.coverage; import java.io.File; +import java.net.URL; import junit.framework.Test; import junit.framework.TestResult; @@ -35,9 +36,10 @@ public class CoverageTests extends .loadSuite(CoverageTests.class); } - protected File getSpecFile() { - return new File( - "../tests/src/org/aspectj/systemtest/ajc150/ataspectj/coverage/coverage.xml"); + protected URL getSpecFile() { + return getClassResource("coverage.xml"); +// return new File( +// "../tests/src/org/aspectj/systemtest/ajc150/ataspectj/coverage/coverage.xml"); } } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java index d73e594b9..0f7034ceb 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java @@ -12,7 +12,7 @@ public class LTWServerTests extends XMLBasedAjcTestCase { return loadSuite(LTWServerTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ltw.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java index cd6e28f64..c2b75515f 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java @@ -26,7 +26,7 @@ public class LTWTests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(LTWTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ltw.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc151/Ajc151Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc151/Ajc151Tests.java index 8928678c8..0c5bc2c80 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc151/Ajc151Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc151/Ajc151Tests.java @@ -275,7 +275,7 @@ public class Ajc151Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(Ajc151Tests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc151.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc151/AtAroundTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc151/AtAroundTests.java index 9512e8db4..f7c4eabce 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc151/AtAroundTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc151/AtAroundTests.java @@ -82,7 +82,7 @@ public class AtAroundTests extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(AtAroundTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ataround.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java index 9654c04dd..05f8660fe 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java @@ -129,7 +129,7 @@ public class NewarrayJoinpointTests extends XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("newarray_joinpoint.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc151/SerialVersionUIDTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc151/SerialVersionUIDTests.java index c1bf29475..9fbbdc504 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc151/SerialVersionUIDTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc151/SerialVersionUIDTests.java @@ -30,7 +30,7 @@ public class SerialVersionUIDTests extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(SerialVersionUIDTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("serialversionuid.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc152/Ajc152Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc152/Ajc152Tests.java index eef463214..48bc274af 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc152/Ajc152Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc152/Ajc152Tests.java @@ -11,6 +11,7 @@ package org.aspectj.systemtest.ajc152; import java.io.File; +import java.net.URL; import java.util.List; import junit.framework.Test; @@ -377,7 +378,7 @@ public class Ajc152Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(Ajc152Tests.class); } - protected File getSpecFile() { + protected URL getSpecFile() { return getClassResource("ajc152.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTests.java index 47baa2940..af4004498 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTests.java @@ -11,6 +11,7 @@ package org.aspectj.systemtest.ajc152; import java.io.File; +import java.net.URL; import junit.framework.Test; @@ -254,7 +255,7 @@ public class SynchronizationTests extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(SynchronizationTests.class); } - protected File getSpecFile() { + protected URL getSpecFile() { return getClassResource("synchronization.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java index 922f4c5b4..d599747c4 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java @@ -16,6 +16,7 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FileReader; import java.io.PrintStream; +import java.net.URL; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -299,7 +300,7 @@ public class SynchronizationTransformTests extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(SynchronizationTransformTests.class); } - protected File getSpecFile() { + protected URL getSpecFile() { return getClassResource("synchronization.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc153/Ajc153Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc153/Ajc153Tests.java index 304e34898..d021c0588 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc153/Ajc153Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc153/Ajc153Tests.java @@ -11,6 +11,7 @@ package org.aspectj.systemtest.ajc153; import java.io.File; +import java.net.URL; import junit.framework.Test; @@ -501,7 +502,7 @@ public class Ajc153Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(Ajc153Tests.class); } - protected File getSpecFile() { + protected URL getSpecFile() { return getClassResource("ajc153.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java index e26c8c90b..32c7d8072 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java @@ -12,6 +12,7 @@ package org.aspectj.systemtest.ajc153; import java.io.File; import java.io.IOException; +import java.net.URL; import java.util.Iterator; import java.util.List; @@ -546,7 +547,7 @@ public class JDTLikeHandleProviderTests extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(JDTLikeHandleProviderTests.class); } - protected File getSpecFile() { + protected URL getSpecFile() { return getClassResource("jdtlikehandleprovider.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc153/LTWServer153Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc153/LTWServer153Tests.java index b307cb30a..7918205ae 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc153/LTWServer153Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc153/LTWServer153Tests.java @@ -1,6 +1,7 @@ package org.aspectj.systemtest.ajc153; import java.io.File; +import java.net.URL; import junit.framework.Test; @@ -12,7 +13,7 @@ public class LTWServer153Tests extends XMLBasedAjcTestCase { return loadSuite(LTWServer153Tests.class); } - protected File getSpecFile() { + protected URL getSpecFile() { return getClassResource("ajc153.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc153/PipeliningTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc153/PipeliningTests.java index 9edd04515..2b3999346 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc153/PipeliningTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc153/PipeliningTests.java @@ -11,6 +11,7 @@ package org.aspectj.systemtest.ajc153; import java.io.File; +import java.net.URL; import junit.framework.Test; @@ -83,7 +84,7 @@ public class PipeliningTests extends org.aspectj.testing.XMLBasedAjcTestCase { public static Test suite() { return XMLBasedAjcTestCase.loadSuite(PipeliningTests.class); } - protected File getSpecFile() { + protected URL getSpecFile() { return getClassResource("pipelining.xml"); } }
\ No newline at end of file diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc154/Ajc154Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc154/Ajc154Tests.java index ebba76303..c088adf51 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc154/Ajc154Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc154/Ajc154Tests.java @@ -353,7 +353,7 @@ public class Ajc154Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(Ajc154Tests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc154.xml"); } 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"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc161/Ajc161Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc161/Ajc161Tests.java index cbe5e788b..14433e187 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc161/Ajc161Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc161/Ajc161Tests.java @@ -197,7 +197,7 @@ public class Ajc161Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(Ajc161Tests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc161.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc161/OptimizedAnnotationFieldBinding.java b/tests/src/test/java/org/aspectj/systemtest/ajc161/OptimizedAnnotationFieldBinding.java index 6755a3ef6..b75603b12 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc161/OptimizedAnnotationFieldBinding.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc161/OptimizedAnnotationFieldBinding.java @@ -66,7 +66,7 @@ public class OptimizedAnnotationFieldBinding extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(OptimizedAnnotationFieldBinding.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("annotationFieldBinding.xml"); } } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java index 80d85d9e8..fc1e5f945 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java @@ -60,7 +60,7 @@ public class Ajc1610Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc1610.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1610/NewFeatures.java b/tests/src/test/java/org/aspectj/systemtest/ajc1610/NewFeatures.java index 588d71186..580469e97 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1610/NewFeatures.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1610/NewFeatures.java @@ -145,7 +145,7 @@ public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase { return getClassFrom(ajc.getSandboxDirectory(), className); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("newfeatures-tests.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java index de0c20a89..d974123ee 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java @@ -122,7 +122,7 @@ public class Ajc1611Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc1611.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1611/NewFeatures.java b/tests/src/test/java/org/aspectj/systemtest/ajc1611/NewFeatures.java index 58a8f0ae2..def99671d 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1611/NewFeatures.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1611/NewFeatures.java @@ -70,7 +70,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/ajc1612/Ajc1612Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java index 347b63e17..1e358dfcc 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java @@ -413,7 +413,7 @@ public class Ajc1612Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc1612.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc162/Ajc162Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc162/Ajc162Tests.java index fb42a6351..2aca41178 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc162/Ajc162Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc162/Ajc162Tests.java @@ -216,7 +216,7 @@ public class Ajc162Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(Ajc162Tests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc162.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc163/Ajc163Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc163/Ajc163Tests.java index 15abc8921..2368c97ae 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc163/Ajc163Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc163/Ajc163Tests.java @@ -303,7 +303,7 @@ public class Ajc163Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(Ajc163Tests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc163.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc164/Ajc164Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc164/Ajc164Tests.java index 866fbb729..d65112024 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc164/Ajc164Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc164/Ajc164Tests.java @@ -416,7 +416,7 @@ public class Ajc164Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc164.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java index a8e9b6875..4505da240 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java @@ -150,7 +150,7 @@ public class DeclareMixinTests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(DeclareMixinTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("declareMixin.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc164/JointpointIdTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc164/JointpointIdTests.java index 68f769af6..24332e998 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc164/JointpointIdTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc164/JointpointIdTests.java @@ -32,7 +32,7 @@ public class JointpointIdTests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(JointpointIdTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("joinpointid.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc165/Ajc165Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc165/Ajc165Tests.java index 196e07ca1..0f05155e5 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc165/Ajc165Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc165/Ajc165Tests.java @@ -117,7 +117,7 @@ public class Ajc165Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc165.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc165/WorldTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc165/WorldTests.java index 171aee572..427f34a5e 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc165/WorldTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc165/WorldTests.java @@ -37,8 +37,9 @@ public class WorldTests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(WorldTests.class); } - protected File getSpecFile() { - return new File("../tests/src/org/aspectj/systemtest/ajc165/world.xml"); + protected java.net.URL getSpecFile() { + return getClassResource("world.xml"); +// return new File("../tests/src/org/aspectj/systemtest/ajc165/world.xml"); } }
\ No newline at end of file diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc166/Ajc166Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc166/Ajc166Tests.java index 4622ae492..37d6e09fe 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc166/Ajc166Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc166/Ajc166Tests.java @@ -98,7 +98,7 @@ public class Ajc166Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(Ajc166Tests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc166.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc167/Ajc167Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc167/Ajc167Tests.java index 7360222ba..20f34b8e3 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc167/Ajc167Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc167/Ajc167Tests.java @@ -82,7 +82,7 @@ public class Ajc167Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc167.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc167/IntertypeTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc167/IntertypeTests.java index 5aa2d4110..2c944f645 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc167/IntertypeTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc167/IntertypeTests.java @@ -70,8 +70,9 @@ public class IntertypeTests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(IntertypeTests.class); } - protected File getSpecFile() { - return new File("../tests/src/org/aspectj/systemtest/ajc167/intertype.xml"); + protected java.net.URL getSpecFile() { + return getClassResource("intertype.xml"); +// return new File("../tests/src/org/aspectj/systemtest/ajc167/intertype.xml"); } }
\ No newline at end of file diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc167/OverweavingTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc167/OverweavingTests.java index ebd66a0b5..9d8040944 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc167/OverweavingTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc167/OverweavingTests.java @@ -77,7 +77,7 @@ public class OverweavingTests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(OverweavingTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("overweaving.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc169/Ajc169Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc169/Ajc169Tests.java index 3aff31ca8..3dd0046e5 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc169/Ajc169Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc169/Ajc169Tests.java @@ -246,7 +246,7 @@ public class Ajc169Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc169.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc169/IntertypeTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc169/IntertypeTests.java index 5099a929b..64bf7c822 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc169/IntertypeTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc169/IntertypeTests.java @@ -207,7 +207,7 @@ public class IntertypeTests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("intertype.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java index a32f4f15e..61e32b98f 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java @@ -237,7 +237,7 @@ public class TransparentWeavingTests extends org.aspectj.testing.XMLBasedAjcTest } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("transparentweaving.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc170/Ajc170Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc170/Ajc170Tests.java index e0f9acab4..4449f4528 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc170/Ajc170Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc170/Ajc170Tests.java @@ -302,7 +302,7 @@ public class Ajc170Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc170.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc170/IndyTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc170/IndyTests.java index 5846a66fd..94471ca5a 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc170/IndyTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc170/IndyTests.java @@ -49,8 +49,9 @@ public class IndyTests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { - return new File("../tests/src/org/aspectj/systemtest/ajc170/indy.xml"); + protected java.net.URL getSpecFile() { + return getClassResource("indy.xml"); +// return new File("../tests/src/org/aspectj/systemtest/ajc170/indy.xml"); } } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests.java index 922ac483a..3089fcaa7 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests.java @@ -68,7 +68,7 @@ public class Ajc171Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc171.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests_need17jre.java b/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests_need17jre.java index d6faaa516..74f40c7bf 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests_need17jre.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests_need17jre.java @@ -36,8 +36,9 @@ public class Ajc171Tests_need17jre extends org.aspectj.testing.XMLBasedAjcTestCa } @Override - protected File getSpecFile() { - return new File("../tests/src/org/aspectj/systemtest/ajc171/ajc171.xml"); + protected java.net.URL getSpecFile() { + return getClassResource("ajc171.xml"); +// return new File("../tests/src/org/aspectj/systemtest/ajc171/ajc171.xml"); } } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc171/NewFeatures.java b/tests/src/test/java/org/aspectj/systemtest/ajc171/NewFeatures.java index 6a713e930..2637adf97 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc171/NewFeatures.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc171/NewFeatures.java @@ -66,8 +66,9 @@ public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { - return new File("../tests/src/org/aspectj/systemtest/ajc171/newfeatures-tests.xml"); + protected java.net.URL getSpecFile() { + return getClassResource("newfeatures-tests.xml"); +// return new File("../tests/src/org/aspectj/systemtest/ajc171/newfeatures-tests.xml"); } }
\ No newline at end of file diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc172/Ajc172Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc172/Ajc172Tests.java index c4c10d1fa..61b2e9985 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc172/Ajc172Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc172/Ajc172Tests.java @@ -203,7 +203,7 @@ public class Ajc172Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc172.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc173/Ajc173Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc173/Ajc173Tests.java index 5e007441f..c51ed28ba 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc173/Ajc173Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc173/Ajc173Tests.java @@ -77,7 +77,7 @@ public class Ajc173Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc173.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc174/Ajc174Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc174/Ajc174Tests.java index 274fc892c..6063efc89 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc174/Ajc174Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc174/Ajc174Tests.java @@ -89,7 +89,7 @@ public class Ajc174Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc174.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc175/Ajc175Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc175/Ajc175Tests.java index 2296c8e59..2a44a0a6a 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc175/Ajc175Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc175/Ajc175Tests.java @@ -35,7 +35,7 @@ public class Ajc175Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(Ajc175Tests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc175.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc180/Ajc180Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc180/Ajc180Tests.java index 558179f0a..f83f5efef 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc180/Ajc180Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc180/Ajc180Tests.java @@ -52,7 +52,7 @@ public class Ajc180Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc180.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc181/Ajc181Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc181/Ajc181Tests.java index 3aa41837e..b3a34c795 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc181/Ajc181Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc181/Ajc181Tests.java @@ -55,7 +55,7 @@ public class Ajc181Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc181.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java index 37896b42f..b8ceb9836 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java @@ -170,7 +170,7 @@ public class Ajc1810Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc1810.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java index 9aa1bff94..07096cfc0 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java @@ -83,7 +83,7 @@ public class Ajc1811Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc1811.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc182/Ajc182Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc182/Ajc182Tests.java index 545def45d..dadd926a0 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc182/Ajc182Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc182/Ajc182Tests.java @@ -43,7 +43,7 @@ public class Ajc182Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("tests.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc183/Ajc183Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc183/Ajc183Tests.java index db6878e15..d0822e40b 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc183/Ajc183Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc183/Ajc183Tests.java @@ -92,7 +92,7 @@ public class Ajc183Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc183.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc184/Ajc184Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc184/Ajc184Tests.java index 7e1265a0b..86cda03b3 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc184/Ajc184Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc184/Ajc184Tests.java @@ -113,7 +113,7 @@ public class Ajc184Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc184.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc185/Ajc185Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc185/Ajc185Tests.java index 77b453188..64b004222 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc185/Ajc185Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc185/Ajc185Tests.java @@ -61,7 +61,7 @@ public class Ajc185Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc185.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java index 1625f96d1..31627ebaa 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java @@ -155,7 +155,7 @@ public class Ajc186Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc186.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc187/Ajc187Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc187/Ajc187Tests.java index 4ff34b28e..e2d2f1b63 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc187/Ajc187Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc187/Ajc187Tests.java @@ -56,7 +56,7 @@ public class Ajc187Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc187.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc188/Ajc188Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc188/Ajc188Tests.java index c2f5e888c..f53d4241d 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc188/Ajc188Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc188/Ajc188Tests.java @@ -48,7 +48,7 @@ public class Ajc188Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc188.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc189/Ajc189Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc189/Ajc189Tests.java index 456c4a41f..7aace8d1e 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc189/Ajc189Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc189/Ajc189Tests.java @@ -66,7 +66,7 @@ public class Ajc189Tests extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc189.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc190/Ajc190Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc190/Ajc190Tests.java index 3d3659f77..9cee2b64d 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc190/Ajc190Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc190/Ajc190Tests.java @@ -50,7 +50,7 @@ public class Ajc190Tests extends XMLBasedAjcTestCaseForJava9OrLater { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc190.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc190/Annotations.java b/tests/src/test/java/org/aspectj/systemtest/ajc190/Annotations.java index d573a4d33..996af3901 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc190/Annotations.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc190/Annotations.java @@ -27,7 +27,7 @@ public class Annotations extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(Annotations.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc190_from150.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc190/EfficientTJPTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc190/EfficientTJPTests.java index 3564f9469..8cd2dbef2 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc190/EfficientTJPTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc190/EfficientTJPTests.java @@ -101,7 +101,7 @@ public class EfficientTJPTests extends XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("features190.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc190/ModuleTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc190/ModuleTests.java index 08d7f500f..03c6ebe27 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc190/ModuleTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc190/ModuleTests.java @@ -172,7 +172,7 @@ public class ModuleTests extends XMLBasedAjcTestCaseForJava9OrLater { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc190.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc190/SanityTests19.java b/tests/src/test/java/org/aspectj/systemtest/ajc190/SanityTests19.java index 5544022c4..f9aed0d5a 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc190/SanityTests19.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc190/SanityTests19.java @@ -146,7 +146,7 @@ public class SanityTests19 extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(SanityTests19.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("sanity-tests-19.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc191/Ajc191Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc191/Ajc191Tests.java index 230a9128d..f009ddee5 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc191/Ajc191Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc191/Ajc191Tests.java @@ -41,7 +41,7 @@ public class Ajc191Tests extends XMLBasedAjcTestCaseForJava10OrLater { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc191.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc191/SanityTestsJava10.java b/tests/src/test/java/org/aspectj/systemtest/ajc191/SanityTestsJava10.java index f4b8f3698..34490efb0 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc191/SanityTestsJava10.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc191/SanityTestsJava10.java @@ -91,7 +91,7 @@ public class SanityTestsJava10 extends org.aspectj.testing.XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("sanity-tests-10.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc192/Ajc192Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc192/Ajc192Tests.java index ea1215b2d..fa1fb2907 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc192/Ajc192Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc192/Ajc192Tests.java @@ -91,7 +91,7 @@ public class Ajc192Tests extends XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc192.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc192/SanityTestsJava11.java b/tests/src/test/java/org/aspectj/systemtest/ajc192/SanityTestsJava11.java index e14ec33df..8cc449fe1 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc192/SanityTestsJava11.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc192/SanityTestsJava11.java @@ -92,7 +92,7 @@ public class SanityTestsJava11 extends XMLBasedAjcTestCaseForJava11OrLater { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("sanity-tests-11.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc193/Ajc193Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc193/Ajc193Tests.java index e0d6a2ede..1199db262 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc193/Ajc193Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc193/Ajc193Tests.java @@ -137,7 +137,7 @@ public class Ajc193Tests extends XMLBasedAjcTestCaseForJava10OrLater { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("ajc193.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/apt/AptTests.java b/tests/src/test/java/org/aspectj/systemtest/apt/AptTests.java index 01ab16ca0..af9d8af9c 100644 --- a/tests/src/test/java/org/aspectj/systemtest/apt/AptTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/apt/AptTests.java @@ -58,7 +58,7 @@ public class AptTests extends XMLBasedAjcTestCase { } @Override - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("apt-spec.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/aspectpath/AspectPathTests.java b/tests/src/test/java/org/aspectj/systemtest/aspectpath/AspectPathTests.java index 3a77d2778..4b5a4d449 100644 --- a/tests/src/test/java/org/aspectj/systemtest/aspectpath/AspectPathTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/aspectpath/AspectPathTests.java @@ -19,7 +19,7 @@ public class AspectPathTests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(AspectPathTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("aspectpath.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/base/BaseTests.java b/tests/src/test/java/org/aspectj/systemtest/base/BaseTests.java index e85d327c7..76c4e164a 100644 --- a/tests/src/test/java/org/aspectj/systemtest/base/BaseTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/base/BaseTests.java @@ -19,7 +19,7 @@ public class BaseTests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(BaseTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("baseTests.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/bringup/BringUpTests.java b/tests/src/test/java/org/aspectj/systemtest/bringup/BringUpTests.java index 3eb98775e..7af3476ee 100644 --- a/tests/src/test/java/org/aspectj/systemtest/bringup/BringUpTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/bringup/BringUpTests.java @@ -25,8 +25,9 @@ public class BringUpTests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(BringUpTests.class); } - protected File getSpecFile() { - return new File("../tests/src/org/aspectj/systemtest/bringup/bringup.xml"); + protected java.net.URL getSpecFile() { + return getClassResource("bringup.xml"); +// return new File("../tests/src/org/aspectj/systemtest/bringup/bringup.xml"); } public void testEmptyClass() { diff --git a/tests/src/test/java/org/aspectj/systemtest/design/DesignTests.java b/tests/src/test/java/org/aspectj/systemtest/design/DesignTests.java index 3a19663a6..a187c9619 100644 --- a/tests/src/test/java/org/aspectj/systemtest/design/DesignTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/design/DesignTests.java @@ -19,7 +19,7 @@ public class DesignTests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(DesignTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("design.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java index a499e1421..55e624d09 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java @@ -24,14 +24,10 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(IncrementalTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("incremental.xml"); } - - /* (non-Javadoc) - * @see org.aspectj.testing.XMLBasedAjcTestCase#setUp() - */ protected void setUp() throws Exception { super.setUp(); AjState.FORCE_INCREMENTAL_DURING_TESTING = true; diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java index a2ce02c0c..68d9d6d3a 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java @@ -23,7 +23,7 @@ public class IncrementalModelTests extends org.aspectj.testing.XMLBasedAjcTestCa return XMLBasedAjcTestCase.loadSuite(IncrementalModelTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("incremental-model.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java index cd80218b2..620b06b0a 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java @@ -16,6 +16,7 @@ import java.util.Hashtable; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.StringTokenizer; import org.aspectj.ajde.core.ICompilerConfiguration; import org.aspectj.ajde.core.IOutputLocationManager; @@ -67,12 +68,13 @@ public class MultiProjTestCompilerConfiguration implements ICompilerConfiguratio sb.append(File.pathSeparator + dir.getAbsolutePath()); } String cp = sb.toString() + File.pathSeparator + new File(AjdeInteractionTestbed.testdataSrcDir) + File.pathSeparator - + System.getProperty("sun.boot.class.path") + File.pathSeparator + "../runtime/bin" + File.pathSeparator + + System.getProperty("sun.boot.class.path") + File.pathSeparator + "../runtime/target/classes" + File.pathSeparator + this.classPath + File.pathSeparator + System.getProperty("aspectjrt.path") + File.pathSeparator + "../lib/junit/junit.jar" + "c:/batik/batik-1.6/lib/batik-util.jar;" + "c:/batik/batik-1.6/lib/batik-awt-util.jar;" + "c:/batik/batik-1.6/lib/batik-dom.jar;" + "c:/batik/batik-1.6/lib/batik-svggen.jar;" + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "test" + File.separator + "aspectjrt.jar"; + verifyClasspath(cp); if (LangUtil.is19VMOrGreater()) { cp = LangUtil.getJrtFsFilePath() + File.pathSeparator + cp; } @@ -87,6 +89,14 @@ public class MultiProjTestCompilerConfiguration implements ICompilerConfiguratio return cp; } + public static void verifyClasspath(String cp) { + StringTokenizer st = new StringTokenizer(cp,File.pathSeparator); + while (st.hasMoreElements()) { + String cpElement = st.nextToken(); + System.out.println("Checking: "+cpElement+" exists? "+new File(cpElement).exists()); + } + } + public Set<File> getInpath() { log("ICompilerConfiguration.getInPath()"); return inpath; diff --git a/tests/src/test/java/org/aspectj/systemtest/inpath/InPathTests.java b/tests/src/test/java/org/aspectj/systemtest/inpath/InPathTests.java index ec2fd8d7b..895438dfd 100644 --- a/tests/src/test/java/org/aspectj/systemtest/inpath/InPathTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/inpath/InPathTests.java @@ -19,7 +19,7 @@ public class InPathTests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(InPathTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("inpath.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/java14/Java14Tests.java b/tests/src/test/java/org/aspectj/systemtest/java14/Java14Tests.java index d71b2ba4f..94c3f79d9 100644 --- a/tests/src/test/java/org/aspectj/systemtest/java14/Java14Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/java14/Java14Tests.java @@ -22,7 +22,7 @@ public class Java14Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(Java14Tests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("java14.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/knownfailures/KnownfailuresTests.java b/tests/src/test/java/org/aspectj/systemtest/knownfailures/KnownfailuresTests.java index 52a626545..b40099a89 100644 --- a/tests/src/test/java/org/aspectj/systemtest/knownfailures/KnownfailuresTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/knownfailures/KnownfailuresTests.java @@ -24,8 +24,9 @@ public class KnownfailuresTests extends org.aspectj.testing.XMLBasedAjcTestCase return XMLBasedAjcTestCase.loadSuite(KnownfailuresTests.class); } - protected File getSpecFile() { - return new File("../tests/src/org/aspectj/systemtest/knownfailures/knownfailures.xml"); + protected java.net.URL getSpecFile() { + return getClassResource("knownFailures.xml"); +// return new File("../tests/src/org/aspectj/systemtest/knownfailures/knownfailures.xml").toURI().toURL(); } diff --git a/tests/src/test/java/org/aspectj/systemtest/knownlimitations/KnownLimitationsTests.java b/tests/src/test/java/org/aspectj/systemtest/knownlimitations/KnownLimitationsTests.java index 556c66f1e..b6672698a 100644 --- a/tests/src/test/java/org/aspectj/systemtest/knownlimitations/KnownLimitationsTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/knownlimitations/KnownLimitationsTests.java @@ -19,8 +19,9 @@ public class KnownLimitationsTests extends org.aspectj.testing.XMLBasedAjcTestCa return XMLBasedAjcTestCase.loadSuite(KnownLimitationsTests.class); } - protected File getSpecFile() { - return new File("../tests/src/org/aspectj/systemtest/knownlimitations/knownlimitations.xml"); + protected java.net.URL getSpecFile() { + return getClassResource("knownlimitations.xml"); +// return new File("../tests/src/org/aspectj/systemtest/knownlimitations/knownlimitations.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/model/Model5Tests.java b/tests/src/test/java/org/aspectj/systemtest/model/Model5Tests.java index 3176803e4..b8a000d71 100644 --- a/tests/src/test/java/org/aspectj/systemtest/model/Model5Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/model/Model5Tests.java @@ -86,7 +86,7 @@ public class Model5Tests extends ModelTestCase { return XMLBasedAjcTestCase.loadSuite(Model5Tests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("model.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/model/ModelTests.java b/tests/src/test/java/org/aspectj/systemtest/model/ModelTests.java index 26b3887f7..aa57f1abf 100644 --- a/tests/src/test/java/org/aspectj/systemtest/model/ModelTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/model/ModelTests.java @@ -107,7 +107,7 @@ public class ModelTests extends ModelTestCase { return XMLBasedAjcTestCase.loadSuite(ModelTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("model.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/options/OptionsTests.java b/tests/src/test/java/org/aspectj/systemtest/options/OptionsTests.java index 80710a6ed..d1309442c 100644 --- a/tests/src/test/java/org/aspectj/systemtest/options/OptionsTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/options/OptionsTests.java @@ -19,7 +19,7 @@ public class OptionsTests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(OptionsTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("options.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/pre10x/AjcPre10xTests.java b/tests/src/test/java/org/aspectj/systemtest/pre10x/AjcPre10xTests.java index be240a9be..33eb11691 100644 --- a/tests/src/test/java/org/aspectj/systemtest/pre10x/AjcPre10xTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/pre10x/AjcPre10xTests.java @@ -19,7 +19,7 @@ public class AjcPre10xTests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(AjcPre10xTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("pre10x.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/purejava/PureJavaTests.java b/tests/src/test/java/org/aspectj/systemtest/purejava/PureJavaTests.java index 05f2774a5..4d5a0d2b8 100644 --- a/tests/src/test/java/org/aspectj/systemtest/purejava/PureJavaTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/purejava/PureJavaTests.java @@ -19,8 +19,9 @@ public class PureJavaTests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(PureJavaTests.class); } - protected File getSpecFile() { - return new File("../tests/src/org/aspectj/systemtest/pureJava/pureJava.xml"); + protected java.net.URL getSpecFile() { + return getClassResource("pureJava.xml"); +// return new File("../tests/src/org/aspectj/systemtest/pureJava/pureJava.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/serialVerUID/SUIDTests.java b/tests/src/test/java/org/aspectj/systemtest/serialVerUID/SUIDTests.java index 50c5dc216..24028f164 100644 --- a/tests/src/test/java/org/aspectj/systemtest/serialVerUID/SUIDTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/serialVerUID/SUIDTests.java @@ -19,7 +19,7 @@ public class SUIDTests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(SUIDTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("serialVerUID.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/tracing/TracingTests.java b/tests/src/test/java/org/aspectj/systemtest/tracing/TracingTests.java index 3e8b6d8db..909cb025b 100644 --- a/tests/src/test/java/org/aspectj/systemtest/tracing/TracingTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/tracing/TracingTests.java @@ -22,7 +22,7 @@ public class TracingTests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(TracingTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("tracing.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/xlint/XLint5Tests.java b/tests/src/test/java/org/aspectj/systemtest/xlint/XLint5Tests.java index 35e5b05ca..2df75fd6f 100644 --- a/tests/src/test/java/org/aspectj/systemtest/xlint/XLint5Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/xlint/XLint5Tests.java @@ -22,7 +22,7 @@ public class XLint5Tests extends XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(XLint5Tests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("xlint.xml"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/xlint/XLintTests.java b/tests/src/test/java/org/aspectj/systemtest/xlint/XLintTests.java index c5a2b7fdf..c50a0e6bb 100644 --- a/tests/src/test/java/org/aspectj/systemtest/xlint/XLintTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/xlint/XLintTests.java @@ -22,7 +22,7 @@ public class XLintTests extends org.aspectj.testing.XMLBasedAjcTestCase { return XMLBasedAjcTestCase.loadSuite(XLintTests.class); } - protected File getSpecFile() { + protected java.net.URL getSpecFile() { return getClassResource("xlint.xml"); } diff --git a/tests/src/test/java/org/aspectj/tests/TestsModuleTests.java b/tests/src/test/java/org/aspectj/tests/TestsModuleTests.java index 4a6cb6a3a..672a95299 100644 --- a/tests/src/test/java/org/aspectj/tests/TestsModuleTests.java +++ b/tests/src/test/java/org/aspectj/tests/TestsModuleTests.java @@ -23,7 +23,6 @@ import org.aspectj.systemtest.AllTests18; import org.aspectj.systemtest.AllTests19; import org.aspectj.util.LangUtil; -// missing 'e' so maven don't pick it up ;) public class TestsModuleTests extends TestCase { public static Test suite() { |