[Clirr-devel] CVS: clirr/src/test/net/sf/clirr/checks MethodSetCheckTest.java,1.10,1.11

[Simon K. <s_k...@us...>]

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

Modified Files:
	MethodSetCheckTest.java 
Log Message:
Use ExpectedDiff class


Index: MethodSetCheckTest.java
===================================================================
RCS file: /cvsroot/clirr/clirr/src/test/net/sf/clirr/checks/MethodSetCheckTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MethodSetCheckTest.java	29 Jun 2004 06:56:46 -0000	1.10
+++ MethodSetCheckTest.java	2 Jul 2004 02:59:32 -0000	1.11
@@ -1,7 +1,6 @@
 package net.sf.clirr.checks;
 
 import net.sf.clirr.framework.ClassChangeCheck;
-import net.sf.clirr.event.ApiDifference;
 import net.sf.clirr.event.Severity;
 import net.sf.clirr.event.ScopeSelector;
 
@@ -14,53 +13,53 @@
 {
     public void testMethodCheck() throws Exception
     {
-        ApiDifference[] expected = new ApiDifference[] {
+        ExpectedDiff[] expected = new ExpectedDiff[] {
 
             // method addition and removal
-            new ApiDifference("Method 'public void removedMethod(java.lang.String)' has been removed",
+            new ExpectedDiff("Method 'public void removedMethod(java.lang.String)' has been removed",
                     Severity.ERROR, "testlib.MethodsChange", "public void removedMethod(java.lang.String)", null),
-            new ApiDifference("Accessability of method 'public int getPriv2()' has been decreased from public to private",
+            new ExpectedDiff("Accessability of method 'public int getPriv2()' has been decreased from public to private",
                     Severity.ERROR, "testlib.MethodsChange", "public int getPriv2()", null),
-            new ApiDifference("Method 'protected MethodsChange(int, boolean)' has been added",
+            new ExpectedDiff("Method 'protected MethodsChange(int, boolean)' has been added",
                     Severity.INFO, "testlib.MethodsChange", "protected MethodsChange(int, boolean)", null),
-            new ApiDifference("Method 'public java.lang.Long getPrivSquare()' has been added",
+            new ExpectedDiff("Method 'public java.lang.Long getPrivSquare()' has been added",
                     Severity.INFO, "testlib.MethodsChange", "public java.lang.Long getPrivSquare()", null),
 
-            new ApiDifference("Method 'public void moveToSuper()' has been added",
+            new ExpectedDiff("Method 'public void moveToSuper()' has been added",
                     Severity.INFO, "testlib.ComplexMethodMoveBase", "public void moveToSuper()", null),
-            new ApiDifference("Method 'public void moveToSuper()' is now implemented in superclass testlib.ComplexMethodMoveBase",
+            new ExpectedDiff("Method 'public void moveToSuper()' is now implemented in superclass testlib.ComplexMethodMoveBase",
                     Severity.INFO, "testlib.ComplexMethodMoveSub", "public void moveToSuper()", null),
 
-            new ApiDifference("Abstract method 'public void method()' is now specified by implemented interface testlib.BaseInterface",
+            new ExpectedDiff("Abstract method 'public void method()' is now specified by implemented interface testlib.BaseInterface",
                     Severity.INFO, "testlib.AbstractImpl", "public void method()", null),
 
             // Constructor changes
-            new ApiDifference("Parameter 1 of 'protected MethodsChange(int)' has changed its type to java.lang.Integer",
+            new ExpectedDiff("Parameter 1 of 'protected MethodsChange(int)' has changed its type to java.lang.Integer",
                     Severity.ERROR, "testlib.MethodsChange", "protected MethodsChange(int)", null),
 
             // return type changes
-            new ApiDifference("Return type of method 'public java.lang.Number getPrivAsNumber()' has been changed to java.lang.Integer",
+            new ExpectedDiff("Return type of method 'public java.lang.Number getPrivAsNumber()' has been changed to java.lang.Integer",
                     Severity.ERROR, "testlib.MethodsChange", "public java.lang.Number getPrivAsNumber()", null),
             // TODO: INFO if method is final
-            new ApiDifference("Return type of method 'public java.lang.Integer getPrivAsInteger()' has been changed to java.lang.Number",
+            new ExpectedDiff("Return type of method 'public java.lang.Integer getPrivAsInteger()' has been changed to java.lang.Number",
                     Severity.ERROR, "testlib.MethodsChange", "public java.lang.Integer getPrivAsInteger()", null),
 
             // parameter list changes
             // Note: This is the current behaviour, not necessarily the spec of the desired behaviour
             // TODO: need to check assignability of types (and check if method or class is final?)
-            new ApiDifference("In method 'public void printPriv()' the number of arguments has changed",
+            new ExpectedDiff("In method 'public void printPriv()' the number of arguments has changed",
                     Severity.ERROR, "testlib.MethodsChange", "public void printPriv()", null),
-            new ApiDifference("Parameter 1 of 'public void strengthenParamType(java.lang.Object)' has changed its type to java.lang.String",
+            new ExpectedDiff("Parameter 1 of 'public void strengthenParamType(java.lang.Object)' has changed its type to java.lang.String",
                     Severity.ERROR, "testlib.MethodsChange", "public void strengthenParamType(java.lang.Object)", null),
-            new ApiDifference("Parameter 1 of 'public void weakenParamType(java.lang.String)' has changed its type to java.lang.Object",
+            new ExpectedDiff("Parameter 1 of 'public void weakenParamType(java.lang.String)' has changed its type to java.lang.Object",
                     Severity.ERROR, "testlib.MethodsChange", "public void weakenParamType(java.lang.String)", null),
-            new ApiDifference("Parameter 1 of 'public void changeParamType(java.lang.String)' has changed its type to java.lang.Integer",
+            new ExpectedDiff("Parameter 1 of 'public void changeParamType(java.lang.String)' has changed its type to java.lang.Integer",
                     Severity.ERROR, "testlib.MethodsChange", "public void changeParamType(java.lang.String)", null),
 
             // deprecation changes
-            new ApiDifference("Method 'public void becomesDeprecated()' has been deprecated",
+            new ExpectedDiff("Method 'public void becomesDeprecated()' has been deprecated",
                     Severity.INFO, "testlib.MethodsChange", "public void becomesDeprecated()", null),
-            new ApiDifference("Method 'public void becomesUndeprecated()' is no longer deprecated",
+            new ExpectedDiff("Method 'public void becomesUndeprecated()' is no longer deprecated",
                     Severity.INFO, "testlib.MethodsChange", "public void becomesUndeprecated()", null),
 
             // declared exceptions