[MO-java-dev] CVS: mockobjects-java/src/core/test/mockobjects TestAssertMo.java,1.3,1.3.6.1 TestReturnValue.java,1.4,1.4.4.1 TestExpectationCounter.java,1.1,1.1.6.1 TestMapEntry.java,1.1,1.1.6.1 TestExpectationCollection.java,1.1,1.1.6.1 AllTests.java,1.1,1.1.6.1 TestReturnObjectBag.java,1.4,1.4.2.1 TestExpectationDoubleValue.java,1.1,1.1.6.1 TestExpectationValue.java,1.1,1.1.6.1 AutoTestSuite.java,1.1,1.1.6.1 TestExpectationMap.java,1.2,1.2.4.1 TestVerifier.java,1.1,1.1.6.1

[Steve F. <sm...@us...>]

Update of /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects
In directory sc8-pr-cvs1:/tmp/cvs-serv8319/src/core/test/mockobjects

Modified Files:
      Tag: Nat_reworks_dynamics_from_0_09
	TestAssertMo.java TestReturnValue.java 
	TestExpectationCounter.java TestMapEntry.java 
	TestExpectationCollection.java AllTests.java 
	TestReturnObjectBag.java TestExpectationDoubleValue.java 
	TestExpectationValue.java AutoTestSuite.java 
	TestExpectationMap.java TestVerifier.java 
Log Message:
Further changes from Nat

Index: TestAssertMo.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/TestAssertMo.java,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- TestAssertMo.java	27 Oct 2002 22:24:13 -0000	1.3
+++ TestAssertMo.java	27 Jun 2003 16:03:20 -0000	1.3.6.1
@@ -1,12 +1,13 @@
 package test.mockobjects;
 
