mockobjects-java-dev

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

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

Modified Files:
      Tag: DynamicMockExperiment
	AssertMo.java 
Log Message:
Fixed proxy error reporting when used as an expectation

Index: AssertMo.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/core/com/mockobjects/util/AssertMo.java,v
retrieving revision 1.2.4.3
retrieving revision 1.2.4.4
diff -u -r1.2.4.3 -r1.2.4.4
--- AssertMo.java	15 Apr 2003 22:23:00 -0000	1.2.4.3
+++ AssertMo.java	16 Apr 2003 16:31:48 -0000	1.2.4.4
@@ -1,12 +1,9 @@
 package com.mockobjects.util;
 
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
 
 import junit.framework.Assert;
 import junit.framework.AssertionFailedError;
 import com.mockobjects.Verifiable;
-import com.mockobjects.dynamic.Mock;
 
 public class AssertMo extends Assert {
 
@@ -104,44 +101,10 @@
         fail(message);
     }
     
-	public static String join( Object[] elements ) {
-		StringBuffer buf = new StringBuffer();
-		
-		for (int i = 0; i < elements.length; i++) {
-			if( i > 0 ) buf.append(", ");
-			buf.append( "<" );
-			Object element = elements[i];
-			if(Proxy.isProxyClass(element.getClass())) {			
-				try {
-					Method mockNameMethod = Mock.class.getDeclaredMethod("getMockName", new Class[0]);
-					Object result = Proxy.getInvocationHandler(element).invoke(element, mockNameMethod, new Object[0]);
-					buf.append(result);
-				} catch (Throwable e) {
-					buf.append(element.getClass());				
-				}	
-			} else {
-				buf.append( elements[i].toString() );
-			}
-			buf.append( ">" );
-		}	
-		
-		return buf.toString();
-	}
-	
 	public static String expectedErrorMessage(String description, String expectedMsg, String receivedMsg) {
 		return description + ":\n" + 
 			"\tExpected: " + expectedMsg + "\n" +
 			"\tReceived: " + receivedMsg + "\n";
 	}
 	
-	public static String methodToString( String name, Object[] args ) {
-		StringBuffer buf = new StringBuffer();
-		
-		buf.append(name);
-		buf.append("(");
-		buf.append(join(args));
-		buf.append(")");
-		
-		return buf.toString();	
-	}
 }