diff options
author | aclement <aclement> | 2005-12-21 11:47:37 +0000 |
---|---|---|
committer | aclement <aclement> | 2005-12-21 11:47:37 +0000 |
commit | 6f74831e80244cce6b78dc86e7100d0944ae2496 (patch) | |
tree | 921be149517a44f67139c5d8e85e688262334e3a /tests/src/org/aspectj | |
parent | f9b9ad79f269295319d2b51ce9b2ab3423f75043 (diff) | |
download | aspectj-6f74831e80244cce6b78dc86e7100d0944ae2496.tar.gz aspectj-6f74831e80244cce6b78dc86e7100d0944ae2496.zip |
fixes for 121575.
Diffstat (limited to 'tests/src/org/aspectj')
-rw-r--r-- | tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java | 4 | ||||
-rw-r--r-- | tests/src/org/aspectj/systemtest/ajc150/ajc150.xml | 23 |
2 files changed, 27 insertions, 0 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java index def43d636..effaf6eeb 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java @@ -42,6 +42,10 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase { return new File("../tests/src/org/aspectj/systemtest/ajc150/ajc150.xml"); } + public void testTypeVars_pr121575() { runTest("different numbers of type vars");} + public void testTypeVars_pr121575_2() { runTest("different numbers of type vars - 2");} + public void testTypeVars_pr121575_3() { runTest("different numbers of type vars - 3");} + public void testTypeVars_pr121575_4() { runTest("different numbers of type vars - 4");} public void testDecps1() { runTest("decps - 1"); } public void testDecps1b() { runTest("decps - 1b"); } public void testDecps2() { runTest("decps - 2"); } diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml index 56cf37dc8..34e9cb069 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml +++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml @@ -6,6 +6,29 @@ <ajc-test dir="bugs150" title="abstract perthis in @AspectJ"> <compile files="pr121197.aj" options="-1.5"/> </ajc-test> + + <ajc-test dir="bugs150" title="different numbers of type vars"> + <compile files="pr121575.aj" options="-1.5"/> + <run class="pr121575"/> + </ajc-test> + + <ajc-test dir="java5/generics/tvars" title="different numbers of type vars - 2"> + <compile files="Case1.aj" options="-1.5 -showWeaveInfo"> + <message kind="weave" text="Join point 'method-execution(void MyClass.read(java.lang.String))' in Type 'MyClass' (Case1.aj:13) advised by before advice from 'MyAspect' (Case1.aj:5)"/> + </compile> + </ajc-test> + + <ajc-test dir="java5/generics/tvars" title="different numbers of type vars - 3"> + <compile files="Case2.aj" options="-1.5 -showWeaveInfo"> + <message kind="weave" text="Join point 'method-execution(void MyClass.read(java.lang.Number))' in Type 'MyClass' (Case2.aj:13) advised by before advice from 'MyAspect' (Case2.aj:5)"/> + </compile> + </ajc-test> + + <ajc-test dir="java5/generics/tvars" title="different numbers of type vars - 4"> + <compile files="Case3.aj" options="-1.5 -showWeaveInfo"> + <message kind="error" line="9" text="The type MyClass<T,E> must implement the inherited abstract method MyInterface<T>.read(T)"/> + </compile> + </ajc-test> <ajc-test dir="bugs150" title="access to private ITD from nested type"> |