From fe2f8cdae5328a768922bebe387492d583901cad Mon Sep 17 00:00:00 2001 From: aclement Date: Wed, 20 Aug 2008 20:47:14 +0000 Subject: [PATCH] 145391: moved tests 152>162 and fixed them --- tests/bugs162/pr145391/B.class | Bin 0 -> 433 bytes .../pr145391/GenericType.java | 0 .../pr145391/GenericType2.java | 14 +--------- tests/bugs162/pr145391/x/GenericType2.java | 25 ++++++++++++++++++ .../systemtest/ajc152/Ajc152Tests.java | 2 -- .../org/aspectj/systemtest/ajc152/ajc152.xml | 9 ------- .../systemtest/ajc162/Ajc162Tests.java | 2 ++ .../org/aspectj/systemtest/ajc162/ajc162.xml | 11 ++++++++ 8 files changed, 39 insertions(+), 24 deletions(-) create mode 100644 tests/bugs162/pr145391/B.class rename tests/{bugs152 => bugs162}/pr145391/GenericType.java (100%) rename tests/{bugs152 => bugs162}/pr145391/GenericType2.java (60%) create mode 100644 tests/bugs162/pr145391/x/GenericType2.java diff --git a/tests/bugs162/pr145391/B.class b/tests/bugs162/pr145391/B.class new file mode 100644 index 0000000000000000000000000000000000000000..e91f70136993ac6ed13b1d6497a813920bf8b894 GIT binary patch literal 433 zcmZXQOHaZ;5Xb-9RthWf@~sz-g~Sri5EIatkW??4CLWivfhDCiOTo|OMG{T?0DdUr zY$amiVdp)+nc2^;w+{dpICWt$u)Yh2RF9$1Rf)8i_a*S{Z*Gbh3$>6C~(&h?_9@sUG`c{v@Mp>OV`dl-j?Q*(4oZ z%P1CFWGYQIY!`Kg`cy1MI~K{fJxDS+mYSo6U9-s^t>z7yAqT@j8HYHcF*CBg;9pb6 z9K!F@g^uKnGAkE)zNx|)b=&k0fJKk)Bi|*fO`4fVYlY%Vp5`P?+Q@B^<(~r5JLEA` tC~l!jc5(fp9My%BS5{i@s6E!sS7^Lqf5YVY=n_%*A8zHBdrUM7C*MglNeTb} literal 0 HcmV?d00001 diff --git a/tests/bugs152/pr145391/GenericType.java b/tests/bugs162/pr145391/GenericType.java similarity index 100% rename from tests/bugs152/pr145391/GenericType.java rename to tests/bugs162/pr145391/GenericType.java diff --git a/tests/bugs152/pr145391/GenericType2.java b/tests/bugs162/pr145391/GenericType2.java similarity index 60% rename from tests/bugs152/pr145391/GenericType2.java rename to tests/bugs162/pr145391/GenericType2.java index c5c6ab386..c99919e88 100644 --- a/tests/bugs152/pr145391/GenericType2.java +++ b/tests/bugs162/pr145391/GenericType2.java @@ -3,8 +3,6 @@ public class GenericType2 { public GenericType2(V value) {} public void foo() {} -// -// public void bar() {} protected void getValue(V aV) { } @@ -17,21 +15,11 @@ public class GenericType2 { aspect SomeAspect { before(GenericType2 t): call(* GenericType2.foo()) && target(t) { - // Direct call to non-generic method works -// t.bar(); - // Indirect call to non-generic method works -// t.callNormalMethod(); - // Direct call to generic method works -// t.getValue(); // Indirect call to generic method produces a NoSuchMethodError t.callGenericMethod(); } -// private void GenericType.callNormalMethod() { -// bar(); -// } - private void GenericType2.callGenericMethod() { getValue(new Integer(45)); } -} \ No newline at end of file +} diff --git a/tests/bugs162/pr145391/x/GenericType2.java b/tests/bugs162/pr145391/x/GenericType2.java new file mode 100644 index 000000000..8d5fb565c --- /dev/null +++ b/tests/bugs162/pr145391/x/GenericType2.java @@ -0,0 +1,25 @@ +interface Bar {} + +class B implements Bar {} + +public class GenericType2 { + + public GenericType2(V value) {} + + protected void getValue(V aV) { + } + public void m() { + getValue(new B()); +} +} + +aspect SomeAspect { + before(GenericType2 t): call(* GenericType2.foo()) && target(t) { + // Indirect call to generic method produces a NoSuchMethodError + t.callGenericMethod(); + } + + private void GenericType2.callGenericMethod() { +// getValue(new Integer(45)); + } +} diff --git a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java index dc7d2aede..570a51343 100644 --- a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java @@ -27,8 +27,6 @@ public class Ajc152Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // public void testSuperITDExplosion_pr134425() { runTest("super ITDs");} // public void testMisbehavingDeclareAnnotation_pr135865() { runTest("misbehaving declare annotation");} // public void testMisbehavingDeclareAnnotation_pr135865_2() { runTest("misbehaving declare annotation - 2");} -// public void testItdCallingGenericMethod_pr145391() { runTest("itd calling generic method");} -// public void testItdCallingGenericMethod_pr145391_2() { runTest("itd calling generic method - 2");} // public void testClassCastForInvalidAnnotationValue_pr148537() { runTest("classcast annotation value");} diff --git a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml index 3e7b08082..ecd73f106 100644 --- a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml +++ b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml @@ -78,10 +78,6 @@ - - - - @@ -105,11 +101,6 @@ - - - - - diff --git a/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java b/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java index 71cadc222..3f970fb2f 100644 --- a/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java @@ -19,6 +19,8 @@ import org.aspectj.testing.XMLBasedAjcTestCase; public class Ajc162Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // AspectJ1.6.2 + public void testItdCallingGenericMethod_pr145391() { runTest("itd calling generic method");} + public void testItdCallingGenericMethod_pr145391_2() { runTest("itd calling generic method - 2");} public void testPublicPointcut_pr239539() { runTest("public pointcut"); } public void testGenericDecp_pr241047() { runTest("generic decp"); } public void testGenericDecp_pr241047_2() { runTest("generic decp - 2"); } diff --git a/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml b/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml index 5685bc9e5..7699dcc38 100644 --- a/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml +++ b/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml @@ -3,6 +3,17 @@ + + + + + + + + + + + -- 2.39.5