diff options
| -rw-r--r-- | tests/bugs151/pr132349/TopLevelType.java | 8 | ||||
| -rw-r--r-- | tests/bugs152/pr132349/TopLevelType.java | 16 | ||||
| -rw-r--r-- | tests/bugs152/pr132349/TopLevelType2.java | 17 | ||||
| -rw-r--r-- | tests/bugs152/pr132349/TopLevelType3.java | 17 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java | 1 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc151/ajc151.xml | 4 |
6 files changed, 50 insertions, 13 deletions
diff --git a/tests/bugs151/pr132349/TopLevelType.java b/tests/bugs151/pr132349/TopLevelType.java deleted file mode 100644 index 268c06717..000000000 --- a/tests/bugs151/pr132349/TopLevelType.java +++ /dev/null @@ -1,8 +0,0 @@ -public class TopLevelType<E> { - public static class NestedType {} -} - -aspect SomeAspect { - public void TopLevelType.NestedType.someMethod() { - } -}
\ No newline at end of file diff --git a/tests/bugs152/pr132349/TopLevelType.java b/tests/bugs152/pr132349/TopLevelType.java new file mode 100644 index 000000000..fd29eddeb --- /dev/null +++ b/tests/bugs152/pr132349/TopLevelType.java @@ -0,0 +1,16 @@ +public class TopLevelType<E> { + public static class NestedType {} + + public static void main(String[] args) { + TopLevelType tlt = new TopLevelType(); + NestedType nt = new NestedType(); + nt.someMethod(); + } +} + +aspect SomeAspect { + public void TopLevelType.NestedType.someMethod() { + } + +} + diff --git a/tests/bugs152/pr132349/TopLevelType2.java b/tests/bugs152/pr132349/TopLevelType2.java new file mode 100644 index 000000000..ab1b61829 --- /dev/null +++ b/tests/bugs152/pr132349/TopLevelType2.java @@ -0,0 +1,17 @@ +public class TopLevelType2<E> { + public static class NestedType {} + + public static void main(String[] args) { + TopLevelType2 tlt = new TopLevelType2(); + NestedType nt = new NestedType(); + nt.someMethod(); + } +} + +aspect SomeAspect { + public void TopLevelType2<String>.NestedType.someMethod() { // error - can't do that + } +} + + + diff --git a/tests/bugs152/pr132349/TopLevelType3.java b/tests/bugs152/pr132349/TopLevelType3.java new file mode 100644 index 000000000..8cc55d6cb --- /dev/null +++ b/tests/bugs152/pr132349/TopLevelType3.java @@ -0,0 +1,17 @@ +public class TopLevelType3<E> { + public static class NestedType<T> {} + + public static void main(String[] args) { + TopLevelType3 tlt = new TopLevelType3(); + NestedType nt = new NestedType(); + nt.someMethod(); + } +} + +aspect SomeAspect { + public void TopLevelType3.NestedType<String>.someMethod() { // error - can't do that + } +} + + + diff --git a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java index b0c5d3150..3a76b645c 100644 --- a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java @@ -24,7 +24,6 @@ import org.aspectj.systemtest.ajc150.GenericsTests; import org.aspectj.testing.XMLBasedAjcTestCase; public class Ajc151Tests extends org.aspectj.testing.XMLBasedAjcTestCase { - // public void testItdOnInnerTypeOfGenericType_pr132349() { runTest("ITD on inner type of generic type");} // Some @DeclareParents testing public void testAtDecp_1() { runTest("atDecp - simple");} diff --git a/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml b/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml index 1c8ab5a75..160aab9e3 100644 --- a/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml +++ b/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml @@ -74,10 +74,6 @@ <!-- atDecp end --> - <ajc-test dir="bugs151/pr132349" title="ITD on inner type of generic type"> - <compile files="TopLevelType.java" options="-1.5"/> - </ajc-test> - <ajc-test dir="bugs151/pr126560" title="@AJ deow doesn't throw an invalidAbsoluteTypeName when specify type in the same package"> <compile files="pkg1/C.java, pkg1/A.java" options="-1.5"> <message kind="error" line="8" text="error"/> |