[Engine-patches] Change in ovirt-engine[master]: core: fix osRepository NPE in AddVmTemplateCommandTest

[ahadas]

Arik Hadas has uploaded a new change for review.

Change subject: core: fix osRepository NPE in AddVmTemplateCommandTest
......................................................................

core: fix osRepository NPE in AddVmTemplateCommandTest

Change-Id: I68fcd649fa4b97f09f682f23bb5b8524b25b9b8d
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java
1 file changed, 10 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/28397/1

diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java
index 76aefb6..7592d93 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java
@@ -69,13 +69,9 @@
         vdsGroup.setStoragePoolId(spId);
         vdsGroup.setcompatibility_version(Version.v3_2);
         when(vdsGroupDao.get(vdsGroupId)).thenReturn(vdsGroup);
-        when(osRepository.getMinimumRam(vm.getVmOsId(), 
Version.v3_2)).thenReturn(0);
-        when(osRepository.getMaximumRam(vm.getVmOsId(), 
Version.v3_2)).thenReturn(100);
-        
when(osRepository.getArchitectureFromOS(14)).thenReturn(ArchitectureType.x86_64);
         AddVmTemplateParameters params = new AddVmTemplateParameters(vm, 
"templateName", "Template for testing");
 
-        // init the injector with the osRepository instance
-        SimpleDependecyInjector.getInstance().bind(OsRepository.class, 
osRepository);
+        mockOsRepository();
 
         // Using the compensation constructor since the normal one contains DB 
access
         cmd = spy(new AddVmTemplateCommand<AddVmTemplateParameters>(params) {
@@ -99,6 +95,15 @@
         cmd.setVdsGroupId(vdsGroupId);
     }
 
+    protected void mockOsRepository() {
+        SimpleDependecyInjector.getInstance().bind(OsRepository.class, 
osRepository);
+        VmHandler.init();
+        when(osRepository.isWindows(0)).thenReturn(true);
+        when(osRepository.getMinimumRam(vm.getVmOsId(), 
Version.v3_2)).thenReturn(0);
+        when(osRepository.getMaximumRam(vm.getVmOsId(), 
Version.v3_2)).thenReturn(100);
+        
when(osRepository.getArchitectureFromOS(14)).thenReturn(ArchitectureType.x86_64);
+    }
+
     @Test
     public void testCanDoAction() {
         doReturn(true).when(cmd).validateVmNotDuringSnapshot();


-- 
To view, visit http://gerrit.ovirt.org/28397
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I68fcd649fa4b97f09f682f23bb5b8524b25b9b8d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches