fixes for annotation type pattern bugs uncovered in 150 tests

1 files changed, 2 insertions, 6 deletions

diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternTestCase.java
index 136ab98fa..47b6d46b6 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternTestCase.java
@@ -170,18 +170,14 @@ public class AnnotationPatternTestCase extends TestCase {
 		PatternParser p = new PatternParser("(@(Foo || Boo) (Foo || Boo))");
 		TypePattern t = p.parseTypePattern();
 		assertTrue("OrTypePattern",t instanceof OrTypePattern);
-		WildAnnotationTypePattern wtp = (WildAnnotationTypePattern) t.annotationPattern;
-		assertEquals("@((Foo || Boo))",wtp.toString());
-		assertEquals("(@((Foo || Boo)) (Foo || Boo))",t.toString());
+		assertEquals("((@((Foo || Boo)) Foo) || (@((Foo || Boo)) Boo))",t.toString());
 	}
 	
 	public void testNotSyntax() {
 		PatternParser p = new PatternParser("!@Foo (Foo || Boo))");
 		TypePattern t = p.parseTypePattern();
 		assertTrue("OrTypePattern",t instanceof OrTypePattern);
-		NotAnnotationTypePattern natp = (NotAnnotationTypePattern) t.annotationPattern;
-		assertEquals("!@(Foo)",natp.toString());
-		assertEquals("(!@(Foo) (Foo || Boo))",t.toString());		
+		assertEquals("((!@(Foo) Foo) || (!@(Foo) Boo))",t.toString());		
 	}
 
 	public void testParseMethodOrConstructorSigNoAP() {