diff options
| author | aclement <aclement> | 2009-02-19 21:04:10 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2009-02-19 21:04:10 +0000 |
| commit | bb6a294312282d7caaf8a85d79b35a94e3f3c2d6 (patch) | |
| tree | 7f8a2217778d439b9eec9caf46d155833c1f94ef /org.aspectj.matcher/testsrc | |
| parent | c57e9c7b63669925587390db9f250325cdc24e8f (diff) | |
| download | aspectj-bb6a294312282d7caaf8a85d79b35a94e3f3c2d6.tar.gz aspectj-bb6a294312282d7caaf8a85d79b35a94e3f3c2d6.zip | |
148508, 265418: tests and fixes: array and varargs subtype patterns
Diffstat (limited to 'org.aspectj.matcher/testsrc')
| -rw-r--r-- | org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java b/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java index 15ccbbd03..e4f5a4dbf 100644 --- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java +++ b/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java @@ -21,11 +21,6 @@ import org.aspectj.util.FuzzyBoolean; import org.aspectj.weaver.ResolvedType; import org.aspectj.weaver.VersionedDataInputStream; import org.aspectj.weaver.World; -import org.aspectj.weaver.patterns.Bindings; -import org.aspectj.weaver.patterns.PatternParser; -import org.aspectj.weaver.patterns.TestScope; -import org.aspectj.weaver.patterns.TypePattern; -import org.aspectj.weaver.patterns.WildTypePattern; import org.aspectj.weaver.reflect.ReflectionWorld; public class TypePatternTestCase extends PatternsTestCase { @@ -170,13 +165,17 @@ public class TypePatternTestCase extends PatternsTestCase { checkMatch("*[][]", "java.lang.Object", false); checkMatch("*[]", "java.lang.Object[]", true); checkMatch("*[][]", "java.lang.Object[][]", true); + checkMatch("java.lang.Object+", "java.lang.Object[]", true); checkMatch("java.lang.Object[]", "java.lang.Object", false); checkMatch("java.lang.Object[]", "java.lang.Object[]", true); checkMatch("java.lang.Object[][]", "java.lang.Object[][]", true); checkMatch("java.lang.String[]", "java.lang.Object", false); checkMatch("java.lang.String[]", "java.lang.Object[]", false); checkMatch("java.lang.String[][]", "java.lang.Object[][]", false); + checkMatch("java.lang.Object+[]", "java.lang.String[][]", true); checkMatch("java.lang.Object+[]", "java.lang.String[]", true); + checkMatch("java.lang.Object+[]", "int[][]", true); + checkMatch("java.lang.Object+[]", "int[]", false); } private void checkIllegalInstanceofMatch(String pattern, String name) { @@ -208,7 +207,10 @@ public class TypePatternTestCase extends PatternsTestCase { } private TypePattern makeTypePattern(String pattern) { - return new PatternParser(pattern).parseSingleTypePattern(); + PatternParser pp = new PatternParser(pattern); + TypePattern tp = pp.parseSingleTypePattern(); + pp.checkEof(); + return tp; } private void checkMatch(String pattern, String name, boolean shouldMatch) { |