svn commit: r949053 - /shindig/trunk/java/common/src/test/java/org/apache/shindig/common/EasyMockTestCase.java

[li...@apache.org]

Author: lindner
Date: Fri May 28 01:08:35 2010
New Revision: 949053

URL: http://svn.apache.org/viewvc?rev=949053&view=rev
Log:
Remove deprecated easymock usage

Modified:
    shindig/trunk/java/common/src/test/java/org/apache/shindig/common/EasyMockTestCase.java

Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/EasyMockTestCase.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/EasyMockTestCase.java?rev=949053&r1=949052&r2=949053&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/EasyMockTestCase.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/EasyMockTestCase.java Fri May 28 01:08:35 2010
@@ -20,6 +20,7 @@ package org.apache.shindig.common;
 import com.google.common.collect.Lists;
 
 import org.easymock.EasyMock;
+import org.easymock.IMockBuilder;
 import org.junit.Assert;
 
 import java.lang.reflect.Method;
@@ -78,15 +79,15 @@ public abstract class EasyMockTestCase e
    **/
 
   protected <T> T mock(Class<T> clazz, Method[] methods, boolean strict) {
-    T m = strict ? EasyMock.createMock(clazz, methods)
-         : EasyMock.createNiceMock(clazz, methods);
+    IMockBuilder<T> builder = EasyMock.createMockBuilder(clazz).addMockedMethods(methods);
+
+    T m = strict ? builder.createMock() : builder.createNiceMock();
     mocks.add(m);
 
     return m;
   }
 
   /**
-  /**
    * Sets each mock to replay mode in the order they were created. Call this after setting
    * all of the mock expectations for a test.
    */