RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactoring code for Easy Mock lib

Browse source
This commit is contained in:
Bogdan Bodnarjuk 2016-05-05 17:07:50 +03:00 • committed by skylow95
parent 7f52710689
commit 6bce8f3f54
13 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ganttzk/src/test/java/org/zkoss/ganttz/data/constraint/ConstraintTest.java
View file

@ -22,9 +22,9 @@ package org.zkoss.ganttz.data.constraint;
import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.isA;
import static org.easymock.classextension.EasyMock.createNiceMock; import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.classextension.EasyMock.replay; import static org.easymock.EasyMock.replay;
import static org.easymock.classextension.EasyMock.verify; import static org.easymock.EasyMock.verify;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;

2
libreplan-business/src/test/java/org/libreplan/business/test/orders/entities/AggregatedHoursGroupTest.java
View file

@ -20,7 +20,7 @@
*/ */
package org.libreplan.business.test.orders.entities; package org.libreplan.business.test.orders.entities;
import static org.easymock.classextension.EasyMock.createNiceMock; import static org.easymock.EasyMock.createNiceMock;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.core.AllOf.allOf; import static org.hamcrest.core.AllOf.allOf;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;

4
libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/AggregateOfResourceAllocationsTest.java
View file

@ -22,8 +22,8 @@
package org.libreplan.business.test.planner.entities; package org.libreplan.business.test.planner.entities;
import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expect;
import static org.easymock.classextension.EasyMock.createMock; import static org.easymock.EasyMock.createMock;
import static org.easymock.classextension.EasyMock.replay; import static org.easymock.EasyMock.replay;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;

4
libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DerivedAllocationGeneratorTest.java
View file

@ -23,8 +23,8 @@ package org.libreplan.business.test.planner.entities;
import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.isA;
import static org.easymock.classextension.EasyMock.createNiceMock; import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.classextension.EasyMock.replay; import static org.easymock.EasyMock.replay;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import static org.libreplan.business.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_FILE; import static org.libreplan.business.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_FILE;

4
libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DerivedAllocationTest.java
View file

@ -21,8 +21,8 @@
package org.libreplan.business.test.planner.entities; package org.libreplan.business.test.planner.entities;
import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expect;
import static org.easymock.classextension.EasyMock.createNiceMock; import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.classextension.EasyMock.replay; import static org.easymock.EasyMock.replay;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;

8
libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/GenericResourceAllocationTest.java
View file

@ -25,8 +25,8 @@ import static java.util.Arrays.asList;
import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.getCurrentArguments; import static org.easymock.EasyMock.getCurrentArguments;
import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.isA;
import static org.easymock.classextension.EasyMock.createNiceMock; import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.classextension.EasyMock.replay; import static org.easymock.EasyMock.replay;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
@ -49,7 +49,7 @@ import java.util.Set;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.easymock.IAnswer; import org.easymock.IAnswer;
import org.easymock.classextension.EasyMock; import org.easymock.EasyMock;
import org.joda.time.Interval; import org.joda.time.Interval;
import org.joda.time.LocalDate; import org.joda.time.LocalDate;
import org.joda.time.Period; import org.joda.time.Period;
@ -140,7 +140,7 @@ public class GenericResourceAllocationTest {
} }
private Set<Criterion> givenPredefinedCriterions() { private Set<Criterion> givenPredefinedCriterions() {
Set<Criterion> result = new HashSet<Criterion>(); Set<Criterion> result = new HashSet<>();
Criterion criterion1 = createNiceMock(Criterion.class); Criterion criterion1 = createNiceMock(Criterion.class);
setupIsSatisfiedByAll(criterion1); setupIsSatisfiedByAll(criterion1);
Criterion criterion2 = createNiceMock(Criterion.class); Criterion criterion2 = createNiceMock(Criterion.class);

6
libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/SpecificResourceAllocationTest.java
View file

@ -26,8 +26,8 @@ import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall; import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.isA;
import static org.easymock.EasyMock.verify; import static org.easymock.EasyMock.verify;
import static org.easymock.classextension.EasyMock.createNiceMock; import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.classextension.EasyMock.replay; import static org.easymock.EasyMock.replay;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.CoreMatchers.nullValue;
@ -47,7 +47,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.easymock.IAnswer; import org.easymock.IAnswer;
import org.easymock.classextension.EasyMock; import org.easymock.EasyMock;
import org.joda.time.LocalDate; import org.joda.time.LocalDate;
import org.junit.Test; import org.junit.Test;
import org.libreplan.business.calendars.entities.AvailabilityTimeLine; import org.libreplan.business.calendars.entities.AvailabilityTimeLine;

4
libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/StretchesFunctionTest.java
View file

@ -22,8 +22,8 @@
package org.libreplan.business.test.planner.entities; package org.libreplan.business.test.planner.entities;
import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expect;
import static org.easymock.classextension.EasyMock.createNiceMock; import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.classextension.EasyMock.replay; import static org.easymock.EasyMock.replay;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;

4
libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/TaskElementTest.java
View file

@ -22,8 +22,8 @@
package org.libreplan.business.test.planner.entities; package org.libreplan.business.test.planner.entities;
import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expect;
import static org.easymock.classextension.EasyMock.createNiceMock; import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.classextension.EasyMock.replay; import static org.easymock.EasyMock.replay;
import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.CoreMatchers.nullValue;

6
libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/TaskTest.java
View file

@ -25,9 +25,9 @@ import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall; import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.getCurrentArguments; import static org.easymock.EasyMock.getCurrentArguments;
import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.isA;
import static org.easymock.classextension.EasyMock.createNiceMock; import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.classextension.EasyMock.replay; import static org.easymock.EasyMock.replay;
import static org.easymock.classextension.EasyMock.resetToNice; import static org.easymock.EasyMock.resetToNice;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;

6
libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/UntilFillingHoursAllocatorTest.java
View file

@ -26,9 +26,9 @@ import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.getCurrentArguments; import static org.easymock.EasyMock.getCurrentArguments;
import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.isA;
import static org.easymock.EasyMock.verify; import static org.easymock.EasyMock.verify;
import static org.easymock.classextension.EasyMock.createMock; import static org.easymock.EasyMock.createMock;
import static org.easymock.classextension.EasyMock.createNiceMock; import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.classextension.EasyMock.replay; import static org.easymock.EasyMock.replay;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;

4
libreplan-webapp/src/test/java/org/libreplan/web/orders/OrderElementTreeModelTest.java
View file

@ -22,8 +22,8 @@
package org.libreplan.web.orders; package org.libreplan.web.orders;
import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expect;
import static org.easymock.classextension.EasyMock.createNiceMock; import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.classextension.EasyMock.replay; import static org.easymock.EasyMock.replay;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;

4
libreplan-webapp/src/test/java/org/libreplan/web/scenarios/CurrentUserScenarioAwareManagerTest.java
View file

@ -21,8 +21,8 @@
package org.libreplan.web.scenarios; package org.libreplan.web.scenarios;
import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expect;
import static org.easymock.classextension.EasyMock.createNiceMock; import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.classextension.EasyMock.replay; import static org.easymock.EasyMock.replay;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.libreplan.business.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_FILE; import static org.libreplan.business.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_FILE;
import static org.libreplan.web.WebappGlobalNames.WEBAPP_SPRING_CONFIG_FILE; import static org.libreplan.web.WebappGlobalNames.WEBAPP_SPRING_CONFIG_FILE;