[MO-java-dev] CVS: mockobjects-java/src/core/com/mockobjects/dynamic OrderedMock.java,1.3,1.4 Mock.java,1.28,1.29 CoreMock.java,1.3,1.4

[Tim M. <ma...@us...>]

Update of /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic
In directory sc8-pr-cvs1:/tmp/cvs-serv26152/core/com/mockobjects/dynamic

Modified Files:
	OrderedMock.java Mock.java CoreMock.java 
Log Message:
Composition of DynamicMock step - 3
Separated CoreTests from MockTests

Index: OrderedMock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/OrderedMock.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OrderedMock.java	10 Jun 2003 17:07:45 -0000	1.3
+++ OrderedMock.java	7 Jul 2003 00:19:33 -0000	1.4
@@ -6,7 +6,7 @@
 public class OrderedMock extends Mock {
 
 	public OrderedMock(Class mockedClass) {
-		this(mockedClass, mockNameFromClass(mockedClass));
+		super(mockedClass);
 	}
 
 	public OrderedMock(Class mockedClass, String name) {

Index: Mock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/Mock.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Mock.java	6 Jul 2003 23:06:12 -0000	1.28
+++ Mock.java	7 Jul 2003 00:19:33 -0000	1.29
@@ -21,22 +21,7 @@
 		this(mockedClass, mockNameFromClass(mockedClass));
 	}
 
-    public static String mockNameFromClass(Class c) {
-		return "mock" + className(c);
-	}
-	
-	public static String className(Class c) {
-		String name = c.getName();
-		int dotIndex = name.lastIndexOf('.');
-
-		if (dotIndex >= 0) {
-			return name.substring(dotIndex + 1);
-		} else {
-			return name;
-		}
-	}
-
-	private ConstraintMatcher createConstraintMatcher(Object constraintArg) {
+    private ConstraintMatcher createConstraintMatcher(Object constraintArg) {
 		// Can't overload this method as callee had an Object parameter, and java
 		// doesn't do a secondary dispatch on the true underlying type
 		

Index: CoreMock.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/dynamic/CoreMock.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CoreMock.java	6 Jul 2003 23:24:09 -0000	1.3
+++ CoreMock.java	7 Jul 2003 00:19:33 -0000	1.4
@@ -78,4 +78,19 @@
 	    this.invocationMatchers.reset();
 	}
 
+	public static String mockNameFromClass(Class c) {
+		return "mock" + className(c);
+	}
+
+	public static String className(Class c) {
+		String name = c.getName();
+		int dotIndex = name.lastIndexOf('.');
+	
+		if (dotIndex >= 0) {
+			return name.substring(dotIndex + 1);
+		} else {
+			return name;
+		}
+	}
+
 }