[Clirr-devel] CVS: clirr/core/src/test/net/sf/clirr/core/internal/checks AbstractCheckTestCase.java,1.2,1.3 ClassAddedRemovedTest.java,1.1,1.2

[<lk...@us...>]

Update of /cvsroot/clirr/clirr/core/src/test/net/sf/clirr/core/internal/checks
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27683/src/test/net/sf/clirr/core/internal/checks

Modified Files:
	AbstractCheckTestCase.java ClassAddedRemovedTest.java 
Log Message:
Moved BCEL out of core Checker and only use the JavaType interface there.
Using BCEL is now an implementation detail of the Ant and CLI frontends, and IDE plugins might use a completely different implementation.

Index: AbstractCheckTestCase.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/test/net/sf/clirr/core/internal/checks/AbstractCheckTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractCheckTestCase.java	6 Mar 2005 17:01:35 -0000	1.2
+++ AbstractCheckTestCase.java	5 Sep 2005 21:14:52 -0000	1.3
@@ -7,6 +7,9 @@
 import net.sf.clirr.core.CheckerFactory;
 import net.sf.clirr.core.ClassFilter;
 import net.sf.clirr.core.internal.ClassChangeCheck;
+import net.sf.clirr.core.internal.bcel.BcelTypeArrayBuilder;
+import net.sf.clirr.core.spi.JavaType;
+
 import org.apache.bcel.util.ClassSet;
 
 import java.io.File;
@@ -53,11 +56,13 @@
         Checker checker = CheckerFactory.createChecker(createCheck(tdl));
         ClassFilter classSelector = createClassSelector();
 
-        checker.reportDiffs(
-            getBaseLine(), getCurrent(),
-            new URLClassLoader(new URL[]{}),
-            new URLClassLoader(new URL[]{}),
-            classSelector);
+        final JavaType[] origClasses =
+            BcelTypeArrayBuilder.createClassSet(getBaseLine(), new URLClassLoader(new URL[]{}), classSelector);
+        
+        final JavaType[] newClasses =
+            BcelTypeArrayBuilder.createClassSet(getCurrent(), new URLClassLoader(new URL[]{}), classSelector);
+        
+        checker.reportDiffs(origClasses, newClasses);
 
         tdl.checkExpected(expected);
     }

Index: ClassAddedRemovedTest.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/test/net/sf/clirr/core/internal/checks/ClassAddedRemovedTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClassAddedRemovedTest.java	26 Aug 2005 05:35:53 -0000	1.1
+++ ClassAddedRemovedTest.java	5 Sep 2005 21:14:52 -0000	1.2
@@ -7,6 +7,8 @@
 import net.sf.clirr.core.CheckerFactory;
 import net.sf.clirr.core.Severity;
 import net.sf.clirr.core.internal.ClassChangeCheck;
+import net.sf.clirr.core.internal.bcel.BcelTypeArrayBuilder;
+import net.sf.clirr.core.spi.JavaType;
 import net.sf.clirr.core.ClassFilter;
 
 public class ClassAddedRemovedTest extends AbstractCheckTestCase
@@ -19,11 +21,13 @@
         
         ClassFilter classSelector = createClassSelector();
 
-        checker.reportDiffs(
-                getBaseLine(), getCurrent(),
-                new URLClassLoader(new URL[]{}),
-                new URLClassLoader(new URL[]{}),
-                classSelector);
+        final JavaType[] origClasses =
+            BcelTypeArrayBuilder.createClassSet(getBaseLine(), new URLClassLoader(new URL[]{}), classSelector);
+        
+        final JavaType[] newClasses =
+            BcelTypeArrayBuilder.createClassSet(getCurrent(), new URLClassLoader(new URL[]{}), classSelector);
+        
+        checker.reportDiffs(origClasses, newClasses);
 
         ExpectedDiff[] expected = new ExpectedDiff[] {
                 new ExpectedDiff("Class testlib.AddedClass added", Severity.INFO, "testlib.AddedClass", null, null),