add getters for visitor, turned on poincut test case

2 files changed, 28 insertions, 36 deletions

diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
index c800427d0..3ca01ffc0 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
@@ -51,7 +51,7 @@ public class ParserTestCase extends TestCase {
 		KindedPointcut p = (KindedPointcut) parser.parsePointcut();
 		//System.out.println(p);
 		assertEquals(p.kind, BcelShadow.MethodExecution);
-		assertTrue(p.signature.getName().matches("foobar"));
+		assertTrue(p.getSignature().getName().matches("foobar"));
 		
 		
 		try {
@@ -69,7 +69,7 @@ public class ParserTestCase extends TestCase {
 		p.resolveBindings(makeSimpleScope(),new Bindings(3));
 		assertEquals("execution(@p.SimpleAnnotation void Hello.*(..))",p.toString());
 		assertEquals(p.kind, Shadow.MethodExecution);
-		assertTrue(p.signature.getName().matches("foobar"));
+		assertTrue(p.getSignature().getName().matches("foobar"));
 	}
 	
 	// note... toString on a pointcut is a very quick and easy way to test a successful parse
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/VisitorTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/VisitorTestCase.java
index f7b90f1a5..b3a2a73bf 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/VisitorTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/VisitorTestCase.java
@@ -43,41 +43,33 @@ public class VisitorTestCase extends TestCase {
         }
     }
 
-    public void testMock() {
-        //empty so that JUnit does not complain about no test cases in there - this one beeing already in the suite
+    public void testPointcuts() {
+        if (pointcuts.isEmpty()) {
+            fail("Empty pointcuts file!");
+        }
+        for (Iterator iterator = pointcuts.iterator(); iterator.hasNext();) {
+            String pointcut = (String) iterator.next();
+            try  {
+                PointcutVisitor.DumpPointcutVisitor.check(pointcut);
+            } catch (Throwable t) {
+                t.printStackTrace();
+                fail("Failed on '"+pointcut+"': " +t.toString());
+            }
+        }
     }
 
-    public void testTemp() {
-        Pointcut.fromString("call(* *(int, Integer...))");
+    public void testTypePatterns() {
+        if (typePatterns.isEmpty()) {
+            fail("Empty typePatterns file!");
+        }
+        for (Iterator iterator = typePatterns.iterator(); iterator.hasNext();) {
+            String tp = (String) iterator.next();
+            try  {
+                TypePattern p = new PatternParser(tp).parseTypePattern();
+                PointcutVisitor.DumpPointcutVisitor.check(p, true);
+            } catch (Throwable t) {
+                fail("Failed on '"+tp+"': " +t.toString());
+            }
+        }
     }
-
-//    public void testPointcuts() {
-//        if (pointcuts.isEmpty()) {
-//            fail("Empty pointcuts file!");
-//        }
-//        for (Iterator iterator = pointcuts.iterator(); iterator.hasNext();) {
-//            String pointcut = (String) iterator.next();
-//            try  {
-//                PointcutVisitor.DumpPointcutVisitor.check(pointcut);
-//            } catch (Throwable t) {
-//                t.printStackTrace();
-//                fail("Failed on '"+pointcut+"': " +t.toString());
-//            }
-//        }
-//    }
-//
-//    public void testTypePatterns() {
-//        if (typePatterns.isEmpty()) {
-//            fail("Empty typePatterns file!");
-//        }
-//        for (Iterator iterator = typePatterns.iterator(); iterator.hasNext();) {
-//            String tp = (String) iterator.next();
-//            try  {
-//                TypePattern p = new PatternParser(tp).parseTypePattern();
-//                PointcutVisitor.DumpPointcutVisitor.check(p, true);
-//            } catch (Throwable t) {
-//                fail("Failed on '"+tp+"': " +t.toString());
-//            }
-//        }
-//    }
 }