cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1221902 [3/3] - in /cxf/branches/2.4.x-fixes: ./ api/ api/src/test/java/org/apache/cxf/phase/ api/src/test/java/org/apache/cxf/ws/policy/ api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/ common/common/ common/common/src/test/java/o...
Date Wed, 21 Dec 2011 22:08:32 GMT
Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
Wed Dec 21 22:08:27 2011
@@ -37,8 +37,8 @@ import org.apache.cxf.ws.rm.policy.RMAss
 import org.apache.cxf.ws.rm.policy.RMAssertion.AcknowledgementInterval;
 import org.apache.cxf.ws.rm.policy.RMAssertion.BaseRetransmissionInterval;
 import org.apache.cxf.ws.rm.policy.RMAssertion.InactivityTimeout;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
Wed Dec 21 22:08:27 2011
@@ -29,8 +29,8 @@ import org.apache.cxf.ws.addressing.Endp
 import org.apache.cxf.ws.addressing.JAXWSAConstants;
 import org.apache.cxf.ws.addressing.v200408.AttributedURI;
 import org.apache.cxf.ws.rm.persistence.RMStore;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -132,7 +132,8 @@ public class DestinationTest extends Ass
     NoSuchMethodException {
         
         Method m1 = Destination.class.getDeclaredMethod("getSequence", new Class[] {Identifier.class});
-        destination = control.createMock(Destination.class, new Method[] {m1});
+        destination = EasyMock.createMockBuilder(Destination.class)
+            .addMockedMethod(m1).createMock(control);
         Message message = setupMessage();
         RMProperties rmps = control.createMock(RMProperties.class);
         EasyMock.expect(message.get(RMMessageConstants.RM_PROPERTIES_INBOUND)).andReturn(rmps);

Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java Wed
Dec 21 22:08:27 2011
@@ -43,8 +43,8 @@ import org.apache.cxf.ws.addressing.Rela
 import org.apache.cxf.ws.addressing.v200408.AttributedURI;
 import org.apache.cxf.ws.addressing.v200408.EndpointReferenceType;
 import org.apache.cxf.ws.rm.manager.SourcePolicyType;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -106,7 +106,8 @@ public class ProxyTest extends Assert {
     public void testAcknowledge() throws NoSuchMethodException, RMException {
         Method m = Proxy.class.getDeclaredMethod("invoke", 
             new Class[] {OperationInfo.class, Object[].class, Map.class});
-        Proxy proxy = control.createMock(Proxy.class, new Method[] {m});
+        Proxy proxy = EasyMock.createMockBuilder(Proxy.class)
+            .addMockedMethod(m).createMock(control);
         proxy.setReliableEndpoint(rme);
         DestinationSequence ds = control.createMock(DestinationSequence.class);
         EndpointReferenceType acksToEPR = control.createMock(EndpointReferenceType.class);
@@ -135,7 +136,8 @@ public class ProxyTest extends Assert {
     public void testLastMessage() throws NoSuchMethodException, RMException {
         Method m = Proxy.class.getDeclaredMethod("invoke", 
             new Class[] {OperationInfo.class, Object[].class, Map.class});
-        Proxy proxy = control.createMock(Proxy.class, new Method[] {m});
+        Proxy proxy = EasyMock.createMockBuilder(Proxy.class)
+            .addMockedMethod(m).createMock(control);
         proxy.setReliableEndpoint(rme);
         SourceSequence ss = control.createMock(SourceSequence.class);
         EasyMock.expect(ss.getTarget()).andReturn(null);
@@ -175,7 +177,8 @@ public class ProxyTest extends Assert {
     public void testTerminate() throws NoSuchMethodException, RMException {
         Method m = Proxy.class.getDeclaredMethod("invoke", 
             new Class[] {OperationInfo.class, Object[].class, Map.class});
-        Proxy proxy = control.createMock(Proxy.class, new Method[] {m});
+        Proxy proxy = EasyMock.createMockBuilder(Proxy.class)
+            .addMockedMethod(m).createMock(control);
         proxy.setReliableEndpoint(rme);        
         Endpoint endpoint = control.createMock(Endpoint.class);
         EasyMock.expect(rme.getEndpoint()).andReturn(endpoint);
@@ -199,7 +202,8 @@ public class ProxyTest extends Assert {
     public void testCreateSequenceResponse() throws NoSuchMethodException, RMException {
         Method m = Proxy.class.getDeclaredMethod("invoke", 
             new Class[] {OperationInfo.class, Object[].class, Map.class});
-        Proxy proxy = control.createMock(Proxy.class, new Method[] {m});
+        Proxy proxy = EasyMock.createMockBuilder(Proxy.class)
+            .addMockedMethod(m).createMock(control);
         proxy.setReliableEndpoint(rme);
         Endpoint endpoint = control.createMock(Endpoint.class);
         EasyMock.expect(rme.getEndpoint()).andReturn(endpoint);
@@ -233,7 +237,8 @@ public class ProxyTest extends Assert {
         Method m = Proxy.class.getDeclaredMethod("createClient", 
             new Class[] {Bus.class, Endpoint.class, Conduit.class, 
                          org.apache.cxf.ws.addressing.EndpointReferenceType.class});
-        Proxy proxy = control.createMock(Proxy.class, new Method[] {m});
+        Proxy proxy = EasyMock.createMockBuilder(Proxy.class)
+            .addMockedMethod(m).createMock(control);
         proxy.setReliableEndpoint(rme);
 
         RMManager manager = control.createMock(RMManager.class);
@@ -295,7 +300,8 @@ public class ProxyTest extends Assert {
     private void testCreateSequence(boolean isServer) throws NoSuchMethodException, RMException
{
         Method m = Proxy.class.getDeclaredMethod("invoke", 
             new Class[] {OperationInfo.class, Object[].class, Map.class});
-        Proxy proxy = control.createMock(Proxy.class, new Method[] {m});
+        Proxy proxy = EasyMock.createMockBuilder(Proxy.class)
+            .addMockedMethod(m).createMock(control);
         proxy.setReliableEndpoint(rme);
         
         RMManager manager = control.createMock(RMManager.class);

Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
Wed Dec 21 22:08:27 2011
@@ -24,8 +24,8 @@ import org.apache.cxf.message.Message;
 import org.apache.cxf.ws.addressing.AddressingProperties;
 import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
 import org.apache.cxf.ws.addressing.JAXWSAConstants;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
Wed Dec 21 22:08:27 2011
@@ -50,8 +50,8 @@ import org.apache.cxf.ws.policy.PolicyEn
 import org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry;
 import org.apache.neethi.Assertion;
 import org.apache.neethi.Policy;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -136,7 +136,8 @@ public class RMEndpointTest extends Asse
             .getDeclaredMethod("createEndpoint", new Class[] {org.apache.cxf.transport.Destination.class});
         Method m3 = RMEndpoint.class.getDeclaredMethod("setPolicies", new Class[] {});
 
-        rme = control.createMock(RMEndpoint.class, new Method[] {m1, m2, m3});
+        rme = EasyMock.createMockBuilder(RMEndpoint.class)
+            .addMockedMethods(m1, m2 , m3).createMock(control);
         rme.createService();
         EasyMock.expectLastCall();
         rme.createEndpoint(null);
@@ -169,7 +170,8 @@ public class RMEndpointTest extends Asse
     @Test
     public void testCreateEndpoint() throws NoSuchMethodException {
         Method m = RMEndpoint.class.getDeclaredMethod("getUsingAddressing", new Class[] {EndpointInfo.class});
-        rme = control.createMock(RMEndpoint.class, new Method[] {m});
+        rme = EasyMock.createMockBuilder(RMEndpoint.class)
+            .addMockedMethod(m).createMock(control);
         rme.setAplicationEndpoint(ae);
         rme.setManager(manager);
         Service as = control.createMock(Service.class);
@@ -269,7 +271,8 @@ public class RMEndpointTest extends Asse
     @Test
     public void testSetPolicies() throws NoSuchMethodException {
         Method m = RMEndpoint.class.getDeclaredMethod("getEndpoint", new Class[] {});
-        rme = control.createMock(RMEndpoint.class, new Method[] {m});
+        rme = EasyMock.createMockBuilder(RMEndpoint.class)
+            .addMockedMethod(m).createMock(control);
         rme.setAplicationEndpoint(ae);
         rme.setManager(manager);
         Endpoint e = control.createMock(Endpoint.class);

Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
Wed Dec 21 22:08:27 2011
@@ -36,8 +36,8 @@ import org.apache.cxf.ws.addressing.Attr
 import org.apache.cxf.ws.addressing.JAXWSAConstants;
 import org.apache.cxf.ws.addressing.MAPAggregator;
 import org.apache.cxf.ws.policy.AssertionInfoMap;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -127,7 +127,9 @@ public class RMInInterceptorTest extends
     NoSuchMethodException {
         Method m = RMInInterceptor.class.getDeclaredMethod("processAcknowledgments",
             new Class[] {Source.class, RMProperties.class});
-        interceptor = control.createMock(RMInInterceptor.class, new Method[] {m});
+        interceptor =
+            EasyMock.createMockBuilder(RMInInterceptor.class)
+                .addMockedMethod(m).createMock(control);
         Message message = setupInboundMessage(RMConstants.getSequenceAckAction(), onServer);
         rme.receivedControlMessage();
         EasyMock.expectLastCall();
@@ -192,8 +194,9 @@ public class RMInInterceptorTest extends
                                                             new Class[] {Destination.class,
Message.class});
         Method m4 = RMInInterceptor.class.getDeclaredMethod("processDeliveryAssurance",
                                                             new Class[] {RMProperties.class});
-        interceptor = control
-            .createMock(RMInInterceptor.class, new Method[] {m1, m2, m3, m4});
+        interceptor =
+            EasyMock.createMockBuilder(RMInInterceptor.class)
+                .addMockedMethods(m1, m2, m3, m4).createMock(control);
         Message message = setupInboundMessage("greetMe", true);
         Destination d = control.createMock(Destination.class);
         EasyMock.expect(manager.getDestination(message)).andReturn(d);

Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
Wed Dec 21 22:08:27 2011
@@ -57,8 +57,8 @@ import org.apache.cxf.ws.rm.manager.Sour
 import org.apache.cxf.ws.rm.persistence.RMMessage;
 import org.apache.cxf.ws.rm.persistence.RMStore;
 import org.apache.cxf.ws.rm.policy.RMAssertion;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -647,7 +647,7 @@ public class RMManagerTest extends Asser
         }
         
         <T> T createMock(Class<T> cls, Method[] m) {
-            T mock = c.createMock(cls, m);
+            T mock = EasyMock.createMockBuilder(cls).addMockedMethods(m).createMock(c);
             mocks.add(mock);
             return mock;
         }

Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
Wed Dec 21 22:08:27 2011
@@ -35,8 +35,8 @@ import org.apache.cxf.ws.addressing.Endp
 import org.apache.cxf.ws.addressing.JAXWSAConstants;
 import org.apache.cxf.ws.addressing.MAPAggregator;
 import org.apache.cxf.ws.addressing.v200408.AttributedURI;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -71,7 +71,9 @@ public class RMOutInterceptorTest extend
         Method[] mocked = new Method[] {                                                
             RMOutInterceptor.class.getDeclaredMethod("isRuntimeFault", new Class[] {Message.class})
         };
-        RMOutInterceptor interceptor = control.createMock(RMOutInterceptor.class, mocked);
+        RMOutInterceptor interceptor = 
+            EasyMock.createMockBuilder(RMOutInterceptor.class)
+                .addMockedMethods(mocked).createMock(control);
         Message message = control.createMock(Message.class);        
         EasyMock.expect(interceptor.isRuntimeFault(message)).andReturn(true);
         control.replay();
@@ -84,7 +86,9 @@ public class RMOutInterceptorTest extend
         Method[] mocked = new Method[] {                                                
             RMOutInterceptor.class.getDeclaredMethod("isRuntimeFault", new Class[] {Message.class})
         };
-        RMOutInterceptor interceptor = control.createMock(RMOutInterceptor.class, mocked);
+        RMOutInterceptor interceptor =
+            EasyMock.createMockBuilder(RMOutInterceptor.class)
+                .addMockedMethods(mocked).createMock(control);
         Message message = control.createMock(Message.class);        
         EasyMock.expect(interceptor.isRuntimeFault(message)).andReturn(false);
         EasyMock.expect(message.get(Message.REQUESTOR_ROLE)).andReturn(Boolean.FALSE).anyTimes();
       
@@ -106,7 +110,9 @@ public class RMOutInterceptorTest extend
                 new Class[] {Destination.class, RMProperties.class, Identifier.class, 
                              AttributedURI.class})            
         };
-        RMOutInterceptor interceptor = control.createMock(RMOutInterceptor.class, mocked);
        
+        RMOutInterceptor interceptor =
+            EasyMock.createMockBuilder(RMOutInterceptor.class)
+                .addMockedMethods(mocked).createMock(control);
         RMManager manager = control.createMock(RMManager.class);
         EasyMock.expect(interceptor.getManager()).andReturn(manager).times(5);
         

Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
Wed Dec 21 22:08:27 2011
@@ -24,8 +24,8 @@ import javax.xml.namespace.QName;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.service.model.ServiceInfo;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
Wed Dec 21 22:08:27 2011
@@ -35,8 +35,8 @@ import org.apache.cxf.ws.addressing.Cont
 import org.apache.cxf.ws.addressing.JAXWSAConstants;
 import org.apache.cxf.ws.rm.manager.AcksPolicyType;
 import org.apache.cxf.ws.rm.manager.DestinationPolicyType;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 
 import org.junit.After;
 import org.junit.Assert;

Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
Wed Dec 21 22:08:27 2011
@@ -26,8 +26,8 @@ import javax.xml.datatype.Duration;
 import org.apache.cxf.jaxb.DatatypeFactory;
 import org.apache.cxf.ws.rm.manager.SequenceTerminationPolicyType;
 import org.apache.cxf.ws.rm.manager.SourcePolicyType;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java
Wed Dec 21 22:08:27 2011
@@ -38,8 +38,8 @@ import org.apache.cxf.ws.rm.SequenceAckn
 import org.apache.cxf.ws.rm.SourceSequence;
 import org.apache.cxf.ws.rm.persistence.RMMessage;
 import org.apache.cxf.ws.rm.persistence.RMStoreException;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
@@ -296,7 +296,7 @@ public class RMTxStoreTest extends Asser
         control.verify();
         
         control.reset();
-        EasyMock.expect(seq.getLastMessageNumber()).andReturn(null);
+        EasyMock.expect(seq.getLastMessageNumber()).andReturn(Long.valueOf(0));
         EasyMock.expect(seq.getAcknowledgment()).andReturn(ack1);        
         EasyMock.expect(seq.getIdentifier()).andReturn(sid1);
         

Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
Wed Dec 21 22:08:27 2011
@@ -31,8 +31,8 @@ import org.apache.cxf.ws.rm.policy.RMAss
 import org.apache.cxf.ws.rm.policy.RMAssertion.BaseRetransmissionInterval;
 import org.apache.cxf.ws.rm.policy.RMAssertion.ExponentialBackoff;
 import org.apache.cxf.ws.rm.policy.RMAssertion.InactivityTimeout;
+import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
-import org.easymock.classextension.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java
Wed Dec 21 22:08:27 2011
@@ -56,8 +56,8 @@ import org.apache.cxf.ws.rm.SequenceAckn
 import org.apache.cxf.ws.rm.SequenceFault;
 import org.apache.cxf.ws.rm.SequenceFaultType;
 import org.apache.cxf.ws.rm.SequenceType;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -102,7 +102,9 @@ public class RMSoapInterceptorTest exten
     public void testHandleMessage() throws NoSuchMethodException {
         Method m = RMSoapInterceptor.class.getDeclaredMethod("mediate", 
             new Class[] {SoapMessage.class});
-        RMSoapInterceptor codec = control.createMock(RMSoapInterceptor.class, new Method[]
{m});
+        RMSoapInterceptor codec = 
+            EasyMock.createMockBuilder(RMSoapInterceptor.class)
+                .addMockedMethod(m).createMock(control);
         SoapMessage msg = control.createMock(SoapMessage.class);
         codec.mediate(msg);
         EasyMock.expectLastCall();
@@ -118,7 +120,9 @@ public class RMSoapInterceptorTest exten
                                                              new Class[] {SoapMessage.class});
         Method m2 = RMSoapInterceptor.class.getDeclaredMethod("decode", 
                                                               new Class[] {SoapMessage.class});
-        RMSoapInterceptor codec = control.createMock(RMSoapInterceptor.class, new Method[]
{m1, m2});
+        RMSoapInterceptor codec =
+            EasyMock.createMockBuilder(RMSoapInterceptor.class)
+                .addMockedMethods(m1, m2).createMock(control);
         
         SoapMessage msg = control.createMock(SoapMessage.class);
         Exchange exchange = control.createMock(Exchange.class);

Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
Wed Dec 21 22:08:27 2011
@@ -35,8 +35,8 @@ import org.apache.cxf.ws.rm.SequenceType
 import org.apache.cxf.ws.rm.SourceSequence;
 import org.apache.cxf.ws.rm.persistence.RMStore;
 import org.apache.cxf.ws.rm.policy.RMAssertion;
+import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
-import org.easymock.classextension.EasyMock;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
Wed Dec 21 22:08:27 2011
@@ -32,8 +32,8 @@ import org.apache.cxf.ws.rm.RMConstants;
 import org.apache.cxf.ws.rm.SequenceAcknowledgement;
 import org.apache.cxf.ws.rm.SequenceFault;
 import org.apache.cxf.ws.rm.SequenceFaultType;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: cxf/branches/2.4.x-fixes/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/security/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/ws/security/pom.xml Wed Dec 21 22:08:27 2011
@@ -125,11 +125,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
             <version>${project.version}</version>

Modified: cxf/branches/2.4.x-fixes/systests/databinding/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/databinding/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/databinding/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/databinding/pom.xml Wed Dec 21 22:08:27 2011
@@ -301,11 +301,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
              <groupId>com.sun.xml.fastinfoset</groupId>
              <artifactId>FastInfoset</artifactId>
          </dependency>

Modified: cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml Wed Dec 21 22:08:27 2011
@@ -268,11 +268,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
         </dependency>

Modified: cxf/branches/2.4.x-fixes/systests/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxws/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxws/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/jaxws/pom.xml Wed Dec 21 22:08:27 2011
@@ -197,11 +197,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
         </dependency>

Modified: cxf/branches/2.4.x-fixes/systests/transport-jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/transport-jms/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/transport-jms/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/transport-jms/pom.xml Wed Dec 21 22:08:27 2011
@@ -292,11 +292,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
         </dependency>

Modified: cxf/branches/2.4.x-fixes/systests/transports/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/transports/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/transports/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/transports/pom.xml Wed Dec 21 22:08:27 2011
@@ -268,11 +268,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
         </dependency>

Modified: cxf/branches/2.4.x-fixes/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/uncategorized/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/uncategorized/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/uncategorized/pom.xml Wed Dec 21 22:08:27 2011
@@ -376,11 +376,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
         </dependency>

Modified: cxf/branches/2.4.x-fixes/tools/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/common/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/common/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/tools/common/pom.xml Wed Dec 21 22:08:27 2011
@@ -40,11 +40,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
             <scope>test</scope>

Modified: cxf/branches/2.4.x-fixes/tools/javato/ws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/javato/ws/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/javato/ws/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/tools/javato/ws/pom.xml Wed Dec 21 22:08:27 2011
@@ -93,13 +93,6 @@
 
 
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-
-        <dependency>
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
             <scope>test</scope>

Modified: cxf/branches/2.4.x-fixes/tools/validator/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/validator/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/validator/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/tools/validator/pom.xml Wed Dec 21 22:08:27 2011
@@ -45,11 +45,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
             <scope>test</scope>

Modified: cxf/branches/2.4.x-fixes/tools/wsdlto/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wsdlto/core/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/wsdlto/core/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/tools/wsdlto/core/pom.xml Wed Dec 21 22:08:27 2011
@@ -63,11 +63,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
             <scope>test</scope>

Modified: cxf/branches/2.4.x-fixes/tools/wsdlto/misc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wsdlto/misc/pom.xml?rev=1221902&r1=1221901&r2=1221902&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/wsdlto/misc/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/tools/wsdlto/misc/pom.xml Wed Dec 21 22:08:27 2011
@@ -40,11 +40,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
             <scope>test</scope>



Mime
View raw message