ItEr08S06ArquitecturaClientesItEr07S07: Fixing error in test introduced in previous commit.
This commit is contained in:
parent
fd9e9feba9
commit
d6647b3b90
1 changed files with 14 additions and 12 deletions
|
|
@ -1,15 +1,5 @@
|
||||||
package org.navalplanner.web.resources;
|
package org.navalplanner.web.resources;
|
||||||
|
|
||||||
import static junit.framework.Assert.assertEquals;
|
|
||||||
import static junit.framework.Assert.assertFalse;
|
|
||||||
import static org.easymock.EasyMock.createMock;
|
|
||||||
import static org.easymock.EasyMock.createNiceMock;
|
|
||||||
import static org.easymock.EasyMock.expect;
|
|
||||||
import static org.easymock.EasyMock.expectLastCall;
|
|
||||||
import static org.easymock.EasyMock.isA;
|
|
||||||
import static org.easymock.EasyMock.replay;
|
|
||||||
import static org.easymock.EasyMock.verify;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -22,6 +12,18 @@ import org.navalplanner.web.common.IMessagesForUser;
|
||||||
import org.navalplanner.web.common.Level;
|
import org.navalplanner.web.common.Level;
|
||||||
import org.zkoss.zul.api.Window;
|
import org.zkoss.zul.api.Window;
|
||||||
|
|
||||||
|
import static junit.framework.Assert.assertEquals;
|
||||||
|
import static junit.framework.Assert.assertFalse;
|
||||||
|
|
||||||
|
import static org.easymock.EasyMock.createMock;
|
||||||
|
import static org.easymock.EasyMock.createNiceMock;
|
||||||
|
import static org.easymock.EasyMock.expect;
|
||||||
|
import static org.easymock.EasyMock.expectLastCall;
|
||||||
|
import static org.easymock.EasyMock.isA;
|
||||||
|
import static org.easymock.EasyMock.replay;
|
||||||
|
import static org.easymock.EasyMock.same;
|
||||||
|
import static org.easymock.EasyMock.verify;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tests for {@link WorkerCRUDController} <br />
|
* Tests for {@link WorkerCRUDController} <br />
|
||||||
* @author Óscar González Fernández <ogonzalez@igalia.com>
|
* @author Óscar González Fernández <ogonzalez@igalia.com>
|
||||||
|
|
@ -60,7 +62,7 @@ public class WorkerCRUDControllerTest {
|
||||||
// expectations
|
// expectations
|
||||||
expect(workerModel.createNewInstance()).andReturn(workerToReturn);
|
expect(workerModel.createNewInstance()).andReturn(workerToReturn);
|
||||||
workerModel.save(workerToReturn);
|
workerModel.save(workerToReturn);
|
||||||
messagesForUser.showMessage(Level.INFO,
|
messagesForUser.showMessage(same(Level.INFO),
|
||||||
isA(String.class));
|
isA(String.class));
|
||||||
replay(workerModel, messagesForUser);
|
replay(workerModel, messagesForUser);
|
||||||
// action
|
// action
|
||||||
|
|
@ -105,7 +107,7 @@ public class WorkerCRUDControllerTest {
|
||||||
expect(workerModel.getWorkers()).andReturn(workersToReturn);
|
expect(workerModel.getWorkers()).andReturn(workersToReturn);
|
||||||
expect(editWindow.setVisible(true)).andReturn(false);
|
expect(editWindow.setVisible(true)).andReturn(false);
|
||||||
workerModel.save(workersToReturn.get(0));
|
workerModel.save(workersToReturn.get(0));
|
||||||
messagesForUser.showMessage(Level.INFO,
|
messagesForUser.showMessage(same(Level.INFO),
|
||||||
isA(String.class));
|
isA(String.class));
|
||||||
replay(createWindow, listWindow, editWindow, workerModel,
|
replay(createWindow, listWindow, editWindow, workerModel,
|
||||||
messagesForUser);
|
messagesForUser);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue