From fdbd12e319a0c18c40906780b372fa3cfb573fe4 Mon Sep 17 00:00:00 2001 From: aclement Date: Mon, 12 Jul 2010 19:21:05 +0000 Subject: 319431: test+fix: reweavable state names and signatures --- tests/bugs1610/pr319431/Azpect.java | 5 + tests/bugs1610/pr319431/Azpect2.java | 5 + tests/bugs1610/pr319431/Code.java | 6 + tests/bugs1610/pr319431/builtWith168.jar | Bin 0 -> 1847 bytes tests/src/org/aspectj/systemtest/AllTests16.java | 2 + .../aspectj/systemtest/ajc1610/Ajc1610Tests.java | 8 +- .../src/org/aspectj/systemtest/ajc1610/ajc1610.xml | 407 +-------------------- 7 files changed, 24 insertions(+), 409 deletions(-) create mode 100644 tests/bugs1610/pr319431/Azpect.java create mode 100644 tests/bugs1610/pr319431/Azpect2.java create mode 100644 tests/bugs1610/pr319431/Code.java create mode 100644 tests/bugs1610/pr319431/builtWith168.jar (limited to 'tests') diff --git a/tests/bugs1610/pr319431/Azpect.java b/tests/bugs1610/pr319431/Azpect.java new file mode 100644 index 000000000..be0c69d50 --- /dev/null +++ b/tests/bugs1610/pr319431/Azpect.java @@ -0,0 +1,5 @@ +package com.foo.bar; + +public aspect Azpect { + before(): staticinitialization(*){} +} diff --git a/tests/bugs1610/pr319431/Azpect2.java b/tests/bugs1610/pr319431/Azpect2.java new file mode 100644 index 000000000..f7b03a856 --- /dev/null +++ b/tests/bugs1610/pr319431/Azpect2.java @@ -0,0 +1,5 @@ +package com.foo.bar; + +public aspect Azpect2 { + before(): staticinitialization(*) {} +} diff --git a/tests/bugs1610/pr319431/Code.java b/tests/bugs1610/pr319431/Code.java new file mode 100644 index 000000000..59e5c1bf0 --- /dev/null +++ b/tests/bugs1610/pr319431/Code.java @@ -0,0 +1,6 @@ +package com.foo.bar; + +public class Code { + public static void main(String[] argv) { + } +} diff --git a/tests/bugs1610/pr319431/builtWith168.jar b/tests/bugs1610/pr319431/builtWith168.jar new file mode 100644 index 000000000..645b179fe Binary files /dev/null and b/tests/bugs1610/pr319431/builtWith168.jar differ diff --git a/tests/src/org/aspectj/systemtest/AllTests16.java b/tests/src/org/aspectj/systemtest/AllTests16.java index 71ac4143c..ce32370fe 100644 --- a/tests/src/org/aspectj/systemtest/AllTests16.java +++ b/tests/src/org/aspectj/systemtest/AllTests16.java @@ -8,6 +8,7 @@ import junit.framework.TestSuite; import org.aspectj.systemtest.ajc160.AllTestsAspectJ160; import org.aspectj.systemtest.ajc161.AllTestsAspectJ161; +import org.aspectj.systemtest.ajc1610.AllTestsAspectJ1610; import org.aspectj.systemtest.ajc162.AllTestsAspectJ162; import org.aspectj.systemtest.ajc163.AllTestsAspectJ163; import org.aspectj.systemtest.ajc164.AllTestsAspectJ164; @@ -31,6 +32,7 @@ public class AllTests16 { suite.addTest(AllTestsAspectJ166.suite()); suite.addTest(AllTestsAspectJ167.suite()); suite.addTest(AllTestsAspectJ169.suite()); + suite.addTest(AllTestsAspectJ1610.suite()); suite.addTest(AllTests15.suite()); // $JUnit-END$ return suite; diff --git a/tests/src/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java b/tests/src/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java index 020b0c5db..5ca583514 100644 --- a/tests/src/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java @@ -18,9 +18,9 @@ import org.aspectj.testing.XMLBasedAjcTestCase; public class Ajc1610Tests extends org.aspectj.testing.XMLBasedAjcTestCase { - // public void testMessyDecp_318241() { - // runTest("messy decp"); - // } + public void testLoadingOldCode_319431() { + runTest("loading old code"); + } // --- @@ -30,7 +30,7 @@ public class Ajc1610Tests extends org.aspectj.testing.XMLBasedAjcTestCase { @Override protected File getSpecFile() { - return new File("../tests/src/org/aspectj/systemtest/ajc169/ajc169.xml"); + return new File("../tests/src/org/aspectj/systemtest/ajc1610/ajc1610.xml"); } } \ No newline at end of file diff --git a/tests/src/org/aspectj/systemtest/ajc1610/ajc1610.xml b/tests/src/org/aspectj/systemtest/ajc1610/ajc1610.xml index 8e4eab525..b2dde3d5e 100644 --- a/tests/src/org/aspectj/systemtest/ajc1610/ajc1610.xml +++ b/tests/src/org/aspectj/systemtest/ajc1610/ajc1610.xml @@ -2,412 +2,9 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- cgit v1.2.3