Skip to content
This repository was archived by the owner on Jul 11, 2018. It is now read-only.

Commit 3ec3753

Browse files
jashajjashaj
committed
Do not combine Mockito with Easymock
1 parent 22b8ceb commit 3ec3753

1 file changed

Lines changed: 24 additions & 39 deletions

File tree

‎coin-teams-war/src/test/java/nl/surfnet/coin/teams/control/AddMemberControllerTest.java‎

Lines changed: 24 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,9 @@
3838
import nl.surfnet.coin.teams.util.ControllerUtil;
3939
import nl.surfnet.coin.teams.util.TokenUtil;
4040

41-
import static org.easymock.EasyMock.createNiceMock;
42-
import static org.easymock.EasyMock.expect;
43-
import static org.easymock.EasyMock.replay;
44-
import static org.easymock.EasyMock.verify;
4541
import static org.junit.Assert.assertEquals;
42+
import static org.mockito.Mockito.mock;
43+
import static org.mockito.Mockito.when;
4644

4745
/**
4846
* Test for {@link AddMemberController}
@@ -68,16 +66,14 @@ public void testStartHappyFlow() throws Exception {
6866
autoWireMock(addMemberController, messageSource, MessageSource.class);
6967
autoWireMock(addMemberController, new Returns(Locale.ENGLISH), LocaleResolver.class);
7068

71-
ControllerUtil controllerUtil = createNiceMock(ControllerUtil.class);
72-
expect(controllerUtil.getTeam(request)).andReturn(team1);
73-
expect(controllerUtil.hasUserAdministrativePrivileges(person, team1.getId())).andReturn(true);
74-
replay(controllerUtil);
69+
ControllerUtil controllerUtil = mock(ControllerUtil.class);
70+
when(controllerUtil.getTeam(request)).thenReturn(team1);
71+
when(controllerUtil.hasUserAdministrativePrivileges(person, team1.getId())).thenReturn(true);
7572

7673
autoWireMock(addMemberController, controllerUtil, ControllerUtil.class);
7774
autoWireRemainingResources(addMemberController);
7875

7976
addMemberController.start(getModelMap(), request);
80-
verify(controllerUtil);
8177

8278
Team team = (Team) getModelMap().get("team");
8379

@@ -116,16 +112,13 @@ public void testAddMemberHappyFlow() throws Exception {
116112
autoWireMock(addMemberController, messageSource, MessageSource.class);
117113
autoWireMock(addMemberController, new Returns(Locale.ENGLISH), LocaleResolver.class);
118114

119-
ControllerUtil controllerUtil = createNiceMock(ControllerUtil.class);
120-
expect(controllerUtil.getTeam(request)).andReturn(team1);
121-
expect(controllerUtil.hasUserAdministrativePrivileges(person, team1.getId())).andReturn(true);
122-
replay(controllerUtil);
123-
115+
ControllerUtil controllerUtil = mock(ControllerUtil.class);
116+
when(controllerUtil.getTeam(request)).thenReturn(team1);
117+
when(controllerUtil.hasUserAdministrativePrivileges(person, team1.getId())).thenReturn(true);
124118
autoWireMock(addMemberController, controllerUtil, ControllerUtil.class);
125119
autoWireRemainingResources(addMemberController);
126120

127121
addMemberController.start(getModelMap(), request);
128-
verify(controllerUtil);
129122

130123
Team team = (Team) getModelMap().get("team");
131124

@@ -149,16 +142,14 @@ public void testAddMemberWrongPrivileges() throws Exception {
149142
autoWireMock(addMemberController, new Returns(Locale.ENGLISH), LocaleResolver.class);
150143

151144

152-
ControllerUtil controllerUtil = createNiceMock(ControllerUtil.class);
153-
expect(controllerUtil.getTeam(request)).andReturn(team1);
154-
expect(controllerUtil.hasUserAdministrativePrivileges(person, "team-1")).andReturn(false);
155-
replay(controllerUtil);
145+
ControllerUtil controllerUtil = mock(ControllerUtil.class);
146+
when(controllerUtil.getTeam(request)).thenReturn(team1);
147+
when(controllerUtil.hasUserAdministrativePrivileges(person, "team-1")).thenReturn(false);
156148

157149
autoWireMock(addMemberController, controllerUtil, ControllerUtil.class);
158150
autoWireRemainingResources(addMemberController);
159151

160152
addMemberController.start(getModelMap(), request);
161-
verify(controllerUtil);
162153

163154
Team team = (Team) getModelMap().get("team");
164155

@@ -186,10 +177,9 @@ public void testDoAddMemberHappyFlow() throws Exception {
186177
form.setMessage("A nice invite message");
187178
form.setTeamId(team1.getId());
188179

189-
ControllerUtil controllerUtil = createNiceMock(ControllerUtil.class);
190-
expect(controllerUtil.hasUserAdministrativePrivileges(person, team1.getId())).andReturn(true);
191-
expect(controllerUtil.getTeamById(team1.getId())).andReturn(team1);
192-
replay(controllerUtil);
180+
ControllerUtil controllerUtil = mock(ControllerUtil.class);
181+
when(controllerUtil.hasUserAdministrativePrivileges(person, team1.getId())).thenReturn(true);
182+
when(controllerUtil.getTeamById(team1.getId())).thenReturn(team1);
193183

194184
autoWireMock(addMemberController, controllerUtil, ControllerUtil.class);
195185
autoWireRemainingResources(addMemberController);
@@ -201,7 +191,6 @@ public void testDoAddMemberHappyFlow() throws Exception {
201191
token,
202192
new SimpleSessionStatus(),
203193
getModelMap());
204-
verify(controllerUtil);
205194

206195
assertEquals("redirect:detailteam.shtml?team=" + team1.getId() + "&view=app", result);
207196
}
@@ -226,18 +215,16 @@ public void testDoAddMemberNoPrivileges() throws Exception {
226215
form.setMessage("A nice invite message");
227216
form.setTeamId(getTeam1().getId());
228217

229-
GrouperTeamService grouperTeamService = createNiceMock(GrouperTeamService.class);
230-
expect(grouperTeamService.findTeamById(team1.getId())).andReturn(team1);
231-
expect(grouperTeamService.findMember(team1.getId(), member1.getId())).andReturn(member1);
232-
expect(grouperTeamService.findTeamById(team1.getId())).andReturn(team1);
233-
replay(grouperTeamService);
218+
GrouperTeamService grouperTeamService = mock(GrouperTeamService.class);
219+
when(grouperTeamService.findTeamById(team1.getId())).thenReturn(team1);
220+
when(grouperTeamService.findMember(team1.getId(), member1.getId())).thenReturn(member1);
221+
when(grouperTeamService.findTeamById(team1.getId())).thenReturn(team1);
234222

235223
autoWireMock(addMemberController, grouperTeamService, GrouperTeamService.class);
236224
autoWireRemainingResources(addMemberController);
237225

238-
addMemberController.addMembersToTeam(token, form, new DirectFieldBindingResult(form, "invitationForm"), request, token, new SimpleSessionStatus(), getModelMap()
239-
);
240-
verify(grouperTeamService);
226+
addMemberController.addMembersToTeam(token, form, new DirectFieldBindingResult(form, "invitationForm"), request,
227+
token, new SimpleSessionStatus(), getModelMap());
241228
}
242229

243230
@Test(expected = RuntimeException.class)
@@ -260,11 +247,10 @@ public void testDoAddMemberNoMember() throws Exception {
260247
form.setMessage("A nice invite message");
261248
form.setTeamId(team1.getId());
262249

263-
GrouperTeamService grouperTeamService = createNiceMock(GrouperTeamService.class);
264-
expect(grouperTeamService.findTeamById(team1.getId())).andReturn(team1);
265-
expect(grouperTeamService.findMember(team1.getId(), member1.getId())).andReturn(null);
266-
expect(grouperTeamService.findTeamById(team1.getId())).andReturn(team1);
267-
replay(grouperTeamService);
250+
GrouperTeamService grouperTeamService = mock(GrouperTeamService.class);
251+
when(grouperTeamService.findTeamById(team1.getId())).thenReturn(team1);
252+
when(grouperTeamService.findMember(team1.getId(), member1.getId())).thenReturn(null);
253+
when(grouperTeamService.findTeamById(team1.getId())).thenReturn(team1);
268254

269255
autoWireMock(addMemberController, grouperTeamService, GrouperTeamService.class);
270256
autoWireRemainingResources(addMemberController);
@@ -276,6 +262,5 @@ public void testDoAddMemberNoMember() throws Exception {
276262
token,
277263
new SimpleSessionStatus(),
278264
getModelMap());
279-
verify(grouperTeamService);
280265
}
281266
}

0 commit comments

Comments
 (0)