From 91c176061b3941ade42081732a04ed8bbecb1bf8 Mon Sep 17 00:00:00 2001 From: aclement Date: Mon, 31 Jan 2011 19:37:16 +0000 Subject: [PATCH] 335619 --- .../PR278496_9/base/src/a/b/c/Azpect.java | 5 ++ .../PR278496_9/base/src/a/b/c/Code.java | 13 +++++ .../PR278496_9/base/src/a/b/c/Code2.java | 10 ++++ .../systemtest/ajc1611/Ajc1611Tests.java | 12 +++++ .../aspectj/systemtest/ajc1611/ajc1611.xml | 50 +++++++++++++++++++ .../tools/IncrementalCompilationTests.java | 15 ++++++ 6 files changed, 105 insertions(+) create mode 100644 tests/multiIncremental/PR278496_9/base/src/a/b/c/Azpect.java create mode 100644 tests/multiIncremental/PR278496_9/base/src/a/b/c/Code.java create mode 100644 tests/multiIncremental/PR278496_9/base/src/a/b/c/Code2.java diff --git a/tests/multiIncremental/PR278496_9/base/src/a/b/c/Azpect.java b/tests/multiIncremental/PR278496_9/base/src/a/b/c/Azpect.java new file mode 100644 index 000000000..559810d78 --- /dev/null +++ b/tests/multiIncremental/PR278496_9/base/src/a/b/c/Azpect.java @@ -0,0 +1,5 @@ +package a.b.c; + +public aspect Azpect { + before():staticinitialization(Code2) {} +} diff --git a/tests/multiIncremental/PR278496_9/base/src/a/b/c/Code.java b/tests/multiIncremental/PR278496_9/base/src/a/b/c/Code.java new file mode 100644 index 000000000..d01a3b039 --- /dev/null +++ b/tests/multiIncremental/PR278496_9/base/src/a/b/c/Code.java @@ -0,0 +1,13 @@ +package a.b.c; +import java.util.List; +import java.util.ArrayList; + +public class Code { + public void m() { + List l = new ArrayList(); + } + + static class CodeInner { + } +} + diff --git a/tests/multiIncremental/PR278496_9/base/src/a/b/c/Code2.java b/tests/multiIncremental/PR278496_9/base/src/a/b/c/Code2.java new file mode 100644 index 000000000..09879a99b --- /dev/null +++ b/tests/multiIncremental/PR278496_9/base/src/a/b/c/Code2.java @@ -0,0 +1,10 @@ +package a.b.c; +import java.util.List; +import java.util.ArrayList; + +public class Code2 { + public void m() { + List l = new ArrayList(); + } +} + diff --git a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java index 0c9005e26..7123f7a61 100644 --- a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java @@ -36,6 +36,18 @@ public class Ajc1611Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testDeclareField_328840() { runTest("pr328840"); } + +// public void testAnnoStyleAdviceChain_333274() { +// runTest("anno style advice chain"); +// } +// +// public void testAnnoStyleAdviceChain_333274_2() { +// runTest("code style advice chain"); +// } +// +// public void testAnnoStyleAdviceChain_333274_3() { +// runTest("code style advice chain - no inline"); +// } // --- diff --git a/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml index c37857222..d77ddeeb4 100644 --- a/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml +++ b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml @@ -1,6 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/IncrementalCompilationTests.java b/tests/src/org/aspectj/systemtest/incremental/tools/IncrementalCompilationTests.java index 5e33fa63c..29941da8e 100644 --- a/tests/src/org/aspectj/systemtest/incremental/tools/IncrementalCompilationTests.java +++ b/tests/src/org/aspectj/systemtest/incremental/tools/IncrementalCompilationTests.java @@ -276,6 +276,21 @@ public class IncrementalCompilationTests extends AbstractMultiProjectIncremental IProgramElement ipe = model.findElementForHandleOrCreate("=PR278496_1