Allon Mureinik has uploaded a new change for review. Change subject: restapi: Fix test break in BackendVmsResourceTest ......................................................................
restapi: Fix test break in BackendVmsResourceTest Change-Id I168225f20d567910cba861be75be87136926589f introduced the OsRepository notion, but did not mock it away in BackendVmsResourceTest, causing the test suite to fail. This patch mocks it in a similar fashion to BackendVMResourceTest mocks it in the original change. Change-Id: Ief5022e9331405fa94557c74e0160a26c96862c5 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/16010/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java index 43ade2c..9faf0fd 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java @@ -44,9 +44,11 @@ import org.ovirt.engine.core.common.businessentities.VmStatistics; import org.ovirt.engine.core.common.businessentities.VmType; import org.ovirt.engine.core.common.interfaces.SearchType; +import org.ovirt.engine.core.common.osinfo.OsRepository; import org.ovirt.engine.core.common.queries.GetVmTemplateParameters; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; +import org.ovirt.engine.core.common.utils.SimpleDependecyInjector; import org.ovirt.engine.core.common.utils.VmDeviceType; import org.ovirt.engine.core.compat.Guid; @@ -56,9 +58,16 @@ private static final String DEFAULT_TEMPLATE_ID = Guid.Empty.toString(); private static final String PAYLOAD_COMTENT = "payload"; public static final String CERTIFICATE = "O=Redhat,CN=X.Y.Z.Q"; + private static final HashMap<Integer, String> osNames = new HashMap<>(); public BackendVmsResourceTest() { super(new BackendVmsResource(), SearchType.VM, "VMs : "); + } + + @Override + protected void init() { + super.init(); + mockOsRepository(); } @Test @@ -1079,4 +1088,12 @@ true); } } + + private void mockOsRepository() { + osNames.put(0, "Unassigned"); + OsRepository osRepository = control.createMock(OsRepository.class); + expect(osRepository.getOsNames()).andStubReturn(osNames); + expect(osRepository.osNameUpperCasedAndUnderscored("Unassigned")).andStubReturn("UNASSIGNED"); + SimpleDependecyInjector.getInstance().bind(OsRepository.class, osRepository); + } } -- To view, visit http://gerrit.ovirt.org/16010 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ief5022e9331405fa94557c74e0160a26c96862c5 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
