Yevgeny Zaspitsky has uploaded a new change for review. Change subject: restapi: remove deprecated org.easymock.classextension.EasyMock ......................................................................
restapi: remove deprecated org.easymock.classextension.EasyMock Remove usage of the deprecated org.easymock.classextension.EasyMock, replace that by org.easymock.EasyMock. Change-Id: I8c4f57a726d3d10d520d2e0c6653da98ab5f3905 Signed-off-by: Yevgeny Zaspitsky <[email protected]> --- M backend/manager/modules/restapi/interface/common/jaxrs/pom.xml M backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/DetailHelperTest.java M backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/QueryHelperTest.java M backend/manager/modules/restapi/jaxrs/pom.xml M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDisksResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmApplicationResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmApplicationsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/test/util/TestHelper.java M backend/manager/modules/restapi/types/pom.xml 12 files changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/38618/3 diff --git a/backend/manager/modules/restapi/interface/common/jaxrs/pom.xml b/backend/manager/modules/restapi/interface/common/jaxrs/pom.xml index fb91231..52a169d 100644 --- a/backend/manager/modules/restapi/interface/common/jaxrs/pom.xml +++ b/backend/manager/modules/restapi/interface/common/jaxrs/pom.xml @@ -34,7 +34,7 @@ <dependency> <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> + <artifactId>easymock</artifactId> <version>${easymock.version}</version> <scope>test</scope> </dependency> diff --git a/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/DetailHelperTest.java b/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/DetailHelperTest.java index 47dc17f..6c215fc 100644 --- a/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/DetailHelperTest.java +++ b/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/DetailHelperTest.java @@ -26,9 +26,9 @@ import org.junit.Test; import static org.easymock.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.expect; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; public class DetailHelperTest extends Assert { diff --git a/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/QueryHelperTest.java b/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/QueryHelperTest.java index 86d5e8c..0ee7096 100644 --- a/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/QueryHelperTest.java +++ b/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/QueryHelperTest.java @@ -29,8 +29,8 @@ import javax.ws.rs.core.PathSegment; import javax.ws.rs.core.UriInfo; +import org.easymock.EasyMock; import org.easymock.IMocksControl; -import org.easymock.classextension.EasyMock; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/backend/manager/modules/restapi/jaxrs/pom.xml b/backend/manager/modules/restapi/jaxrs/pom.xml index c98bc31..4b33dcd 100644 --- a/backend/manager/modules/restapi/jaxrs/pom.xml +++ b/backend/manager/modules/restapi/jaxrs/pom.xml @@ -77,7 +77,7 @@ <dependency> <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> + <artifactId>easymock</artifactId> <version>${easymock.version}</version> <scope>test</scope> </dependency> diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java index 6b7270a..d0b7d99 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java @@ -19,9 +19,9 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.easymock.EasyMock; import org.easymock.IAnswer; import org.easymock.IMocksControl; -import org.easymock.classextension.EasyMock; import org.jboss.resteasy.specimpl.MultivaluedMapImpl; import org.junit.After; import org.junit.Assert; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDisksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDisksResourceTest.java index 2892aee..e9b28e5 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDisksResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDisksResourceTest.java @@ -24,7 +24,6 @@ import org.ovirt.engine.core.compat.Guid; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.expect; @Ignore public class AbstractBackendDisksResourceTest<T extends AbstractBackendReadOnlyDevicesResource<Disk, Disks, org.ovirt.engine.core.common.businessentities.Disk>> diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java index 4521189..63600c6 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java @@ -11,7 +11,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.UriInfo; -import org.easymock.classextension.EasyMock; +import org.easymock.EasyMock; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java index d3dc3ce..523e6ff 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java @@ -11,7 +11,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.UriInfo; -import org.easymock.classextension.EasyMock; +import org.easymock.EasyMock; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmApplicationResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmApplicationResourceTest.java index 7183d38..e943b33 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmApplicationResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmApplicationResourceTest.java @@ -15,7 +15,7 @@ import org.ovirt.engine.api.model.Application; import org.ovirt.engine.api.model.Applications; import org.ovirt.engine.core.common.businessentities.VmDynamic; -import static org.easymock.classextension.EasyMock.expect; +import static org.easymock.EasyMock.expect; public class BackendVmApplicationResourceTest extends AbstractBackendSubResourceTest<Application, Applications, BackendVmApplicationResource> { diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmApplicationsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmApplicationsResourceTest.java index 5e6cd32..8d87c20 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmApplicationsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmApplicationsResourceTest.java @@ -10,10 +10,11 @@ import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; -import static org.easymock.classextension.EasyMock.expect; import org.ovirt.engine.api.model.Application; import org.ovirt.engine.api.model.Applications; +import static org.easymock.EasyMock.expect; + public class BackendVmApplicationsResourceTest extends AbstractBackendResourceTest { BackendVmApplicationsResource resource; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/test/util/TestHelper.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/test/util/TestHelper.java index 3e07e59..8cd5d8f 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/test/util/TestHelper.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/test/util/TestHelper.java @@ -6,8 +6,8 @@ import java.lang.reflect.Method; +import org.easymock.EasyMock; import org.easymock.IArgumentMatcher; -import org.easymock.classextension.EasyMock; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.queries.SearchParameters; diff --git a/backend/manager/modules/restapi/types/pom.xml b/backend/manager/modules/restapi/types/pom.xml index 1bf12b3..a63858d 100644 --- a/backend/manager/modules/restapi/types/pom.xml +++ b/backend/manager/modules/restapi/types/pom.xml @@ -26,7 +26,7 @@ <dependency> <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> + <artifactId>easymock</artifactId> <version>${easymock.version}</version> <scope>test</scope> </dependency> -- To view, visit https://gerrit.ovirt.org/38618 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8c4f57a726d3d10d520d2e0c6653da98ab5f3905 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yevgeny Zaspitsky <[email protected]> Gerrit-Reviewer: Juan Hernandez <[email protected]> Gerrit-Reviewer: Yevgeny Zaspitsky <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-Reviewer: oVirt Jenkins CI Server _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
