Ori Liel has uploaded a new change for review. Change subject: restapi: Remove Mockito from Tests ......................................................................
restapi: Remove Mockito from Tests Change-Id: I14d5e772de6b79ae88ed2cfabdd873461e3b5d71 Signed-off-by: Ori Liel <[email protected]> --- M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/AbstractInvertibleMappingTest.java M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/TemplateMapperTest.java M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java A backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/utils/OsTypeMockUtils.java 4 files changed, 29 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/16040/1 diff --git a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/AbstractInvertibleMappingTest.java b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/AbstractInvertibleMappingTest.java index b6b0f4b..f76a888 100644 --- a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/AbstractInvertibleMappingTest.java +++ b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/AbstractInvertibleMappingTest.java @@ -8,12 +8,6 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; -import org.ovirt.engine.core.common.osinfo.OsRepository; -import org.ovirt.engine.core.common.utils.SimpleDependecyInjector; import org.ovirt.engine.core.utils.MockConfigRule; /** @@ -28,7 +22,6 @@ * @param <I> * inverse type (may be identical to T) */ -@RunWith(MockitoJUnitRunner.class) public abstract class AbstractInvertibleMappingTest<F, T, I> extends Assert { @Rule @@ -45,18 +38,12 @@ this.inverseClass = inverseClass; } - @Mock - OsRepository osRepository; - @Before public void setUp() { mappingLocator = new MappingLocator(); mappingLocator.populate(); - SimpleDependecyInjector.getInstance().bind(OsRepository.class, osRepository); HashMap<Integer, String> osNames = new HashMap<>(1); osNames.put(0, "Unassigned"); - Mockito.when(osRepository.getOsNames()).thenReturn(osNames); - Mockito.when(osRepository.osNameUpperCasedAndUnderscored("Unassigned")).thenReturn("UNASSIGNED"); } @Test diff --git a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/TemplateMapperTest.java b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/TemplateMapperTest.java index 72b55b9..520fb52 100644 --- a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/TemplateMapperTest.java +++ b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/TemplateMapperTest.java @@ -5,6 +5,7 @@ import org.ovirt.engine.api.model.DisplayType; import org.ovirt.engine.api.model.Template; import org.ovirt.engine.api.model.VmType; +import org.ovirt.engine.api.restapi.utils.OsTypeMockUtils; import org.ovirt.engine.core.common.businessentities.OriginType; import org.ovirt.engine.core.common.businessentities.VmTemplate; @@ -30,6 +31,7 @@ from.getCpu().getTopology().setCores(MappingTestHelper.rand(100)); } from.setTimezone("Australia/Darwin"); + OsTypeMockUtils.mockOsTypes(); return from; } diff --git a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java index 28af2f7..0a0870c 100644 --- a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java +++ b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java @@ -12,6 +12,7 @@ import org.ovirt.engine.api.model.VM; import org.ovirt.engine.api.model.VmDeviceType; import org.ovirt.engine.api.model.VmType; +import org.ovirt.engine.api.restapi.utils.OsTypeMockUtils; import org.ovirt.engine.core.common.businessentities.OriginType; import org.ovirt.engine.core.common.businessentities.UsbPolicy; import org.ovirt.engine.core.common.businessentities.VDSGroup; @@ -122,7 +123,7 @@ vmDynamic.setStatus(VMStatus.Up); vmDynamic.setVmIp("2.2.2.2"); vm.setDynamicData(vmDynamic); - + OsTypeMockUtils.mockOsTypes(); VM map = VmMapper.map(vm, null); assertNotNull(map.getGuestInfo().getIps().getIPs().get(0)); assertEquals(map.getGuestInfo().getIps().getIPs().get(0).getAddress(), "2.2.2.2"); @@ -135,7 +136,7 @@ vmDynamic.setStatus(VMStatus.Up); vmDynamic.setVmIp("2.2.2.2 2.2.2.3 2.2.2.4"); vm.setDynamicData(vmDynamic); - + OsTypeMockUtils.mockOsTypes(); VM map = VmMapper.map(vm, null); assertNotNull(map.getGuestInfo().getIps().getIPs().get(0)); assertEquals(map.getGuestInfo().getIps().getIPs().get(0).getAddress(), "2.2.2.2"); diff --git a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/utils/OsTypeMockUtils.java b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/utils/OsTypeMockUtils.java new file mode 100644 index 0000000..9156223 --- /dev/null +++ b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/utils/OsTypeMockUtils.java @@ -0,0 +1,24 @@ +package org.ovirt.engine.api.restapi.utils; + +import static org.easymock.EasyMock.expect; + +import java.util.HashMap; + +import org.easymock.EasyMock; +import org.easymock.IMocksControl; +import org.ovirt.engine.core.common.osinfo.OsRepository; +import org.ovirt.engine.core.common.utils.SimpleDependecyInjector; + +public class OsTypeMockUtils { + + public static void mockOsTypes() { + IMocksControl control = EasyMock.createNiceControl(); + OsRepository osRepositoryMock = control.createMock(OsRepository.class); + HashMap<Integer, String> osNames = new HashMap<>(1); + osNames.put(0, "Unassigned"); + expect(osRepositoryMock.getOsNames()).andReturn(osNames).anyTimes(); + expect(osRepositoryMock.osNameUpperCasedAndUnderscored("Unassigned")).andReturn("UNASSIGNED").anyTimes(); + SimpleDependecyInjector.getInstance().bind(OsRepository.class, osRepositoryMock); + control.replay(); + } +} -- To view, visit http://gerrit.ovirt.org/16040 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14d5e772de6b79ae88ed2cfabdd873461e3b5d71 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ori Liel <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
