easymock -> mockito

Author: tedeling

eHour-wicketweb/src/test/java/net/rrm/ehour/ui/common/AbstractSpringTester.java

@@ -26,7 +26,8 @@
 
 import java.util.Calendar;
 
-import static org.easymock.EasyMock.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 /**
  * Created on Mar 17, 2009, 5:31:37 AM
@@ -36,6 +37,7 @@
 public abstract class AbstractSpringTester {
     private ApplicationContextMock mockContext;
     private EhourConfigStub config;
+
     private AuditService auditService;
     private EhourSystemConfig ehourSystemConfig = new EhourSystemConfig();
 
@@ -48,18 +50,17 @@ private void createContextSetup() {
         config.setFirstDayOfWeek(Calendar.SUNDAY);
         mockContext.putBean("EhourConfig", config);
 
-        auditService = createMock(AuditService.class);
+        auditService = mock(AuditService.class);
         mockContext.putBean("auditService", auditService);
 
         mockContext.putBean("authUtil", buildAuthUtil());
 
-        UpdateService updateService = createMock(UpdateService.class);
+        UpdateService updateService = mock(UpdateService.class);
         mockContext.putBean(updateService);
 
         mockContext.putBean("menuDefinition", Lists.newArrayList());
 
-        expect(updateService.isLatestVersion()).andReturn(Boolean.TRUE).atLeastOnce();
-        replay(updateService);
+        when(updateService.isLatestVersion()).thenReturn(Boolean.TRUE);
     }
 
     public final ApplicationContextMock getMockContext() {

eHour-wicketweb/src/test/java/net/rrm/ehour/ui/common/util/WebUtilsTest.java

@@ -19,9 +19,6 @@
 import net.rrm.ehour.ui.report.panel.aggregate.ProjectReportPanelTest;
 import org.junit.Test;
 
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-
 /**
  * Created on Mar 17, 2009, 7:04:03 AM
  *
@@ -32,10 +29,9 @@ public class WebUtilsTest extends ProjectReportPanelTest {
     public void testFindComponent() {
         setupExpectations();
 
-        replay(getAggregateReportService());
-
-        getTester().assertNoErrorMessage();
+        startReportPanel();
 
-        verify(getAggregateReportService());
+        tester.assertNoErrorMessage();
+        tester.assertNoInfoMessage();
     }
 }

eHour-wicketweb/src/test/java/net/rrm/ehour/ui/report/panel/aggregate/AbstractReportPanelTest.java

@@ -25,7 +25,9 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.easymock.EasyMock.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 /**
  * Created on Mar 17, 2009, 6:39:39 AM
@@ -35,30 +37,25 @@
 public abstract class AbstractReportPanelTest extends BaseSpringWebAppTester {
     private AggregateReportService aggregateReportService;
 
-
     @Before
     public void setup() {
-        aggregateReportService = createMock(AggregateReportService.class);
+        aggregateReportService = mock(AggregateReportService.class);
         getMockContext().putBean("aggregateReportService", aggregateReportService);
     }
 
     @Test
     public void shouldRenderReportPanel() {
         setupExpectations();
 
-        replay(aggregateReportService);
-
         startReportPanel();
 
         tester.assertNoErrorMessage();
-
-        verify(aggregateReportService);
+        tester.assertNoInfoMessage();
     }
 
     protected void setupExpectations() {
-        expect(aggregateReportService.getAggregateReportData(isA(ReportCriteria.class)))
-                .andReturn(AggregateReportDataObjectMother.getAssignmentReportData())
-                .anyTimes();
+        when(aggregateReportService.getAggregateReportData(any(ReportCriteria.class)))
+                .thenReturn(AggregateReportDataObjectMother.getAssignmentReportData());
     }
 
     protected void startReportPanel() {