diff options
Diffstat (limited to 'tests')
8 files changed, 33 insertions, 31 deletions
diff --git a/tests/ajcHarnessTests.xml b/tests/ajcHarnessTests.xml index a11ba3ba7..31b04a66e 100644 --- a/tests/ajcHarnessTests.xml +++ b/tests/ajcHarnessTests.xml @@ -180,7 +180,6 @@ keywords="purejava"> <compile classpath="classesDir,jars/required.jar" files="Main.java" - options="-Xreweavable" outjar="main.zip"/> <compile classpath="classesDir,jars/required.jar" aspectpath="jars/requiredAspects.jar,jars/AspectMain.jar" @@ -639,7 +638,7 @@ Also forked/unforked throw different exceptions keywords="purejava"> <compile classpath="classesDir,jars/required.jar" files="Main.java" - options="-Xreweavable" + options="" outjar="main.zip"/> <run class="Main" fork="true" exception="NoClassDefFoundError"/> <run class="Main" fork="false" exception="java.lang.ClassNotFoundException"/> diff --git a/tests/java5/ataspectj/ataspectj/ltwlog/MainVerboseAndShow.java b/tests/java5/ataspectj/ataspectj/ltwlog/MainVerboseAndShow.java index 0034cc264..32d7398e8 100644 --- a/tests/java5/ataspectj/ataspectj/ltwlog/MainVerboseAndShow.java +++ b/tests/java5/ataspectj/ataspectj/ltwlog/MainVerboseAndShow.java @@ -23,10 +23,13 @@ public class MainVerboseAndShow { public static void main(String args[]) throws Throwable { new MainVerboseAndShow().target(); + if (!MessageHolder.startsAs(Arrays.asList(new String[]{ "info weaving 'ataspectj/ltwlog/MainVerboseAndShow'", + "info weaver operating in reweavable mode. Need to verify any required types exist.", "weaveinfo Join point 'method-execution(void ataspectj.ltwlog.MainVerboseAndShow.target())' in Type 'ataspectj.ltwlog.MainVerboseAndShow' (MainVerboseAndShow.java:22) advised by before advice from 'ataspectj.ltwlog.Aspect1' (Aspect1.java)", - "info weaving 'ataspectj/ltwlog/Aspect1'"}))) { + "info weaving 'ataspectj/ltwlog/Aspect1'", + "info weaver operating in reweavable mode. Need to verify any required types exist."}))) { MessageHolder.dump(); throw new RuntimeException("failed"); } diff --git a/tests/java5/ataspectj/ataspectj/ltwlog/aop-verbose.xml b/tests/java5/ataspectj/ataspectj/ltwlog/aop-verbose.xml index c7756c8e5..82702105f 100644 --- a/tests/java5/ataspectj/ataspectj/ltwlog/aop-verbose.xml +++ b/tests/java5/ataspectj/ataspectj/ltwlog/aop-verbose.xml @@ -1,5 +1,5 @@ <aspectj> - <weaver options="-XmessageHandlerClass:ataspectj.ltwlog.MessageHolder -verbose"/> + <weaver options="-XmessageHandlerClass:ataspectj.ltwlog.MessageHolder -verbose -xNotReweavable"/> <aspects> <aspect name="ataspectj.ltwlog.Aspect1"/> </aspects> diff --git a/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml b/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml index 982a8934d..8f2a5528e 100644 --- a/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml +++ b/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml @@ -163,7 +163,7 @@ <compile files="pack/DefineInterface.java, pack/InterfaceDefinition.java, - pack/MyInterface.java"/> + pack/MyInterface.java" options="-XnotReweavable"/> <run class="pack.InterfaceDefinition"/> <compile includeClassesDir="true" diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml index 539df7b7d..52e0ab8b3 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml +++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml @@ -3697,20 +3697,20 @@ <!-- generics/itds and binary weaving --> <ajc-test dir="java5/generics/itds/binaryweaving" vm="1.5" title="binary weaving ITDs - A"> - <compile files="TestA_generictype.java" outjar="code.jar" options="-1.5,-Xreweavable"/> - <compile files="TestA_aspect.aj,TestA_class.java" inpath="code.jar" options="-1.5,-Xreweavable"/> + <compile files="TestA_generictype.java" outjar="code.jar" options="-1.5"/> + <compile files="TestA_aspect.aj,TestA_class.java" inpath="code.jar" options="-1.5"/> <run class="TestA_class"/> </ajc-test> <ajc-test dir="java5/generics/itds/binaryweaving" vm="1.5" title="binary weaving ITDs - B"> - <compile files="TestB_generictype.java" outjar="code.jar" options="-1.5,-Xreweavable"/> - <compile files="TestB_aspect1.aj,TestB_aspect2.aj,TestB_class.java" inpath="code.jar" options="-1.5,-Xreweavable"/> + <compile files="TestB_generictype.java" outjar="code.jar" options="-1.5"/> + <compile files="TestB_aspect1.aj,TestB_aspect2.aj,TestB_class.java" inpath="code.jar" options="-1.5"/> <run class="TestB_class"/> </ajc-test> <ajc-test dir="java5/generics/itds/binaryweaving" vm="1.5" title="binary weaving ITDs - 1"> - <compile files="BaseClass.java" outjar="code.jar" options="-1.5,-Xreweavable"/> - <compile files="A1.aj" inpath="code.jar" options="-1.5,-Xreweavable"/> + <compile files="BaseClass.java" outjar="code.jar" options="-1.5"/> + <compile files="A1.aj" inpath="code.jar" options="-1.5"/> <run class="BaseClass"> <stderr> <line text="Advice count=1"/> @@ -3719,11 +3719,11 @@ </ajc-test> <ajc-test dir="java5/generics/itds/binaryweaving" vm="1.5" title="binary weaving ITDs - 2"> - <compile files="BaseClass.java,A1.aj" outjar="code.jar" options="-1.5,-Xreweavable,-showWeaveInfo"> + <compile files="BaseClass.java,A1.aj" outjar="code.jar" options="-1.5,-showWeaveInfo"> <message kind="weave" text="Type 'BaseClass' (BaseClass.java) has intertyped field from 'A1' (A1.aj:'java.util.List BaseClass.list1')"/> <message kind="weave" text="Type 'BaseClass' (BaseClass.java:12) advised by after advice from 'A1' (A1.aj:7)"/> </compile> - <compile files="A2.aj" inpath="code.jar" options="-1.5,-Xreweavable,-showWeaveInfo"> + <compile files="A2.aj" inpath="code.jar" options="-1.5,-showWeaveInfo"> <message kind="weave" text="Type 'BaseClass' (BaseClass.java) has intertyped field from 'A1' (A1.aj:'java.util.List BaseClass.list1')"/> <message kind="weave" text="Type 'BaseClass' (BaseClass.java:12) advised by after advice from 'A1' (A1.aj:7)"/> <message kind="weave" text="Type 'BaseClass' (BaseClass.java) has intertyped field from 'A2' (A2.aj:'java.util.List BaseClass.list2')"/> @@ -3737,8 +3737,8 @@ </ajc-test> <ajc-test dir="java5/generics/itds/binaryweaving" vm="1.5" title="binary weaving ITDs - 3"> - <compile files="BaseClass.java,A1.aj,A2.aj" outjar="code.jar" options="-1.5,-Xreweavable"/> - <compile files="A3.aj" inpath="code.jar" options="-1.5,-Xreweavable"/> + <compile files="BaseClass.java,A1.aj,A2.aj" outjar="code.jar" options="-1.5"/> + <compile files="A3.aj" inpath="code.jar" options="-1.5"/> <run class="BaseClass"> <stderr> <line text="Advice count=3"/> @@ -3755,8 +3755,8 @@ <run class="X1"/> </ajc-test> <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods -1binary"> - <compile files="Sub1.java,Super1.java" outjar="code.jar" options="-1.5,-Xreweavable"/> - <compile files="X1.aj,Util.java" inpath="code.jar" options ="-1.5,-Xreweavable"/> + <compile files="Sub1.java,Super1.java" outjar="code.jar" options="-1.5"/> + <compile files="X1.aj,Util.java" inpath="code.jar" options ="-1.5"/> <run class="X1"/> </ajc-test> @@ -3765,8 +3765,8 @@ <run class="X2"/> </ajc-test> <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods -2binary"> - <compile files="Sub2.java,Super2.java" outjar="code.jar" options="-1.5,-Xreweavable"/> - <compile files="X2.aj,Util.java" inpath="code.jar" options ="-1.5,-Xreweavable"/> + <compile files="Sub2.java,Super2.java" outjar="code.jar" options="-1.5"/> + <compile files="X2.aj,Util.java" inpath="code.jar" options ="-1.5"/> <run class="X2"/> </ajc-test> @@ -3775,8 +3775,8 @@ <run class="X3"/> </ajc-test> <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods -3binary"> - <compile files="Sub3.java,Super3.java" outjar="code.jar" options="-1.5,-Xreweavable"/> - <compile files="X3.aj,Util.java" inpath="code.jar" options ="-1.5,-Xreweavable"/> + <compile files="Sub3.java,Super3.java" outjar="code.jar" options="-1.5"/> + <compile files="X3.aj,Util.java" inpath="code.jar" options ="-1.5"/> <run class="X3"/> </ajc-test> diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java index a9f9afda4..d7af9679a 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java +++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java @@ -50,7 +50,7 @@ public class AtAjLTWTests extends XMLBasedAjcTestCase { } public void testAjcLTWAroundInlineMungerTest_Xreweavable() { - runTest("AjcLTW AroundInlineMungerTest -Xreweavable"); + runTest("AjcLTW AroundInlineMungerTest"); } public void testAjcLTWAroundInlineMungerTest() { diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml index fda448c22..aaa2c97e4 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml +++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml @@ -15,7 +15,7 @@ <ajc-test dir="java5/ataspectj" title="AjcLTW PerClauseTest -Xreweavable"> <compile files="ataspectj/PerClauseTest.java,ataspectj/PerClauseTestAspects.java,ataspectj/TestHelper.java" - options="-1.5 -Xreweavable"/> + options="-1.5"/> <ant file="ajc-ant.xml" target="ltw.PerClauseTest" verbose="true"/> </ajc-test> @@ -45,7 +45,7 @@ <ajc-test dir="java5/ataspectj" title="AjcLTW AroundInlineMungerTest -Xreweavable"> <compile files="ataspectj/AroundInlineMungerTest.java,ataspectj/AroundInlineMungerTestAspects.java,ataspectj/TestHelper.java" - options="-1.5 -Xreweavable"/> + options="-1.5"/> <ant file="ajc-ant.xml" target="ltw.AroundInlineMungerTest" verbose="true"/> </ajc-test> @@ -55,17 +55,17 @@ options="-1.5 -Xlint:ignore"/> <compile files="ataspectj/AroundInlineMungerTest.java,ataspectj/TestHelper.java" - options="-1.5 -Xreweavable"/> + options="-1.5"/> <ant file="ajc-ant.xml" target="ltw.AroundInlineMungerTest" verbose="true"/> </ajc-test> <ajc-test dir="java5/ataspectj" title="AjcLTW AroundInlineMungerTest -XnoInline -Xreweavable"> <compile files="ataspectj/AroundInlineMungerTestAspects.java" - options="-1.5 -Xlint:ignore -XnoInline -Xreweavable"/> + options="-1.5 -Xlint:ignore -XnoInline"/> <compile files="ataspectj/AroundInlineMungerTest.java,ataspectj/TestHelper.java" - options="-1.5 -Xreweavable -XnoInline"/> + options="-1.5 -XnoInline"/> <ant file="ajc-ant.xml" target="ltw.AroundInlineMungerTest" verbose="true"/> </ajc-test> @@ -75,7 +75,7 @@ options="-1.5 -Xlint:ignore"/> <compile files="ataspectj/AroundInlineMungerTest2.aj,ataspectj/TestHelper.java" - options="-1.5 -Xreweavable"/> + options="-1.5"/> <ant file="ajc-ant.xml" target="ltw.AroundInlineMungerTest2" verbose="true"/> </ajc-test> @@ -89,7 +89,7 @@ <ajc-test dir="java5/ataspectj" title="Ajc Aspect1 LTW Aspect2 -Xreweavable"> <compile files="ataspectj/ltwreweavable/Main.java,ataspectj/ltwreweavable/Aspect1.java,ataspectj/ltwreweavable/Advisable.java" - options="-1.5 -Xreweavable" + options="-1.5" outjar="main1.jar"/> <ant file="ajc-ant.xml" target="ltw.Aspect2MainTest" verbose="true"/> </ajc-test> diff --git a/tests/src/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml b/tests/src/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml index 5add6cb72..075b1d07f 100644 --- a/tests/src/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml +++ b/tests/src/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml @@ -56,7 +56,7 @@ <ajc-test dir="incremental/model/weaving2" title="Testing incremental structure model: Weaving handlers" keywords="incremental-test,model-test" > - <compile staging="true" options="-incremental,-emacssym" sourceroots="src"/> + <compile staging="true" options="-incremental,-emacssym, -XnotReweavable" sourceroots="src"/> <inc-compile tag="20" checkModel="code=1,advice=1,RelationshipMapSize=2"/> <!-- BetaA has a new piece of handler advice added --> <inc-compile tag="30" checkModel="code=1,advice=2,RelationshipMapSize=3"/> <!-- secondary.GammaA added, also advises the same handler --> <inc-compile tag="40" checkModel="code=1,advice=1,RelationshipMapSize=2"/> <!-- primary.BetaA deleted --> @@ -87,7 +87,7 @@ <ajc-test dir="incremental/model/sourcefiles_addremove" title="Testing incremental structure model: Adding and removing files" keywords="incremental-test,model-test" > - <compile staging="true" options="-incremental,-emacssym" sourceroots="src"/> + <compile staging="true" options="-incremental,-emacssym, -XnotReweavable" sourceroots="src"/> <!-- On first compile, two source files in model, 'root' and 'Alpha' --> <inc-compile tag="20" checkModel="java source file=3,FileMapSize=2"/> <!-- Adds primary.Beta class --> <inc-compile tag="30" checkModel="java source file=4"/> <!-- Adds secondary.Gamma aspect --> |