Revert "Fix more LTW tests"

This reverts commit 63d5e3e893bd149245465de1610716930998dec8.

diff --git a/testing/src/test/java/org/aspectj/testing/RunSpec.java b/testing/src/test/java/org/aspectj/testing/RunSpec.java
index 181eb906274d21b17b16f20d7b248f4b8da44791..c50b40f76c50238f47501bf1712c0c8e5dfc9ca7 100644 (file)
--- a/testing/src/test/java/org/aspectj/testing/RunSpec.java
+++ b/testing/src/test/java/org/aspectj/testing/RunSpec.java
@@ -22,7 +22,7 @@ import java.util.StringTokenizer;
 import org.aspectj.tools.ajc.AjcTestCase;
 import org.aspectj.util.FileUtil;
 
-import static org.aspectj.util.LangUtil.is9VMOrGreater;
+import static org.aspectj.util.LangUtil.is16VMOrGreater;
 
 /**
  * @author Adrian Colyer
@@ -75,7 +75,7 @@ public class RunSpec implements ITestStep {
                        // The reason for setting this parameter for Java 9+ instead of 16+ is that it helps to avoid the JVM printing
                        // unwanted illegal access warnings during weaving in 'useFullLTW' mode, either making existing tests fail or
                        // having to assert on the warning messages.
-                       vmargs += is9VMOrGreater() ? " --add-opens java.base/java.lang=ALL-UNNAMED" : "";
+                       vmargs += is16VMOrGreater() ? " --add-opens java.base/java.lang=ALL-UNNAMED" : "";
 
                        AjcTestCase.RunResult rr = inTestCase.run(getClassToRun(), getModuleToRun(), args, vmargs, getClasspath(), getModulepath(), useLtw, "true".equalsIgnoreCase(usefullltw));
 

diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw.xml
index 66cd3cfbfe03d67caa23ac7aec6ec9aecc9c61a2..652ddecd5d387f60601bde8b6ef2f4dfcb7df24a 100644 (file)
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw.xml
@@ -221,7 +221,7 @@
                        <line text="Main.test1" />
                        <line text="Main.test2" />
                </stdout>
-               <stderr ordered="no">
+               <stderr>
                        <line text="info AspectJ Weaver Version" />
                        <line text="info register classloader" />
                        <line text="info using" />
@@ -229,33 +229,6 @@
                        <line text="debug weaving 'ConcreteAspect'" />
                        <line text="debug generating class 'ConcreteAspect'" />
                        <line text="debug weaving 'Main'" />
-
-                       <!-- In full LTW mode with weaver option '-debug' in aop.xml, the weaver prints this -->
-                       <line text="debug cannot weave 'org.aspectj.lang.Signature'" />
-                       <line text="debug cannot weave 'org.aspectj.runtime.reflect.Factory'" />
-                       <line text="debug cannot weave 'org.aspectj.lang.JoinPoint$StaticPart'" />
-                       <line text="debug cannot weave 'org.aspectj.lang.JoinPoint$EnclosingStaticPart'" />
-                       <line text="debug cannot weave 'org.aspectj.lang.JoinPoint'" />
-                       <line text="debug cannot weave 'org.aspectj.lang.reflect.MethodSignature'" />
-                       <line text="debug cannot weave 'org.aspectj.lang.reflect.CodeSignature'" />
-                       <line text="debug cannot weave 'org.aspectj.lang.reflect.MemberSignature'" />
-                       <line text="debug cannot weave 'org.aspectj.lang.reflect.ConstructorSignature'" />
-                       <line text="debug cannot weave 'org.aspectj.lang.reflect.FieldSignature'" />
-                       <line text="debug cannot weave 'org.aspectj.lang.reflect.AdviceSignature'" />
-                       <line text="debug cannot weave 'org.aspectj.lang.reflect.CatchClauseSignature'" />
-                       <line text="debug cannot weave 'org.aspectj.lang.reflect.LockSignature'" />
-                       <line text="debug cannot weave 'org.aspectj.lang.reflect.UnlockSignature'" />
-                       <line text="debug cannot weave 'org.aspectj.lang.reflect.InitializerSignature'" />
-                       <line text="debug cannot weave 'org.aspectj.lang.reflect.SourceLocation'" />
-                       <line text="debug cannot weave 'org.aspectj.runtime.reflect.MethodSignatureImpl'" />
-                       <line text="debug cannot weave 'org.aspectj.runtime.reflect.CodeSignatureImpl'" />
-                       <line text="debug cannot weave 'org.aspectj.runtime.reflect.MemberSignatureImpl'" />
-                       <line text="debug cannot weave 'org.aspectj.runtime.reflect.SignatureImpl'" />
-                       <line text="debug cannot weave 'org.aspectj.runtime.reflect.SignatureImpl$Cache'" />
-                       <line text="debug cannot weave 'org.aspectj.runtime.reflect.JoinPointImpl$StaticPartImpl'" />
-                       <line text="debug cannot weave 'org.aspectj.runtime.reflect.SourceLocationImpl'" />
-                       <line text="debug cannot weave 'org.aspectj.lang.NoAspectBoundException'" />
-
                        <line text="AbstractSuperAspect.before_test1" />
                </stderr>
        </run>
@@ -271,7 +244,7 @@
                        text="this affected type is not exposed to the weaver: TestITDMethod" />
        </compile>
        <run class="TestITDMethod" options="test"
-               ltw="aop-abstractaspect.xml" usefullltw="true">
+               ltw="aop-abstractaspect.xml">
                <stdout>
                        <line text="TestITDMethod.main" />
                </stdout>

diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc1612/ajc1612.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc1612/ajc1612.xml
index 5a8556d80f083960d78177cdb04930b679f413cf..650bdea43a66a1543aaaf71c9b05621f7f5ee474 100644 (file)
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc1612/ajc1612.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc1612/ajc1612.xml
@@ -13,7 +13,7 @@
 
  <ajc-test dir="bugs1612/xmldefs" title="xml defined advice">
      <compile files="Hello.java JavaHelper.java"/>
-     <run class="Hello" ltw="aop.xml" usefullltw="true">
+     <run class="Hello" ltw="aop.xml">
        <stdout>
            <line text="Hello"/>
            <line text="in advice"/>