From 6bce8f3f54719a987830eaa83c5922db5364af63 Mon Sep 17 00:00:00 2001 From: Bogdan Bodnarjuk Date: Thu, 5 May 2016 17:07:50 +0300 Subject: [PATCH] Refactoring code for Easy Mock lib --- .../org/zkoss/ganttz/data/constraint/ConstraintTest.java | 6 +++--- .../test/orders/entities/AggregatedHoursGroupTest.java | 2 +- .../entities/AggregateOfResourceAllocationsTest.java | 4 ++-- .../planner/entities/DerivedAllocationGeneratorTest.java | 4 ++-- .../test/planner/entities/DerivedAllocationTest.java | 4 ++-- .../planner/entities/GenericResourceAllocationTest.java | 8 ++++---- .../planner/entities/SpecificResourceAllocationTest.java | 6 +++--- .../test/planner/entities/StretchesFunctionTest.java | 4 ++-- .../business/test/planner/entities/TaskElementTest.java | 4 ++-- .../business/test/planner/entities/TaskTest.java | 6 +++--- .../planner/entities/UntilFillingHoursAllocatorTest.java | 6 +++--- .../libreplan/web/orders/OrderElementTreeModelTest.java | 4 ++-- .../scenarios/CurrentUserScenarioAwareManagerTest.java | 4 ++-- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/ganttzk/src/test/java/org/zkoss/ganttz/data/constraint/ConstraintTest.java b/ganttzk/src/test/java/org/zkoss/ganttz/data/constraint/ConstraintTest.java index 832be1b5a..292b05a7e 100644 --- a/ganttzk/src/test/java/org/zkoss/ganttz/data/constraint/ConstraintTest.java +++ b/ganttzk/src/test/java/org/zkoss/ganttz/data/constraint/ConstraintTest.java @@ -22,9 +22,9 @@ package org.zkoss.ganttz.data.constraint; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.isA; -import static org.easymock.classextension.EasyMock.createNiceMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/orders/entities/AggregatedHoursGroupTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/orders/entities/AggregatedHoursGroupTest.java index 45461fc20..7edc3ce3a 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/orders/entities/AggregatedHoursGroupTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/orders/entities/AggregatedHoursGroupTest.java @@ -20,7 +20,7 @@ */ 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.core.AllOf.allOf; import static org.junit.Assert.assertThat; diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/AggregateOfResourceAllocationsTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/AggregateOfResourceAllocationsTest.java index 6e204f812..63e7f68d7 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/AggregateOfResourceAllocationsTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/AggregateOfResourceAllocationsTest.java @@ -22,8 +22,8 @@ package org.libreplan.business.test.planner.entities; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.replay; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DerivedAllocationGeneratorTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DerivedAllocationGeneratorTest.java index a8ae2b72a..6abe221d6 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DerivedAllocationGeneratorTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DerivedAllocationGeneratorTest.java @@ -23,8 +23,8 @@ package org.libreplan.business.test.planner.entities; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.isA; -import static org.easymock.classextension.EasyMock.createNiceMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.replay; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; import static org.libreplan.business.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_FILE; diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DerivedAllocationTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DerivedAllocationTest.java index 33c95275f..87f27b339 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DerivedAllocationTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/DerivedAllocationTest.java @@ -21,8 +21,8 @@ package org.libreplan.business.test.planner.entities; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createNiceMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.replay; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.sameInstance; import static org.junit.Assert.assertEquals; diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/GenericResourceAllocationTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/GenericResourceAllocationTest.java index 126a66f50..5b45e3a9c 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/GenericResourceAllocationTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/GenericResourceAllocationTest.java @@ -25,8 +25,8 @@ import static java.util.Arrays.asList; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.getCurrentArguments; import static org.easymock.EasyMock.isA; -import static org.easymock.classextension.EasyMock.createNiceMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.replay; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; @@ -49,7 +49,7 @@ import java.util.Set; import org.apache.commons.lang.Validate; import org.easymock.IAnswer; -import org.easymock.classextension.EasyMock; +import org.easymock.EasyMock; import org.joda.time.Interval; import org.joda.time.LocalDate; import org.joda.time.Period; @@ -140,7 +140,7 @@ public class GenericResourceAllocationTest { } private Set givenPredefinedCriterions() { - Set result = new HashSet(); + Set result = new HashSet<>(); Criterion criterion1 = createNiceMock(Criterion.class); setupIsSatisfiedByAll(criterion1); Criterion criterion2 = createNiceMock(Criterion.class); diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/SpecificResourceAllocationTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/SpecificResourceAllocationTest.java index d33f89759..2c35b7240 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/SpecificResourceAllocationTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/SpecificResourceAllocationTest.java @@ -26,8 +26,8 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.verify; -import static org.easymock.classextension.EasyMock.createNiceMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.replay; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; @@ -47,7 +47,7 @@ import java.util.List; import java.util.Map; import org.easymock.IAnswer; -import org.easymock.classextension.EasyMock; +import org.easymock.EasyMock; import org.joda.time.LocalDate; import org.junit.Test; import org.libreplan.business.calendars.entities.AvailabilityTimeLine; diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/StretchesFunctionTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/StretchesFunctionTest.java index eef6adcaa..c0846efd8 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/StretchesFunctionTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/StretchesFunctionTest.java @@ -22,8 +22,8 @@ package org.libreplan.business.test.planner.entities; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createNiceMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.replay; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/TaskElementTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/TaskElementTest.java index 4cfbd4fd8..b7b705ba6 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/TaskElementTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/TaskElementTest.java @@ -22,8 +22,8 @@ package org.libreplan.business.test.planner.entities; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createNiceMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.replay; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/TaskTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/TaskTest.java index d678bba85..4b27a6b50 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/TaskTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/TaskTest.java @@ -25,9 +25,9 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; import static org.easymock.EasyMock.getCurrentArguments; import static org.easymock.EasyMock.isA; -import static org.easymock.classextension.EasyMock.createNiceMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.resetToNice; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.resetToNice; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/UntilFillingHoursAllocatorTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/UntilFillingHoursAllocatorTest.java index 4463655d1..b2d1fabf4 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/UntilFillingHoursAllocatorTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/entities/UntilFillingHoursAllocatorTest.java @@ -26,9 +26,9 @@ import static org.easymock.EasyMock.expectLastCall; import static org.easymock.EasyMock.getCurrentArguments; import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.verify; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.createNiceMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.replay; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; diff --git a/libreplan-webapp/src/test/java/org/libreplan/web/orders/OrderElementTreeModelTest.java b/libreplan-webapp/src/test/java/org/libreplan/web/orders/OrderElementTreeModelTest.java index fc1bb1158..9b1562e93 100644 --- a/libreplan-webapp/src/test/java/org/libreplan/web/orders/OrderElementTreeModelTest.java +++ b/libreplan-webapp/src/test/java/org/libreplan/web/orders/OrderElementTreeModelTest.java @@ -22,8 +22,8 @@ package org.libreplan.web.orders; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createNiceMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.replay; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/libreplan-webapp/src/test/java/org/libreplan/web/scenarios/CurrentUserScenarioAwareManagerTest.java b/libreplan-webapp/src/test/java/org/libreplan/web/scenarios/CurrentUserScenarioAwareManagerTest.java index 8cdb3bdee..1a7357f30 100644 --- a/libreplan-webapp/src/test/java/org/libreplan/web/scenarios/CurrentUserScenarioAwareManagerTest.java +++ b/libreplan-webapp/src/test/java/org/libreplan/web/scenarios/CurrentUserScenarioAwareManagerTest.java @@ -21,8 +21,8 @@ package org.libreplan.web.scenarios; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createNiceMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.replay; import static org.junit.Assert.assertEquals; import static org.libreplan.business.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_FILE; import static org.libreplan.web.WebappGlobalNames.WEBAPP_SPRING_CONFIG_FILE;