From af8a6482cb4fe8f15d54e98c37187e3e70279335 Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Wed, 27 Sep 2017 14:40:50 -0700 Subject: [PATCH] Activate test --- .../systemtest/ajc1811/Ajc1811Tests.java | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/src/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java b/tests/src/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java index 0c6663692..4e6013507 100644 --- a/tests/src/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java @@ -29,40 +29,40 @@ import junit.framework.Test; */ public class Ajc1811Tests extends org.aspectj.testing.XMLBasedAjcTestCase { -// public void testParameterizedWithInner() throws Exception { -// runTest("parameterized with inner"); -// JavaClass jc = getClassFrom(ajc.getSandboxDirectory(), "Outer"); -// assertNotNull(jc); -// BcelWorld world = new BcelWorld(ajc.getSandboxDirectory().toString()); -// -// ResolvedType outerType = world.resolve(UnresolvedType.forName("Outer")); -// ResolvedMember m = findMethod(outerType,"m"); -// -// UnresolvedType type = m.getReturnType(); -// assertEquals("LOuter$Inner;",type.getSignature()); -// -// type = m.getGenericReturnType(); -// assertEquals("LOuter$Inner;",type.getSignature()); -// -// ResolvedType resolvedType = world.resolve(type); -// ResolvedType outerResolvedType = resolvedType.getOuterClass(); -// assertEquals("LOuter;",outerResolvedType.getSignature()); -// -// ResolvedMember m2 = findMethod(outerType,"m2"); -// type = m2.getReturnType(); -// assertEquals("LOuter$Inner;",type.getSignature()); -// -// type = m2.getGenericReturnType(); -// assertEquals("LOuter$Inner;",type.getSignature()); -// -// // public Inner m() { ... } + public void testParameterizedWithInner() throws Exception { + runTest("parameterized with inner"); + JavaClass jc = getClassFrom(ajc.getSandboxDirectory(), "Outer"); + assertNotNull(jc); + BcelWorld world = new BcelWorld(ajc.getSandboxDirectory().toString()); + + ResolvedType outerType = world.resolve(UnresolvedType.forName("Outer")); + ResolvedMember m = findMethod(outerType,"m"); + + UnresolvedType type = m.getReturnType(); + assertEquals("LOuter$Inner;",type.getSignature()); + + type = m.getGenericReturnType(); + assertEquals("LOuter$Inner;",type.getSignature()); + + ResolvedType resolvedType = world.resolve(type); + ResolvedType outerResolvedType = resolvedType.getOuterClass(); + assertEquals("LOuter;",outerResolvedType.getSignature()); + + ResolvedMember m2 = findMethod(outerType,"m2"); + type = m2.getReturnType(); + assertEquals("LOuter$Inner;",type.getSignature()); + + type = m2.getGenericReturnType(); + assertEquals("LOuter$Inner;",type.getSignature()); + + // public Inner m() { ... } // Method m = findMethod(jc,"m"); // System.out.println(m); // System.out.println(">"+m.getReturnType()); // assertNotNull(returnType); -// -// // public Outer.Inner m2() { ... } -// } + + // public Outer.Inner m2() { ... } + } // // public void testMultiArgs_509235() { // runTest("multiargs"); -- 2.39.5