switched easymock -> mockito

Author: Matthew Gilliard

pom.xml

@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -176,9 +177,10 @@
             </dependency>
 
             <dependency>
-                <groupId>org.easymock</groupId>
-                <artifactId>easymock</artifactId>
-                <version>3.0</version>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>1.8.1</version>
+                <scope>test</scope>
             </dependency>
 
             <dependency>

rest-client-driver/pom.xml

@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>rest-client-driver</artifactId>
@@ -20,8 +21,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
 

rest-client-driver/src/test/java/com/github/restdriver/clientdriver/clientdriver/unit/BenchHandlerTest.java

@@ -30,38 +30,32 @@
 import com.github.restdriver.clientdriver.jetty.DefaultClientDriverJettyHandler;
 import junit.framework.Assert;
 
-import org.easymock.EasyMock;
 import org.eclipse.jetty.server.Request;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.github.restdriver.clientdriver.exception.ClientDriverInternalException;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 public class BenchHandlerTest {
 
     private DefaultClientDriverJettyHandler sut;
     private RequestMatcher mockRequestMatcher;
 
     @Before
     public void before() {
-        mockRequestMatcher = EasyMock.createMock(RequestMatcher.class);
+        mockRequestMatcher = mock(RequestMatcher.class);
         sut = new DefaultClientDriverJettyHandler(mockRequestMatcher);
     }
 
-    @After
-    public void after() {
-        EasyMock.verify(mockRequestMatcher);
-    }
-
     /**
      * with no expectations set, and no requests made, the handler does not report any errors
      */
     @Test
     public void testMinimalHandler() {
 
-        EasyMock.replay(mockRequestMatcher);
-
         sut.checkForUnexpectedRequests();
         sut.checkForUnmatchedExpectations();
 
@@ -75,8 +69,6 @@ public void testUnmetExpectation() {
 
         sut.addExpectation(new ClientDriverRequest("hmm"), new ClientDriverResponse("mmm"));
 
-        EasyMock.replay(mockRequestMatcher);
-
         sut.checkForUnexpectedRequests();
 
         try {
@@ -94,16 +86,12 @@ public void testUnmetExpectation() {
     @Test
     public void testUnexpectedRequest() throws IOException, ServletException {
 
-        Request mockRequest = EasyMock.createMock(Request.class);
-        HttpServletRequest mockHttpRequest = EasyMock.createMock(HttpServletRequest.class);
-        HttpServletResponse mockHttpResponse = EasyMock.createMock(HttpServletResponse.class);
+        Request mockRequest = mock(Request.class);
+        HttpServletRequest mockHttpRequest = mock(HttpServletRequest.class);
+        HttpServletResponse mockHttpResponse = mock(HttpServletResponse.class);
 
-        EasyMock.expect(mockHttpRequest.getPathInfo()).andReturn("yarr");
-        EasyMock.expect(mockHttpRequest.getQueryString()).andReturn("gooo=gredge");
-
-        EasyMock.replay(mockHttpRequest);
-        EasyMock.replay(mockHttpResponse);
-        EasyMock.replay(mockRequestMatcher);
+        when(mockHttpRequest.getPathInfo()).thenReturn("yarr");
+        when(mockHttpRequest.getQueryString()).thenReturn("gooo=gredge");
 
         try {
             sut.handle("", mockRequest, mockHttpRequest, mockHttpResponse);
@@ -112,9 +100,6 @@ public void testUnexpectedRequest() throws IOException, ServletException {
             Assert.assertEquals("Unexpected request: yarr?gooo=gredge", bre.getMessage());
         }
 
-        EasyMock.verify(mockHttpRequest);
-        EasyMock.verify(mockHttpResponse);
-
         try {
             sut.checkForUnexpectedRequests();
             Assert.fail();
@@ -130,34 +115,29 @@ public void testUnexpectedRequest() throws IOException, ServletException {
     @Test
     public void testExpectedRequest() throws IOException, ServletException {
 
-        Request mockRequest = EasyMock.createMock(Request.class);
+        Request mockRequest = mock(Request.class);
         HttpServletRequest mockHttpRequest = new Request();
-        HttpServletResponse mockHttpResponse = EasyMock.createMock(HttpServletResponse.class);
+        HttpServletResponse mockHttpResponse = mock(HttpServletResponse.class);
 
         ClientDriverRequest realRequest = new ClientDriverRequest("yarr").withParam("gooo", "gredge");
         ClientDriverResponse realResponse = new ClientDriverResponse("lovely").withStatus(404).withContentType("fhieow")
                 .withHeader("hhh", "JJJ");
 
-        EasyMock.expect(mockRequestMatcher.isMatch(mockHttpRequest, realRequest)).andReturn(true);
+        when(mockRequestMatcher.isMatch(mockHttpRequest, realRequest)).thenReturn(true);
 
         mockHttpResponse.setContentType("fhieow");
         mockHttpResponse.setStatus(404);
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         PrintWriter printWriter = new PrintWriter(baos);
 
-        EasyMock.expect(mockHttpResponse.getWriter()).andReturn(printWriter);
+        when(mockHttpResponse.getWriter()).thenReturn(printWriter);
         mockHttpResponse.setHeader("hhh", "JJJ");
 
-        EasyMock.replay(mockHttpResponse);
-        EasyMock.replay(mockRequestMatcher);
-
         sut.addExpectation(realRequest, realResponse);
 
         sut.getJettyHandler().handle("", mockRequest, mockHttpRequest, mockHttpResponse);
 
-        EasyMock.verify(mockHttpResponse);
-
         printWriter.close();
         Assert.assertEquals("lovely", new String(baos.toByteArray()));