diff options
| author | aclement <aclement> | 2008-09-19 00:14:46 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2008-09-19 00:14:46 +0000 |
| commit | b0450ebd70d0a415da1d6e9a6c35c82a9b038c91 (patch) | |
| tree | deb8a73b4fb00b93ebe82c714b2ec6e0425acac9 /weaver/testsrc | |
| parent | 4f13384c8c09fbdfad5fbc724a49740bee36690a (diff) | |
| download | aspectj-b0450ebd70d0a415da1d6e9a6c35c82a9b038c91.tar.gz aspectj-b0450ebd70d0a415da1d6e9a6c35c82a9b038c91.zip | |
242797: latest fixes for using * rather than ? in sigs
Diffstat (limited to 'weaver/testsrc')
| -rw-r--r-- | weaver/testsrc/org/aspectj/weaver/patterns/WildTypePatternResolutionTestCase.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/WildTypePatternResolutionTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/WildTypePatternResolutionTestCase.java index 2e8de7c73..0ac1ca704 100644 --- a/weaver/testsrc/org/aspectj/weaver/patterns/WildTypePatternResolutionTestCase.java +++ b/weaver/testsrc/org/aspectj/weaver/patterns/WildTypePatternResolutionTestCase.java @@ -169,12 +169,12 @@ import org.aspectj.weaver.bcel.BcelWorld; assertTrue("resolves to exact type",rtp instanceof ExactTypePattern); UnresolvedType exactType = rtp.getExactType(); assertTrue(exactType.isParameterizedType()); - assertEquals("Pjava/util/List<?>;",exactType.getSignature()); + assertEquals("Pjava/util/List<*>;",exactType.getSignature()); ExactTypePattern etp = (ExactTypePattern) writeAndRead(rtp); exactType = etp.getExactType(); assertTrue(exactType.isParameterizedType()); - assertEquals("Pjava/util/List<?>;",exactType.getSignature()); + assertEquals("Pjava/util/List<*>;",exactType.getSignature()); assertFalse("does not match List",etp.matches(javaUtilList, TypePattern.STATIC).alwaysTrue()); assertFalse("does not match generic List",etp.matches(javaUtilList.getGenericType(),TypePattern.STATIC).alwaysTrue()); @@ -345,7 +345,8 @@ import org.aspectj.weaver.bcel.BcelWorld; new UnresolvedType[] {UnresolvedType.forName("java.lang.Double").resolve(world)}, world); - assertFalse("does not match list of number",wtp.matches(listOfNumber,TypePattern.STATIC).alwaysTrue()); + boolean matchesListOfNumber = wtp.matches(listOfNumber,TypePattern.STATIC).alwaysTrue(); + assertFalse("does not match list of number",matchesListOfNumber); assertFalse("does not match list of double",wtp.matches(listOfDouble,TypePattern.STATIC).alwaysTrue()); ResolvedType extendsNumber = TypeFactory.createTypeFromSignature("+Ljava/lang/Number;").resolve(world); @@ -355,7 +356,8 @@ import org.aspectj.weaver.bcel.BcelWorld; new UnresolvedType[] {extendsNumber}, world); - assertTrue("matches list of ? extends number",wtp.matches(listOfExtendsNumber,TypePattern.STATIC).alwaysTrue()); + boolean matchesListOfQmarkExtendsNumber = wtp.matches(listOfExtendsNumber,TypePattern.STATIC).alwaysTrue(); + assertTrue("failed to correctly match list of ? extends number",matchesListOfQmarkExtendsNumber); ResolvedType extendsDouble = TypeFactory.createTypeFromSignature("+Ljava/lang/Double;").resolve(world); ResolvedType listOfExtendsDouble = |