Allon Mureinik has uploaded a new change for review. Change subject: core: Remove infinispan mocking from bll tests ......................................................................
core: Remove infinispan mocking from bll tests This mocking seems to be useless. Perhaps it had some use when it was introduced, but its obvious it plays no function now. Change-Id: I0b7cc1a51971fce44316e9a7c3d14e686b84ec43 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveVdsCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java 2 files changed, 0 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/30831/1 diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveVdsCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveVdsCommandTest.java index 8755283..319a3e7 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveVdsCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveVdsCommandTest.java @@ -15,7 +15,6 @@ import java.util.Collections; import java.util.List; -import org.infinispan.transaction.tm.DummyTransactionManager; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -48,7 +47,6 @@ import org.ovirt.engine.core.dao.gluster.GlusterHooksDao; import org.ovirt.engine.core.dao.gluster.GlusterVolumeDao; import org.ovirt.engine.core.utils.MockEJBStrategyRule; -import org.ovirt.engine.core.utils.ejb.ContainerManagedResourceType; @RunWith(MockitoJUnitRunner.class) public class RemoveVdsCommandTest { @@ -257,7 +255,6 @@ } private void mockForExecute() { - ejbRule.mockResource(ContainerManagedResourceType.TRANSACTION_MANAGER, new DummyTransactionManager()); doReturn(null).when(vdsBrokerFrontend).RunVdsCommand(any(VDSCommandType.class), any(VDSParametersBase.class)); doNothing().when(vdsStaticDao).remove(any(Guid.class)); doNothing().when(vdsStatisticsDao).remove(any(Guid.class)); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java index 5a67a4f..9053b8f 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.Map; -import org.infinispan.transaction.tm.DummyTransactionManager; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -77,7 +76,6 @@ import org.ovirt.engine.core.utils.MockEJBStrategyRule; import org.ovirt.engine.core.utils.RandomUtils; import org.ovirt.engine.core.utils.RandomUtilsSeedingRule; -import org.ovirt.engine.core.utils.ejb.ContainerManagedResourceType; @RunWith(MockitoJUnitRunner.class) @@ -591,8 +589,6 @@ doNothing().when(command).reloadDisks(); doNothing().when(command).updateBootOrder(); doNothing().when(vmStaticDAO).incrementDbGeneration(any(Guid.class)); - - ejbRule.mockResource(ContainerManagedResourceType.TRANSACTION_MANAGER, new DummyTransactionManager()); SnapshotsValidator snapshotsValidator = mock(SnapshotsValidator.class); doReturn(snapshotsValidator).when(command).getSnapshotsValidator(); -- To view, visit http://gerrit.ovirt.org/30831 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b7cc1a51971fce44316e9a7c3d14e686b84ec43 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
