246125: moving some very simple tests across to matcher from weaver

3 files changed, 43 insertions, 16 deletions

diff --git a/weaver5/java5-testsrc/org/aspectj/weaver/AllWeaver5Tests.java b/weaver5/java5-testsrc/org/aspectj/weaver/AllWeaver5Tests.java
index 886aeb112..2e5850c66 100644
--- a/weaver5/java5-testsrc/org/aspectj/weaver/AllWeaver5Tests.java
+++ b/weaver5/java5-testsrc/org/aspectj/weaver/AllWeaver5Tests.java
@@ -15,7 +15,7 @@ package org.aspectj.weaver;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.aspectj.weaver.reflect.ReflectionWorldTest;
+import org.aspectj.weaver.reflect.ReflectionWorldSpecificTest;
 import org.aspectj.weaver.tools.PointcutExpressionTest;
 
 public class AllWeaver5Tests {
@@ -26,7 +26,7 @@ public class AllWeaver5Tests {
         suite.addTest(AllTracing5Tests.suite());
         suite.addTest(BcweaverModuleTests15.suite());
 		suite.addTestSuite(PointcutExpressionTest.class);
-		suite.addTestSuite(ReflectionWorldTest.class);
+		suite.addTestSuite(ReflectionWorldSpecificTest.class);
 		//$JUnit-END$
 		return suite;
 	}
diff --git a/weaver5/java5-testsrc/org/aspectj/weaver/BcweaverModuleTests15.java b/weaver5/java5-testsrc/org/aspectj/weaver/BcweaverModuleTests15.java
index 74636407e..4ae4d7beb 100644
--- a/weaver5/java5-testsrc/org/aspectj/weaver/BcweaverModuleTests15.java
+++ b/weaver5/java5-testsrc/org/aspectj/weaver/BcweaverModuleTests15.java
@@ -1,4 +1,5 @@
 package org.aspectj.weaver;
+
 /* *******************************************************************
  * Copyright (c) 2005 Contributors.
  * All rights reserved. 
@@ -15,23 +16,26 @@ import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
 import org.aspectj.weaver.bcel.BcelGenericSignatureToTypeXTestCase;
+import org.aspectj.weaver.bcel.BcelWorldReferenceTypeTest;
 import org.aspectj.weaver.patterns.WildTypePatternResolutionTestCase;
 import org.aspectj.weaver.tools.Java15PointcutExpressionTest;
 
 public class BcweaverModuleTests15 extends TestCase {
-	   public static Test suite() { 
-	        TestSuite suite = new TestSuite(BcweaverModuleTests15.class.getName());
-	        suite.addTestSuite(BcelGenericSignatureToTypeXTestCase.class);
-	        suite.addTestSuite(BoundedReferenceTypeTestCase.class);
-	        suite.addTest(Java15PointcutExpressionTest.suite());
-	        suite.addTestSuite(MemberTestCase15.class);
-	        suite.addTestSuite(ReferenceTypeTestCase.class);
-	        suite.addTest(TestJava5ReflectionBasedReferenceTypeDelegate.suite());
-   	        suite.addTestSuite(TypeVariableTestCase.class);
-	        suite.addTestSuite(TypeVariableReferenceTypeTestCase.class);
-	        suite.addTestSuite(WildTypePatternResolutionTestCase.class);
-	        return suite;
-	    }
+	public static Test suite() {
+		TestSuite suite = new TestSuite(BcweaverModuleTests15.class.getName());
+		suite.addTestSuite(BcelGenericSignatureToTypeXTestCase.class);
+		suite.addTestSuite(BoundedReferenceTypeTestCase.class);
+		suite.addTest(Java15PointcutExpressionTest.suite());
+		suite.addTestSuite(MemberTestCase15.class);
+		suite.addTestSuite(BcelWorldReferenceTypeTest.class);
+		suite.addTest(TestJava5ReflectionBasedReferenceTypeDelegate.suite());
+		suite.addTestSuite(TypeVariableTestCase.class);
+		suite.addTestSuite(TypeVariableReferenceTypeTestCase.class);
+		suite.addTestSuite(WildTypePatternResolutionTestCase.class);
+		return suite;
+	}
 
-	    public BcweaverModuleTests15(String name) { super(name); }
+	public BcweaverModuleTests15(String name) {
+		super(name);
+	}
 }
diff --git a/weaver5/java5-testsrc/org/aspectj/weaver/bcel/BcelWorldReferenceTypeTest.java b/weaver5/java5-testsrc/org/aspectj/weaver/bcel/BcelWorldReferenceTypeTest.java
new file mode 100644
index 000000000..0ab70023e
--- /dev/null
+++ b/weaver5/java5-testsrc/org/aspectj/weaver/bcel/BcelWorldReferenceTypeTest.java
@@ -0,0 +1,23 @@
+/* *******************************************************************
+ * Copyright (c) 2002-2008 Contributors
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Eclipse Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/epl-v10.html 
+ *  
+ * Contributors: 
+ *     PARC     initial implementation 
+ * ******************************************************************/
+package org.aspectj.weaver.bcel;
+
+import org.aspectj.weaver.CommonReferenceTypeTests;
+import org.aspectj.weaver.World;
+
+public class BcelWorldReferenceTypeTest extends CommonReferenceTypeTests {
+
+	public World getWorld() {
+		return new BcelWorld();
+	}
+
+}