-import com.mockobjects.util.AssertMo;
-import com.mockobjects.util.TestCaseMo;
+import java.util.Vector;
+
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import java.util.Vector;
+import com.mockobjects.util.AssertMo;
+import com.mockobjects.util.TestCaseMo;
 
 public class TestAssertMo extends TestCaseMo {
     private static final Class THIS = TestAssertMo.class;

Index: TestReturnValue.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/TestReturnValue.java,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- TestReturnValue.java	18 Mar 2003 14:28:18 -0000	1.4
+++ TestReturnValue.java	27 Jun 2003 16:03:20 -0000	1.4.4.1
@@ -1,8 +1,9 @@
 package test.mockobjects;
 
-import com.mockobjects.util.TestCaseMo;
-import com.mockobjects.ReturnValue;
 import junit.framework.AssertionFailedError;
+
+import com.mockobjects.ReturnValue;
+import com.mockobjects.util.TestCaseMo;
 
 
 public class TestReturnValue extends TestCaseMo {

Index: TestExpectationCounter.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/TestExpectationCounter.java,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -r1.1 -r1.1.6.1
--- TestExpectationCounter.java	21 Oct 2002 22:52:38 -0000	1.1
+++ TestExpectationCounter.java	27 Jun 2003 16:03:20 -0000	1.1.6.1
@@ -1,8 +1,11 @@
 package test.mockobjects;
 
-import junit.framework.*;
-import com.mockobjects.*;
-import com.mockobjects.util.*;
+import junit.framework.AssertionFailedError;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import com.mockobjects.ExpectationCounter;
+import com.mockobjects.util.TestCaseMo;
 
 /**
  * JUnit test case for TestExpectationCounter

Index: TestMapEntry.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/TestMapEntry.java,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -r1.1 -r1.1.6.1
--- TestMapEntry.java	21 Oct 2002 22:52:38 -0000	1.1
+++ TestMapEntry.java	27 Jun 2003 16:03:20 -0000	1.1.6.1
@@ -1,9 +1,10 @@
 package test.mockobjects;
 
-import com.mockobjects.MapEntry;
-import com.mockobjects.util.TestCaseMo;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
+import com.mockobjects.MapEntry;
+import com.mockobjects.util.TestCaseMo;
 
 /**
  * JUnit test case for TestMapEntry

Index: TestExpectationCollection.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/TestExpectationCollection.java,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -r1.1 -r1.1.6.1
--- TestExpectationCollection.java	21 Oct 2002 22:52:38 -0000	1.1
+++ TestExpectationCollection.java	27 Jun 2003 16:03:20 -0000	1.1.6.1
@@ -1,9 +1,11 @@
 package test.mockobjects;
 
-import java.util.*;
-import junit.framework.*;
-import com.mockobjects.*;
-import com.mockobjects.util.*;
+import java.util.Vector;
+
+import junit.framework.AssertionFailedError;
+
+import com.mockobjects.ExpectationCollection;
+import com.mockobjects.util.TestCaseMo;
 
 public abstract class TestExpectationCollection extends TestCaseMo {
     ExpectationCollection myExpectation;

Index: AllTests.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/AllTests.java,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -r1.1 -r1.1.6.1
--- AllTests.java	21 Oct 2002 22:52:38 -0000	1.1
+++ AllTests.java	27 Jun 2003 16:03:20 -0000	1.1.6.1
@@ -1,9 +1,10 @@
 package test.mockobjects;
 
-import com.mockobjects.util.SuiteBuilder;
-import com.mockobjects.util.TestCaseMo;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
+import com.mockobjects.util.SuiteBuilder;
+import com.mockobjects.util.TestCaseMo;
 
 /**
  * JUnit test case for AllTests

Index: TestReturnObjectBag.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/TestReturnObjectBag.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- TestReturnObjectBag.java	23 Apr 2003 11:52:47 -0000	1.4
+++ TestReturnObjectBag.java	27 Jun 2003 16:03:20 -0000	1.4.2.1
@@ -1,8 +1,9 @@
 package test.mockobjects;
 
-import com.mockobjects.util.TestCaseMo;
-import com.mockobjects.ReturnObjectBag;
 import junit.framework.AssertionFailedError;
+
+import com.mockobjects.ReturnObjectBag;
+import com.mockobjects.util.TestCaseMo;
 
 
 public class TestReturnObjectBag extends TestCaseMo {

Index: TestExpectationDoubleValue.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/TestExpectationDoubleValue.java,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -r1.1 -r1.1.6.1
--- TestExpectationDoubleValue.java	21 Oct 2002 22:52:38 -0000	1.1
+++ TestExpectationDoubleValue.java	27 Jun 2003 16:03:20 -0000	1.1.6.1
@@ -1,8 +1,11 @@
 package test.mockobjects;
 
-import junit.framework.*;
-import com.mockobjects.*;
-import com.mockobjects.util.*;
+import junit.framework.AssertionFailedError;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import com.mockobjects.ExpectationDoubleValue;
+import com.mockobjects.util.TestCaseMo;
 
 
 public class TestExpectationDoubleValue extends TestCaseMo {

Index: TestExpectationValue.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/TestExpectationValue.java,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -r1.1 -r1.1.6.1
--- TestExpectationValue.java	21 Oct 2002 22:52:38 -0000	1.1
+++ TestExpectationValue.java	27 Jun 2003 16:03:20 -0000	1.1.6.1
@@ -1,8 +1,11 @@
 package test.mockobjects;
 
-import junit.framework.*;
-import com.mockobjects.*;
-import com.mockobjects.util.*;
+import junit.framework.AssertionFailedError;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import com.mockobjects.ExpectationValue;
+import com.mockobjects.util.TestCaseMo;
 
 /**
  * JUnit test case for TestExpectationValue

Index: AutoTestSuite.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/AutoTestSuite.java,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -r1.1 -r1.1.6.1
--- AutoTestSuite.java	1 Nov 2002 15:37:28 -0000	1.1
+++ AutoTestSuite.java	27 Jun 2003 16:03:20 -0000	1.1.6.1
@@ -2,7 +2,8 @@
 import java.io.File;
 import java.lang.reflect.Modifier;
 import java.util.StringTokenizer;
-import junit.framework.*;
+
+import junit.framework.TestSuite;
 
 
 /** A TestSuite containing all test classes found on the class path in a

Index: TestExpectationMap.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/TestExpectationMap.java,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- TestExpectationMap.java	24 Nov 2002 11:11:40 -0000	1.2
+++ TestExpectationMap.java	27 Jun 2003 16:03:20 -0000	1.2.4.1
@@ -1,9 +1,11 @@
 package test.mockobjects;
 
 import junit.awtui.TestRunner;
-import junit.framework.*;
-import com.mockobjects.*;
-import com.mockobjects.util.*;
+import junit.framework.AssertionFailedError;
+
+import com.mockobjects.ExpectationMap;
+import com.mockobjects.util.AssertMo;
+import com.mockobjects.util.TestCaseMo;
 
 /**
  * JUnit test case for TestExpectationMap

Index: TestVerifier.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/test/mockobjects/TestVerifier.java,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -r1.1 -r1.1.6.1
--- TestVerifier.java	21 Oct 2002 22:52:38 -0000	1.1
+++ TestVerifier.java	27 Jun 2003 16:03:20 -0000	1.1.6.1
@@ -1,11 +1,12 @@
 package test.mockobjects;
 
-import com.mockobjects.ExpectationValue;
-import com.mockobjects.MockObject;
-import com.mockobjects.util.TestCaseMo;
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
+import com.mockobjects.ExpectationValue;
+import com.mockobjects.MockObject;
+import com.mockobjects.util.TestCaseMo;
 
 public class TestVerifier extends TestCaseMo {
     private static final Class THIS = TestVerifier.class;