diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2022-03-31 12:54:08 +0700 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2022-03-31 14:39:36 +0700 |
| commit | 7bd69575fd362e132fb3f6af948d608ec36ac8c9 (patch) | |
| tree | 500b02c2b459485665984e6f9a94b349a4a20ff1 /tests | |
| parent | f80addbd89a6c15bb208c9f931913e4ca0c0d221 (diff) | |
| download | aspectj-7bd69575fd362e132fb3f6af948d608ec36ac8c9.tar.gz aspectj-7bd69575fd362e132fb3f6af948d608ec36ac8c9.zip | |
Revert "AtAjLTWTests: 4 test cases switched to 'useFullLTW' mode"
This reverts commit 5288ef1c1c8be2df85e59740f41622f4cfb9d899.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java | 7 | ||||
| -rw-r--r-- | tests/src/test/resources/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml | 20 |
2 files changed, 13 insertions, 14 deletions
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 e06a3b0c3..c7be1944c 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 @@ -121,12 +121,11 @@ public class AtAjLTWTests extends XMLBasedAjcTestCase { public void testLTWDumpClosure() { runTest("LTW DumpTest closure"); - // Test runs with 'usefullltw="true"' -> dump files are created in the sandbox directory - File f = new File(ajc.getSandboxDirectory() + "/_ajdump/ataspectj/DumpTestTheDump$AjcClosure1.class"); + File f = new File("_ajdump/ataspectj/DumpTestTheDump$AjcClosure1.class"); assertTrue("Missing dump file " + f.getAbsolutePath(), f.exists()); - // tidy up... (should not be necessary in sandbox directory, but does not hurt) - f = new File(ajc.getSandboxDirectory() + "/_ajdump"); + // tidy up... + f = new File("_ajdump"); FileUtil.deleteContents(f); f.delete(); } diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml index 9dfc4afe4..a72fa4ebf 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml @@ -95,7 +95,7 @@ options="-1.5"/> <run class="ataspectj.DumpTest" ltw="ataspectj/aop-dump.xml"/> </ajc-test> - + <ajc-test dir="java5/ataspectj" title="LTW DumpTest before and after"> <compile files="ataspectj/EmptyAspect.aj" @@ -123,7 +123,7 @@ <compile files="ataspectj/DumpTest.java,ataspectj/DumpTestTheDump.java,ataspectj/TestAroundAspect.aj" options="-1.5"/> - <run class="ataspectj.DumpTest" ltw="ataspectj/aop-dumpclosure.xml" usefullltw="true"/> + <run class="ataspectj.DumpTest" ltw="ataspectj/aop-dumpclosure.xml"/> </ajc-test> <ajc-test dir="java5/ataspectj" title="LTW DumpTest proxy"> @@ -163,7 +163,7 @@ files="ataspectj/ltwlog/Aspect1.java" options="-1.5 -XterminateAfterCompilation" > - </compile> + </compile> <run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-silent.xml"> <stdout> <line text="execution(Main.target())"/> @@ -182,7 +182,7 @@ files="ataspectj/ltwlog/Aspect1.java" options="-1.5 -XterminateAfterCompilation" > - </compile> + </compile> <run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-verbose.xml"> <stdout> <line text="execution(Main.target())"/> @@ -207,7 +207,7 @@ files="ataspectj/ltwlog/Aspect1.java" options="-1.5 -XterminateAfterCompilation" > - </compile> + </compile> <run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-verboseandshow.xml"> <stdout> <line text="execution(Main.target())"/> @@ -233,7 +233,7 @@ files="ataspectj/ltwlog/Aspect1.java" options="-1.5 -XterminateAfterCompilation" > - </compile> + </compile> <run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-messagehandler.xml"> <stdout> <line text="MessageHolder.MessageHolder()"/> @@ -290,7 +290,7 @@ files="ataspectj/ConcreteAtAspectTest.java,ataspectj/TestHelper.java" options="-1.5 -XterminateAfterCompilation" /> - <run class="ataspectj.ConcreteAtAspectTest" ltw="ataspectj/aop-concreteataspect.xml" usefullltw="true"/> + <run class="ataspectj.ConcreteAtAspectTest" ltw="ataspectj/aop-concreteataspect.xml"/> </ajc-test> <ajc-test dir="java5/ataspectj" title="ConcreteAspect"> @@ -298,7 +298,7 @@ files="ataspectj/ConcreteAspectTest.aj,ataspectj/TestHelper.java" options="-1.5 -Xdev:NoAtAspectJProcessing -XterminateAfterCompilation" /> - <run class="ataspectj.ConcreteAspectTest" ltw="ataspectj/aop-concreteaspect.xml" usefullltw="true"/> + <run class="ataspectj.ConcreteAspectTest" ltw="ataspectj/aop-concreteaspect.xml"/> </ajc-test> <ajc-test dir="java5/ataspectj" title="ConcretePrecedenceAspect"> @@ -306,7 +306,7 @@ files="ataspectj/ConcretePrecedenceAspectTest.java,ataspectj/TestHelper.java" options="-1.5 -Xdev:NoAtAspectJProcessing -XterminateAfterCompilation" /> - <run class="ataspectj.ConcretePrecedenceAspectTest" ltw="ataspectj/aop-concreteprecedenceaspect.xml" usefullltw="true"/> + <run class="ataspectj.ConcretePrecedenceAspectTest" ltw="ataspectj/aop-concreteprecedenceaspect.xml"/> </ajc-test> <ajc-test dir="java5/ataspectj" title="AspectOfWhenAspectNotInInclude"> @@ -346,4 +346,4 @@ </ajc-test> -</suite> +</suite>
\ No newline at end of file |