[Engine-patches] Change in ovirt-engine[master]: core: use CommandMocks for common mocking bits

[rgolan]

Roy Golan has uploaded a new change for review.

Change subject: core: use CommandMocks for common mocking bits
......................................................................

core: use CommandMocks for common mocking bits

Change-Id: I9493d1103f4b9366eca9a45d5c8cc10d45cf1494
Signed-off-by: Roy Golan <rgo...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
A 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/CommandMocks.java
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java
M 
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java
4 files changed, 17 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/35715/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
index 2af373e..ac5e3f5 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
@@ -611,11 +611,6 @@
         return super.getBackend();
     }
 
-    @Override
-    protected DbFacade getDbFacade() {
-        return super.getDbFacade();
-    }
-
     protected StoragePoolIsoMapDAO getStoragePoolIsoMapDAO() {
         return getDbFacade().getStoragePoolIsoMapDao();
     }
diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/CommandMocks.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/CommandMocks.java
new file mode 100644
index 0000000..5536c3e
--- /dev/null
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/CommandMocks.java
@@ -0,0 +1,14 @@
+package org.ovirt.engine.core;
+
+import org.ovirt.engine.core.bll.CommandBase;
+import org.ovirt.engine.core.dal.dbbroker.DbFacade;
+
+import static org.mockito.Mockito.doReturn;
+
+public class CommandMocks {
+
+    public static void mockDbFacade(CommandBase cmdMock, DbFacade dbFacade) {
+        doReturn(dbFacade).when(cmdMock).getDbFacade();
+    }
+
+}
diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java
index cd1ed46..559d764 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java
@@ -18,6 +18,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
+import org.ovirt.engine.core.CommandMocks;
 import org.ovirt.engine.core.bll.context.CompensationContext;
 import org.ovirt.engine.core.bll.interfaces.BackendInternal;
 import org.ovirt.engine.core.common.action.StorageDomainPoolParametersBase;
@@ -90,7 +91,7 @@
 
     @Before
     public void setup() {
-        doReturn(dbFacade).when(cmd).getDbFacade();
+        CommandMocks.mockDbFacade(cmd, dbFacade);
         when(dbFacade.getStoragePoolDao()).thenReturn(storagePoolDAO);
         when(dbFacade.getStorageDomainDao()).thenReturn(storageDomainDAO);
     }
diff --git 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java
 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java
index dd340d2..be78b25 100644
--- 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java
+++ 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java
@@ -716,7 +716,7 @@
         return getDbFacade().getCpuProfileDao();
     }
 
-    protected DbFacade getDbFacade() {
+    public DbFacade getDbFacade() {
         return DbFacade.getInstance();
     }
 


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

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