From 9768b96731eec6cb04fc15e46c36d5af63138c8d Mon Sep 17 00:00:00 2001 From: aclement Date: Tue, 24 Mar 2009 01:54:17 +0000 Subject: [PATCH] 265993: more jdt like handles --- .../src/org/aspectj/systemtest/ajc152/Ajc152Tests.java | 4 ++-- .../systemtest/ajc153/JDTLikeHandleProviderTests.java | 10 +++++----- .../src/org/aspectj/systemtest/ajc163/Ajc163Tests.java | 7 ++++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java index 47f459db0..228824e6d 100644 --- 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)", "Pjava/util/List;"); + checkGetParamSigOfMethod("genericMethod(java.util.List)", "Ljava/util/List;"); checkGetParamSigOfMethod("genericMethod2(MyGenericClass)", - "PMyGenericClass;"); + "LMyGenericClass;"); } // 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 3395ee125..762b79be7 100644 --- 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\; runTest("method with generic arg same as jdt"); compareHandles(IProgramElement.Kind.METHOD, "genericMethod1(java.util.List)", - ";"); + ";"); } public void testMethodWithTwoGenericArgsSameAsJDT() { @@ -507,8 +507,8 @@ public class JDTLikeHandleProviderTests extends XMLBasedAjcTestCase { // ~genericMethod2~QList\;~QMyGenericClass\; runTest("method with two generic args same as jdt"); compareHandles(IProgramElement.Kind.METHOD, "genericMethod2(java.util.List," - + "pkg.MyGenericClass)", ";~Qpkg.MyGenericClass\\;"); + + "pkg.MyGenericClass)", ";~QMyGenericClass\\;"); } public void testMethodWithTwoTypeParametersSameAsJDT() { @@ -516,7 +516,7 @@ public class JDTLikeHandleProviderTests extends XMLBasedAjcTestCase { // ~QMyGenericClass2\; runTest("method with two type parameters same as jdt"); compareHandles(IProgramElement.Kind.METHOD, "genericMethod4(pkg.MyGenericClass2)", - ";"); + ";"); } public void testMethodWithTwoArgsSameAsJDT_2() { @@ -524,7 +524,7 @@ public class JDTLikeHandleProviderTests extends XMLBasedAjcTestCase { // ~genericMethod3~I~QList\; runTest("method with two args one of which is generic same as jdt"); compareHandles(IProgramElement.Kind.METHOD, "genericMethod3(int,java.util.List)", - ";"); + ";"); } /* diff --git a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java index d7aae9a04..4f26f4f62 100644 --- 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 Ship.i(List[][] u) - assertEquals("<{Handles.java}Handles)Ship.i)\\[\\[Qjava.util.List\\;", ipe.getHandleIdentifier()); + assertEquals("<{Handles.java}Handles)Ship.i)\\[\\[QList\\;", ipe.getHandleIdentifier()); ipe = findElementAtLine(top.getRoot(), 7);// public java.util.List Ship.i(Set[][] u) - assertEquals("<{Handles.java}Handles)Ship.i)\\[\\[Qjava.util.Set\\;", ipe.getHandleIdentifier()); + assertEquals("<{Handles.java}Handles)Ship.i)\\[\\[QSet\\;", ipe.getHandleIdentifier()); // public java.util.Set i(java.util.Set[][] 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 i(java.util.Set[][] u,int i) { assertEquals("<{Handles.java}Handles~i~\\[\\[Qjava.util.Set\\;~I", ipe.getHandleIdentifier()); - ipe = findElementAtLine(top.getRoot(), 16);// public java.util.Set i(java.util.Set[][] u,int i) { + ipe = findElementAtLine(top.getRoot(), 16);// public java.util.Set i2(java.util.Set>[][] u) { assertEquals("<{Handles.java}Handles~i2~\\[\\[Qjava.util.Set\\<+QCollection\\;>;", ipe.getHandleIdentifier()); ipe = findElementAtLine(top.getRoot(), 19);// public java.util.Set i3(java.util.Set