265993: more jdt like handles

diff --git a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
index 47f459db0c1b3f5055ecd81f5a834050b42d0c34..228824e6d853029c30afb0179a0381773b30056c 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
@@ -336,9 +336,9 @@ public class Ajc152Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
        public void testGetParameterSignaturesWithGenerics_pr141730() {
                runTest("new iprogramelement method getParameterSignatures with generics");
 
-               checkGetParamSigOfMethod("genericMethod(java.util.List<java.lang.String>)", "Pjava/util/List<Ljava/lang/String;>;");
+               checkGetParamSigOfMethod("genericMethod(java.util.List<java.lang.String>)", "Ljava/util/List<Ljava/lang/String;>;");
                checkGetParamSigOfMethod("genericMethod2(MyGenericClass<java.lang.String,MyClass>)",
-                               "PMyGenericClass<Ljava/lang/String;LMyClass;>;");
+                               "LMyGenericClass<Ljava/lang/String;LMyClass;>;");
        }
 
        // public void testFunkyGenericErrorWithITDs_pr126355_2() {

diff --git a/tests/src/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java b/tests/src/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java
index 3395ee125407dc54c84a3f5cf7a0f411dee7cc16..762b79be75ffaecaf852b581fbdd3c1e5140e89d 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java
@@ -499,7 +499,7 @@ public class JDTLikeHandleProviderTests extends XMLBasedAjcTestCase {
                // ~genericMethod1~QList\<QString;>;
                runTest("method with generic arg same as jdt");
                compareHandles(IProgramElement.Kind.METHOD, "genericMethod1(java.util.List<java.lang.String>)",
-                               "<pkg{Java5Class.java[Java5Class~genericMethod1~Qjava.util.List\\<QString;>;");
+                               "<pkg{Java5Class.java[Java5Class~genericMethod1~QList\\<QString;>;");
        }
 
        public void testMethodWithTwoGenericArgsSameAsJDT() {
@@ -507,8 +507,8 @@ public class JDTLikeHandleProviderTests extends XMLBasedAjcTestCase {
                // ~genericMethod2~QList\<QString;>;~QMyGenericClass\<QInteger;>;
                runTest("method with two generic args same as jdt");
                compareHandles(IProgramElement.Kind.METHOD, "genericMethod2(java.util.List<java.lang.String>,"
-                               + "pkg.MyGenericClass<java.lang.Integer>)", "<pkg{Java5Class.java[Java5Class~genericMethod2~Qjava.util.List"
-                               + "\\<QString;>;~Qpkg.MyGenericClass\\<QInteger;>;");
+                               + "pkg.MyGenericClass<java.lang.Integer>)", "<pkg{Java5Class.java[Java5Class~genericMethod2~QList"
+                               + "\\<QString;>;~QMyGenericClass\\<QInteger;>;");
        }
 
        public void testMethodWithTwoTypeParametersSameAsJDT() {
@@ -516,7 +516,7 @@ public class JDTLikeHandleProviderTests extends XMLBasedAjcTestCase {
                // ~QMyGenericClass2\<QString;QInteger;>;
                runTest("method with two type parameters same as jdt");
                compareHandles(IProgramElement.Kind.METHOD, "genericMethod4(pkg.MyGenericClass2<java.lang.String,java.lang.Integer>)",
-                               "<pkg{Java5Class.java[Java5Class~genericMethod4" + "~Qpkg.MyGenericClass2\\<QString;QInteger;>;");
+                               "<pkg{Java5Class.java[Java5Class~genericMethod4" + "~QMyGenericClass2\\<QString;QInteger;>;");
        }
 
        public void testMethodWithTwoArgsSameAsJDT_2() {
@@ -524,7 +524,7 @@ public class JDTLikeHandleProviderTests extends XMLBasedAjcTestCase {
                // ~genericMethod3~I~QList\<QString;>;
                runTest("method with two args one of which is generic same as jdt");
                compareHandles(IProgramElement.Kind.METHOD, "genericMethod3(int,java.util.List<java.lang.String>)",
-                               "<pkg{Java5Class.java[Java5Class~genericMethod3~I~Qjava.util.List\\<QString;>;");
+                               "<pkg{Java5Class.java[Java5Class~genericMethod3~I~QList\\<QString;>;");
        }
 
        /*

diff --git a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
index d7aae9a040e95d943994c9661cb3457419093424..4f26f4f620b091b600a277ca33149559dc5df184 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
@@ -127,10 +127,10 @@ public class Ajc163Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
                IHierarchy top = AsmManager.lastActiveStructureModel.getHierarchy();
                IProgramElement ipe = null;
                ipe = findElementAtLine(top.getRoot(), 4);// public java.util.List<String> Ship.i(List<String>[][] u)
-               assertEquals("<{Handles.java}Handles)Ship.i)\\[\\[Qjava.util.List\\<QString;>;", ipe.getHandleIdentifier());
+               assertEquals("<{Handles.java}Handles)Ship.i)\\[\\[QList\\<QString;>;", ipe.getHandleIdentifier());
 
                ipe = findElementAtLine(top.getRoot(), 7);// public java.util.List<String> Ship.i(Set<String>[][] u)
-               assertEquals("<{Handles.java}Handles)Ship.i)\\[\\[Qjava.util.Set\\<QString;>;", ipe.getHandleIdentifier());
+               assertEquals("<{Handles.java}Handles)Ship.i)\\[\\[QSet\\<QString;>;", ipe.getHandleIdentifier());
 
                // public java.util.Set<String> i(java.util.Set<String>[][] u)
                ipe = findElementAtLine(top.getRoot(), 10);
@@ -139,7 +139,8 @@ public class Ajc163Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
                ipe = findElementAtLine(top.getRoot(), 13);// public java.util.Set<String> i(java.util.Set<String>[][] u,int i) {
                assertEquals("<{Handles.java}Handles~i~\\[\\[Qjava.util.Set\\<QString;>;~I", ipe.getHandleIdentifier());
 
-               ipe = findElementAtLine(top.getRoot(), 16);// public java.util.Set<String> i(java.util.Set<String>[][] u,int i) {
+               ipe = findElementAtLine(top.getRoot(), 16);// public java.util.Set<String> i2(java.util.Set<? extends
+                                                                                                       // Collection<String>>[][] u) {
                assertEquals("<{Handles.java}Handles~i2~\\[\\[Qjava.util.Set\\<+QCollection\\<QString;>;>;", ipe.getHandleIdentifier());
 
                ipe = findElementAtLine(top.getRoot(), 19);// public java.util.Set<String> i3(java.util.Set<? extends