diff options
| author | Andy Clement <andrew.clement@gmail.com> | 2012-08-22 12:43:56 -0700 |
|---|---|---|
| committer | Andy Clement <andrew.clement@gmail.com> | 2012-08-22 12:43:56 -0700 |
| commit | 7c6e9361dae7f2ee4cf15b68eccdf54e889d1f75 (patch) | |
| tree | 67d2a276b314067ee6d12c2f0b09a46cdf6e2c60 /tests | |
| parent | 911f5e939194bc3a4638ac7e504bb7e95033a191 (diff) | |
| download | aspectj-7c6e9361dae7f2ee4cf15b68eccdf54e889d1f75.tar.gz aspectj-7c6e9361dae7f2ee4cf15b68eccdf54e889d1f75.zip | |
386049: test and fix. 387568: wip test code
Diffstat (limited to 'tests')
6 files changed, 85 insertions, 0 deletions
diff --git a/tests/bugs171/pr386049/de/scrum_master/galileo/LoggingAspect.aj b/tests/bugs171/pr386049/de/scrum_master/galileo/LoggingAspect.aj new file mode 100755 index 000000000..ee45206fb --- /dev/null +++ b/tests/bugs171/pr386049/de/scrum_master/galileo/LoggingAspect.aj @@ -0,0 +1,11 @@ +package de.scrum_master.galileo;
+
+import de.scrum_master.galileo.filter.BasicFilter;
+
+privileged aspect LoggingAspect
+{
+ void around(BasicFilter filter) : execution(* BasicFilter.run()) && this(filter) {
+ filter.getLogMessage(); proceed(filter);
+ }
+
+}
diff --git a/tests/bugs171/pr386049/de/scrum_master/galileo/filter/BasicFilter.java b/tests/bugs171/pr386049/de/scrum_master/galileo/filter/BasicFilter.java new file mode 100755 index 000000000..0d6aac662 --- /dev/null +++ b/tests/bugs171/pr386049/de/scrum_master/galileo/filter/BasicFilter.java @@ -0,0 +1,10 @@ +package de.scrum_master.galileo.filter;
+
+
+public abstract class BasicFilter
+{
+ protected abstract String getLogMessage();
+ public void run() { + System.out.println("run()"); + } +}
diff --git a/tests/bugs171/pr386049/de/scrum_master/galileo/filter/JsoupFilter.java b/tests/bugs171/pr386049/de/scrum_master/galileo/filter/JsoupFilter.java new file mode 100755 index 000000000..da14ff778 --- /dev/null +++ b/tests/bugs171/pr386049/de/scrum_master/galileo/filter/JsoupFilter.java @@ -0,0 +1,17 @@ +package de.scrum_master.galileo.filter;
+
+
+public class JsoupFilter extends BasicFilter {
+ @Override
+ protected String getLogMessage() {
+ System.out.println("JsoupFilter.getLogMessage()"); + return "Cleaning up HTML, removing clutter, fixing structure";
+ }
+ + public static void main(String []argv) { + new JsoupFilter().run(); + } + +
+
+}
diff --git a/tests/bugs171/pr387568/Code.java b/tests/bugs171/pr387568/Code.java new file mode 100644 index 000000000..99d248803 --- /dev/null +++ b/tests/bugs171/pr387568/Code.java @@ -0,0 +1,17 @@ +import java.lang.annotation.*; + + +class AAA { + public void m() { + Color[] cs = Color.values(); + } +} + +aspect Foo { + after(): @annotation(Anno) {} +} + +@Retention(RetentionPolicy.RUNTIME) +@interface Anno {} + +enum Color {R,G,B;} diff --git a/tests/src/org/aspectj/systemtest/ajc171/Ajc171Tests.java b/tests/src/org/aspectj/systemtest/ajc171/Ajc171Tests.java index a8dc9a678..baebd2518 100644 --- a/tests/src/org/aspectj/systemtest/ajc171/Ajc171Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc171/Ajc171Tests.java @@ -21,6 +21,14 @@ import org.aspectj.testing.XMLBasedAjcTestCase; */ public class Ajc171Tests extends org.aspectj.testing.XMLBasedAjcTestCase { +// public void testUnresolvableEnum_pr387568() { +// runTest("unresolvable enum"); +// } + + public void testAbstractItds_pr386049() { + runTest("itd abstract"); + } + public void testPublicITDFs_pr73507_1() { runTest("public ITDfs - 1"); } diff --git a/tests/src/org/aspectj/systemtest/ajc171/ajc171.xml b/tests/src/org/aspectj/systemtest/ajc171/ajc171.xml index d24aa9a3a..6e19b7b83 100644 --- a/tests/src/org/aspectj/systemtest/ajc171/ajc171.xml +++ b/tests/src/org/aspectj/systemtest/ajc171/ajc171.xml @@ -2,6 +2,28 @@ <suite> + <ajc-test dir="bugs171/pr387568" title="unresolvable enum"> + <compile files="Code.java" options="-1.5"/> + <!-- + <run class="de.scrum_master.galileo.filter.JsoupFilter"> + <stdout> + <line text="JsoupFilter.getLogMessage()"/> + <line text="run()"/> + </stdout> + </run> + --> + </ajc-test> + + <ajc-test dir="bugs171/pr386049" title="itd abstract"> + <compile files="de/scrum_master/galileo/filter/BasicFilter.java de/scrum_master/galileo/filter/JsoupFilter.java de/scrum_master/galileo/LoggingAspect.aj" options="-1.5"/> + <run class="de.scrum_master.galileo.filter.JsoupFilter"> + <stdout> + <line text="JsoupFilter.getLogMessage()"/> + <line text="run()"/> + </stdout> + </run> + </ajc-test> + <ajc-test dir="bugs171/pr73507" title="public ITDfs - 1"> <compile files="Case1.java" options="-1.5"/> <run class="Case1"> |