Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java (original) +++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java Wed Dec 14 21:56:16 2011 @@ -36,8 +36,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.rm.v200702.Identifier; -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; @@ -73,7 +73,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).anyTimes(); control.replay(); @@ -86,7 +88,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).anyTimes(); EasyMock.expect(message.get(Message.REQUESTOR_ROLE)).andReturn(Boolean.FALSE).anyTimes(); @@ -108,7 +112,9 @@ public class RMOutInterceptorTest extend new Class[] {Destination.class, RMProperties.class, Identifier.class, AttributedURIType.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).anyTimes();
Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java (original) +++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java Wed Dec 14 21:56:16 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/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java (original) +++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java Wed Dec 14 21:56:16 2011 @@ -39,8 +39,8 @@ import org.apache.cxf.ws.rm.v200502.Crea import org.apache.cxf.ws.rm.v200502.CreateSequenceType; import org.apache.cxf.ws.rm.v200502.Expires; import org.apache.cxf.ws.rm.v200502.OfferType; -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/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java (original) +++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java Wed Dec 14 21:56:16 2011 @@ -30,8 +30,8 @@ import org.apache.cxf.ws.rm.v200702.Expi import org.apache.cxf.ws.rm.v200702.Identifier; import org.apache.cxf.ws.rm.v200702.ObjectFactory; import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement; -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/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java (original) +++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java Wed Dec 14 21:56:16 2011 @@ -39,8 +39,8 @@ import org.apache.cxf.ws.rm.persistence. import org.apache.cxf.ws.rm.persistence.RMStoreException; import org.apache.cxf.ws.rm.v200702.Identifier; import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement; -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; @@ -305,7 +305,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/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java (original) +++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java Wed Dec 14 21:56:16 2011 @@ -32,8 +32,8 @@ import org.apache.cxf.ws.rmp.v200502.RMA import org.apache.cxf.ws.rmp.v200502.RMAssertion.BaseRetransmissionInterval; import org.apache.cxf.ws.rmp.v200502.RMAssertion.ExponentialBackoff; import org.apache.cxf.ws.rmp.v200502.RMAssertion.InactivityTimeout; +import org.easymock.EasyMock; import org.easymock.IMocksControl; -import org.easymock.classextension.EasyMock; import org.junit.Assert; import org.junit.Before; Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java (original) +++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java Wed Dec 14 21:56:16 2011 @@ -59,8 +59,8 @@ import org.apache.cxf.ws.rm.v200702.Obje import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement; import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement.AcknowledgementRange; import org.apache.cxf.ws.rm.v200702.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; @@ -103,7 +103,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(); @@ -119,7 +121,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/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java (original) +++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java Wed Dec 14 21:56:16 2011 @@ -35,8 +35,8 @@ import org.apache.cxf.ws.rm.persistence. import org.apache.cxf.ws.rm.v200702.Identifier; import org.apache.cxf.ws.rm.v200702.SequenceType; import org.apache.cxf.ws.rmp.v200502.RMAssertion; +import org.easymock.EasyMock; import org.easymock.IMocksControl; -import org.easymock.classextension.EasyMock; import org.junit.After; import org.junit.Assert; Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java (original) +++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java Wed Dec 14 21:56:16 2011 @@ -38,8 +38,8 @@ import org.apache.cxf.ws.rm.SequenceFaul import org.apache.cxf.ws.rm.v200702.Identifier; import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement; import org.apache.cxf.ws.rm.v200702.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; Modified: cxf/trunk/rt/ws/security/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/pom.xml?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/pom.xml (original) +++ cxf/trunk/rt/ws/security/pom.xml Wed Dec 14 21:56:16 2011 @@ -131,11 +131,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/trunk/systests/databinding/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/pom.xml?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/systests/databinding/pom.xml (original) +++ cxf/trunk/systests/databinding/pom.xml Wed Dec 14 21:56:16 2011 @@ -315,11 +315,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/trunk/systests/jaxrs/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/pom.xml?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/pom.xml (original) +++ cxf/trunk/systests/jaxrs/pom.xml Wed Dec 14 21:56:16 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/trunk/systests/jaxws/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/pom.xml?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/systests/jaxws/pom.xml (original) +++ cxf/trunk/systests/jaxws/pom.xml Wed Dec 14 21:56:16 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/trunk/systests/rs-security/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/rs-security/pom.xml?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/systests/rs-security/pom.xml (original) +++ cxf/trunk/systests/rs-security/pom.xml Wed Dec 14 21:56:16 2011 @@ -183,11 +183,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/trunk/systests/transport-jms/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/pom.xml?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/systests/transport-jms/pom.xml (original) +++ cxf/trunk/systests/transport-jms/pom.xml Wed Dec 14 21:56:16 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/trunk/systests/transports/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/pom.xml?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/systests/transports/pom.xml (original) +++ cxf/trunk/systests/transports/pom.xml Wed Dec 14 21:56:16 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/trunk/systests/uncategorized/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/pom.xml?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/systests/uncategorized/pom.xml (original) +++ cxf/trunk/systests/uncategorized/pom.xml Wed Dec 14 21:56:16 2011 @@ -360,11 +360,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/trunk/tools/common/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/pom.xml?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/tools/common/pom.xml (original) +++ cxf/trunk/tools/common/pom.xml Wed Dec 14 21:56:16 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/trunk/tools/javato/ws/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/pom.xml?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/pom.xml (original) +++ cxf/trunk/tools/javato/ws/pom.xml Wed Dec 14 21:56:16 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/trunk/tools/validator/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/pom.xml?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/tools/validator/pom.xml (original) +++ cxf/trunk/tools/validator/pom.xml Wed Dec 14 21:56:16 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/trunk/tools/wsdlto/core/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/pom.xml?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/core/pom.xml (original) +++ cxf/trunk/tools/wsdlto/core/pom.xml Wed Dec 14 21:56:16 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/trunk/tools/wsdlto/misc/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/pom.xml?rev=1214496&r1=1214495&r2=1214496&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/misc/pom.xml (original) +++ cxf/trunk/tools/wsdlto/misc/pom.xml Wed Dec 14 21:56:16 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>
