Skip to content
This repository was archived by the owner on Nov 24, 2022. It is now read-only.

Commit db73ec4

Browse files
tedelingtedeling
committed
replacing easymock with mockito to keep one mock framework
1 parent 290fcc2 commit db73ec4

3 files changed

Lines changed: 105 additions & 166 deletions

File tree

‎eHour-service/src/test/java/net/rrm/ehour/project/status/ProjectAssignmentStatusServiceTest.java‎

Lines changed: 35 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@
2929

3030
import java.util.*;
3131

32-
import static org.easymock.EasyMock.*;
3332
import static org.junit.Assert.assertEquals;
3433
import static org.junit.Assert.assertTrue;
34+
import static org.mockito.Mockito.mock;
35+
import static org.mockito.Mockito.when;
3536

3637
public class ProjectAssignmentStatusServiceTest
3738
{
@@ -44,8 +45,8 @@ public void setUp() throws Exception
4445
{
4546
util = new ProjectAssignmentStatusServiceImpl();
4647

47-
raDAO = createMock(ReportAggregatedDao.class);
48-
timesheetDAO = createMock(TimesheetDao.class);
48+
raDAO = mock(ReportAggregatedDao.class);
49+
timesheetDAO = mock(TimesheetDao.class);
4950
util.setTimesheetDAO(timesheetDAO);
5051
util.setReportAggregatedDAO(raDAO);
5152
}
@@ -70,15 +71,13 @@ public final void testGetAssignmentStatusDateIn()
7071
Date endDate = endCal.getTime();
7172
assignment.setDateEnd(endDate);
7273

73-
expect(timesheetDAO.getTimesheetEntriesBefore(assignment, startDate))
74-
.andReturn(new ArrayList<TimesheetEntry>());
74+
when(timesheetDAO.getTimesheetEntriesBefore(assignment, startDate))
75+
.thenReturn(new ArrayList<TimesheetEntry>());
7576

76-
expect(timesheetDAO.getTimesheetEntriesAfter(assignment, endDate))
77-
.andReturn(new ArrayList<TimesheetEntry>());
77+
when(timesheetDAO.getTimesheetEntriesAfter(assignment, endDate))
78+
.thenReturn(new ArrayList<TimesheetEntry>());
7879

79-
replay(timesheetDAO);
8080
ProjectAssignmentStatus status = util.getAssignmentStatus(assignment);
81-
verify(timesheetDAO);
8281

8382
assertTrue(status.getStatusses().contains(ProjectAssignmentStatus.Status.RUNNING));
8483
assertEquals(1, status.getStatusses().size());
@@ -103,17 +102,15 @@ public final void testGetAssignmentStatusDateOut()
103102
assignment.setDateEnd(endCal.getTime());
104103
Date end = endCal.getTime();
105104

106-
expect(timesheetDAO.getTimesheetEntriesBefore(assignment, start))
107-
.andReturn(new ArrayList<TimesheetEntry>());
105+
when(timesheetDAO.getTimesheetEntriesBefore(assignment, start))
106+
.thenReturn(new ArrayList<TimesheetEntry>());
108107

109108
List<TimesheetEntry> entry = new ArrayList<TimesheetEntry>();
110109
entry.add(new TimesheetEntry());
111-
expect(timesheetDAO.getTimesheetEntriesAfter(assignment, end))
112-
.andReturn(entry);
110+
when(timesheetDAO.getTimesheetEntriesAfter(assignment, end))
111+
.thenReturn(entry);
113112

114-
replay(timesheetDAO);
115113
ProjectAssignmentStatus status = util.getAssignmentStatus(assignment);
116-
verify(timesheetDAO);
117114

118115
assertTrue(status.getStatusses().contains(ProjectAssignmentStatus.Status.AFTER_DEADLINE));
119116
assertEquals(1, status.getStatusses().size());
@@ -123,23 +120,19 @@ public final void testGetAssignmentStatusDateOut()
123120
public final void testGetAssignmentStatusFixed()
124121
{
125122
AssignmentAggregateReportElement pag = new AssignmentAggregateReportElement();
126-
pag.setHours(new Double(25));
123+
pag.setHours((double) 25);
127124

128125
ProjectAssignment assignment = new ProjectAssignment();
129126
ProjectAssignmentType type = new ProjectAssignmentType();
130127
type.setAssignmentTypeId(EhourConstants.ASSIGNMENT_TIME_ALLOTTED_FIXED);
131128
assignment.setAssignmentType(type);
132-
assignment.setAllottedHours(new Float(250f));
129+
assignment.setAllottedHours(250f);
133130

134-
expect(raDAO.getCumulatedHoursForAssignment(assignment))
135-
.andReturn(pag);
136-
137-
replay(raDAO);
131+
when(raDAO.getCumulatedHoursForAssignment(assignment))
132+
.thenReturn(pag);
138133

139134
ProjectAssignmentStatus status = util.getAssignmentStatus(assignment);
140135

141-
verify(raDAO);
142-
143136
assertTrue(status.getStatusses().contains(ProjectAssignmentStatus.Status.IN_ALLOTTED));
144137
assertTrue(status.getStatusses().contains(ProjectAssignmentStatus.Status.RUNNING));
145138
assertEquals(2, status.getStatusses().size());
@@ -149,23 +142,19 @@ public final void testGetAssignmentStatusFixed()
149142
public final void testGetAssignmentStatusFixedOverAllotted()
150143
{
151144
AssignmentAggregateReportElement pag = new AssignmentAggregateReportElement();
152-
pag.setHours(new Double(260));
145+
pag.setHours((double) 260);
153146

154147
ProjectAssignment assignment = new ProjectAssignment();
155148
ProjectAssignmentType type = new ProjectAssignmentType();
156149
type.setAssignmentTypeId(EhourConstants.ASSIGNMENT_TIME_ALLOTTED_FIXED);
157150
assignment.setAssignmentType(type);
158-
assignment.setAllottedHours(new Float(250f));
159-
160-
expect(raDAO.getCumulatedHoursForAssignment(assignment))
161-
.andReturn(pag);
151+
assignment.setAllottedHours(250f);
162152

163-
replay(raDAO);
153+
when(raDAO.getCumulatedHoursForAssignment(assignment))
154+
.thenReturn(pag);
164155

165156
ProjectAssignmentStatus status = util.getAssignmentStatus(assignment);
166157

167-
verify(raDAO);
168-
169158
assertTrue(status.getStatusses().contains(ProjectAssignmentStatus.Status.OVER_ALLOTTED));
170159
assertTrue(status.getStatusses().contains(ProjectAssignmentStatus.Status.RUNNING));
171160
assertEquals(2, status.getStatusses().size());
@@ -175,24 +164,20 @@ public final void testGetAssignmentStatusFixedOverAllotted()
175164
public final void testGetAssignmentStatusFlex()
176165
{
177166
AssignmentAggregateReportElement pag = new AssignmentAggregateReportElement();
178-
pag.setHours(new Double(25));
167+
pag.setHours((double) 25);
179168

180169
ProjectAssignment assignment = new ProjectAssignment();
181170
ProjectAssignmentType type = new ProjectAssignmentType();
182171
type.setAssignmentTypeId(EhourConstants.ASSIGNMENT_TIME_ALLOTTED_FLEX);
183172
assignment.setAssignmentType(type);
184-
assignment.setAllottedHours(new Float(250f));
185-
assignment.setAllowedOverrun(new Float(200f));
186-
187-
expect(raDAO.getCumulatedHoursForAssignment(assignment))
188-
.andReturn(pag);
173+
assignment.setAllottedHours(250f);
174+
assignment.setAllowedOverrun(200f);
189175

190-
replay(raDAO);
176+
when(raDAO.getCumulatedHoursForAssignment(assignment))
177+
.thenReturn(pag);
191178

192179
ProjectAssignmentStatus status = util.getAssignmentStatus(assignment);
193180

194-
verify(raDAO);
195-
196181
assertTrue(status.getStatusses().contains(ProjectAssignmentStatus.Status.IN_ALLOTTED));
197182
assertTrue(status.getStatusses().contains(ProjectAssignmentStatus.Status.RUNNING));
198183
assertEquals(2, status.getStatusses().size());
@@ -202,24 +187,20 @@ public final void testGetAssignmentStatusFlex()
202187
public final void testGetAssignmentStatusFlexOverrun()
203188
{
204189
AssignmentAggregateReportElement pag = new AssignmentAggregateReportElement();
205-
pag.setHours(new Double(260));
190+
pag.setHours((double) 260);
206191

207192
ProjectAssignment assignment = new ProjectAssignment();
208193
ProjectAssignmentType type = new ProjectAssignmentType();
209194
type.setAssignmentTypeId(EhourConstants.ASSIGNMENT_TIME_ALLOTTED_FLEX);
210195
assignment.setAssignmentType(type);
211-
assignment.setAllottedHours(new Float(250f));
212-
assignment.setAllowedOverrun(new Float(200f));
196+
assignment.setAllottedHours(250f);
197+
assignment.setAllowedOverrun(200f);
213198

214-
expect(raDAO.getCumulatedHoursForAssignment(assignment))
215-
.andReturn(pag);
216-
217-
replay(raDAO);
199+
when(raDAO.getCumulatedHoursForAssignment(assignment))
200+
.thenReturn(pag);
218201

219202
ProjectAssignmentStatus status = util.getAssignmentStatus(assignment);
220203

221-
verify(raDAO);
222-
223204
assertTrue(status.getStatusses().contains(ProjectAssignmentStatus.Status.IN_OVERRUN));
224205
assertTrue(status.getStatusses().contains(ProjectAssignmentStatus.Status.RUNNING));
225206
assertEquals(2, status.getStatusses().size());
@@ -229,36 +210,22 @@ public final void testGetAssignmentStatusFlexOverrun()
229210
public final void testGetAssignmentStatusFlexOverOverrun()
230211
{
231212
AssignmentAggregateReportElement pag = new AssignmentAggregateReportElement();
232-
pag.setHours(new Double(560));
213+
pag.setHours((double) 560);
233214

234215
ProjectAssignment assignment = new ProjectAssignment();
235216
ProjectAssignmentType type = new ProjectAssignmentType();
236217
type.setAssignmentTypeId(EhourConstants.ASSIGNMENT_TIME_ALLOTTED_FLEX);
237218
assignment.setAssignmentType(type);
238-
assignment.setAllottedHours(new Float(250f));
239-
assignment.setAllowedOverrun(new Float(200f));
240-
241-
expect(raDAO.getCumulatedHoursForAssignment(assignment))
242-
.andReturn(pag);
219+
assignment.setAllottedHours(250f);
220+
assignment.setAllowedOverrun(200f);
243221

244-
replay(raDAO);
222+
when(raDAO.getCumulatedHoursForAssignment(assignment))
223+
.thenReturn(pag);
245224

246225
ProjectAssignmentStatus status = util.getAssignmentStatus(assignment);
247226

248-
verify(raDAO);
249-
250227
assertTrue(status.getStatusses().contains(ProjectAssignmentStatus.Status.OVER_OVERRUN));
251228
assertTrue(status.getStatusses().contains(ProjectAssignmentStatus.Status.RUNNING));
252229
assertEquals(2, status.getStatusses().size());
253230
}
254-
255-
// @Test
256-
// public void testGetAssignmentStatusFixed()
257-
// {
258-
// ProjectAssignment assignment = new ProjectAssignment();
259-
// ProjectAssignmentType type = new ProjectAssignmentType(EhourConstants.ASSIGNMENT_TIME_ALLOTTED_FIXED);
260-
// assignment.setAssignmentType(type);
261-
//
262-
// }
263-
264231
}

0 commit comments

Comments
 (0)