Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove AuditLogableBaseMockUtils
......................................................................
core: Remove AuditLogableBaseMockUtils
AuditLogableBaseMockUtils was used to mock VmDAO in tests for bll
commands. since this can now be done directly, this class is not longer
required.
Change-Id: Ib44258e3679ef3cd1d05aa4326ec09fff4c9d2bd
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveDisksCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveDiskCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveQuotaCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommandTest.java
D
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseMockUtils.java
15 files changed, 17 insertions(+), 55 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/11606/1
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java
index 9b473c5..e694766 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java
@@ -44,7 +44,6 @@
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.dal.VdcBllMessages;
-import
org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBaseMockUtils;
import org.ovirt.engine.core.dao.DiskLunMapDao;
import org.ovirt.engine.core.dao.StorageDomainDAO;
import org.ovirt.engine.core.dao.StorageDomainStaticDAO;
@@ -368,7 +367,7 @@
doReturn(storagePoolDAO).when(command).getStoragePoolDAO();
doReturn(vmNetworkInterfaceDAO).when(command).getVmNetworkInterfaceDao();
doReturn(diskLunMapDAO).when(command).getDiskLunMapDao();
- AuditLogableBaseMockUtils.mockVmDao(command, vmDAO);
+ doReturn(vmDAO).when(command).getVmDAO();
doNothing().when(command).updateDisksFromDb();
doReturn(true).when(command).checkImageConfiguration();
doReturn(true).when(command).performImagesChecks(any(Guid.class));
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
index ef75416..c975196 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
@@ -54,7 +54,6 @@
import org.ovirt.engine.core.compat.NGuid;
import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.dal.VdcBllMessages;
-import
org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBaseMockUtils;
import org.ovirt.engine.core.dao.DiskImageDAO;
import org.ovirt.engine.core.dao.SnapshotDao;
import org.ovirt.engine.core.dao.StorageDomainDAO;
@@ -383,7 +382,7 @@
}
private void mockDAOs(AddVmCommand<?> cmd) {
- AuditLogableBaseMockUtils.mockVmDao(cmd, vmDAO);
+ doReturn(vmDAO).when(cmd).getVmDAO();
doReturn(sdDAO).when(cmd).getStorageDomainDAO();
doReturn(vmTemplateDAO).when(cmd).getVmTemplateDAO();
doReturn(vdsGroupDao).when(cmd).getVdsGroupDAO();
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 4d12294..e7449dc 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
@@ -20,7 +20,6 @@
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.dal.VdcBllMessages;
-import
org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBaseMockUtils;
import org.ovirt.engine.core.dao.VdsGroupDAO;
import org.ovirt.engine.core.dao.VmDAO;
import org.ovirt.engine.core.utils.MockConfigRule;
@@ -71,7 +70,7 @@
// Using the compensation constructor since the normal one contains DB
access
cmd = spy(new AddVmTemplateCommand<AddVmTemplateParameters>(params));
- AuditLogableBaseMockUtils.mockVmDao(cmd, vmDao);
+ doReturn(vmDao).when(cmd).getVmDAO();
doReturn(vdsGroupDao).when(cmd).getVdsGroupDAO();
cmd.setVmId(vmId);
cmd.setVdsGroupId(vdsGroupId);
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
index e12dfc7..c4e1d08 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
@@ -26,6 +26,7 @@
import org.ovirt.engine.core.common.businessentities.DiskImage;
import org.ovirt.engine.core.common.businessentities.DiskInterface;
import org.ovirt.engine.core.common.businessentities.LUNs;
+import org.ovirt.engine.core.common.businessentities.StorageServerConnections;
import org.ovirt.engine.core.common.businessentities.StorageType;
import org.ovirt.engine.core.common.businessentities.VDS;
import org.ovirt.engine.core.common.businessentities.VM;
@@ -33,12 +34,10 @@
import org.ovirt.engine.core.common.businessentities.VmDevice;
import org.ovirt.engine.core.common.businessentities.VmDeviceId;
import org.ovirt.engine.core.common.businessentities.VmOsType;
-import org.ovirt.engine.core.common.businessentities.StorageServerConnections;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.dal.VdcBllMessages;
-import
org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBaseMockUtils;
import org.ovirt.engine.core.dao.DiskDao;
import org.ovirt.engine.core.dao.VdsDAO;
import org.ovirt.engine.core.dao.VmDAO;
@@ -183,7 +182,7 @@
}
private void mockNullVm() {
- AuditLogableBaseMockUtils.mockVmDao(command, vmDAO);
+ doReturn(vmDAO).when(command).getVmDAO();
when(vmDAO.get(command.getParameters().getVmId())).thenReturn(null);
cretaeVirtIODisk();
}
@@ -197,7 +196,7 @@
vm.setVmOs(VmOsType.RHEL6);
vm.setId(vmId);
vm.setRunOnVds(Guid.NewGuid());
- AuditLogableBaseMockUtils.mockVmDao(command, vmDAO);
+ doReturn(vmDAO).when(command).getVmDAO();
mockVMDAO(vm);
return vm;
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveDisksCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveDisksCommandTest.java
index 5941f89..81debfe 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveDisksCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveDisksCommandTest.java
@@ -28,7 +28,6 @@
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
import org.ovirt.engine.core.dal.VdcBllMessages;
-import
org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBaseMockUtils;
import org.ovirt.engine.core.dao.DiskImageDAO;
import org.ovirt.engine.core.dao.SnapshotDao;
import org.ovirt.engine.core.dao.VmDAO;
@@ -230,7 +229,7 @@
}
private void mockVmDao() {
- AuditLogableBaseMockUtils.mockVmDao(command, vmDao);
+ doReturn(vmDao).when(command).getVmDAO();
}
private void mockDiskImageDao() {
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java
index 0c080ad..c6cac8c 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java
@@ -32,7 +32,6 @@
import org.ovirt.engine.core.common.businessentities.storage_domains;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.VdcBllMessages;
-import
org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBaseMockUtils;
import org.ovirt.engine.core.dao.DiskImageDAO;
import org.ovirt.engine.core.dao.StorageDomainDAO;
import org.ovirt.engine.core.dao.VmDAO;
@@ -163,7 +162,7 @@
protected void initVm() {
VM vm = new VM();
vm.setStatus(VMStatus.PoweredDown);
- AuditLogableBaseMockUtils.mockVmDao(command, vmDao);
+ doReturn(vmDao).when(command).getVmDAO();
when(vmDao.get(any(Guid.class))).thenReturn(vm);
mockGetVmsListForDisk();
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveDiskCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveDiskCommandTest.java
index 087e498..bec93b5 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveDiskCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveDiskCommandTest.java
@@ -23,7 +23,6 @@
import org.ovirt.engine.core.common.locks.LockingGroup;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.VdcBllMessages;
-import
org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBaseMockUtils;
import org.ovirt.engine.core.dao.VmDAO;
import org.ovirt.engine.core.dao.VmDeviceDAO;
import org.ovirt.engine.core.utils.MockEJBStrategyRule;
@@ -76,7 +75,7 @@
cmd = spy(new RemoveDiskCommand<RemoveDiskParameters>(params));
doReturn(disk).when(cmd).getDisk();
doReturn(vmDeviceDao).when(cmd).getVmDeviceDAO();
- AuditLogableBaseMockUtils.mockVmDao(cmd, vmDao);
+ doReturn(vmDao).when(cmd).getVmDAO();
}
/* Tests for canDoAction() flow */
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveQuotaCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveQuotaCommandTest.java
index 00bd407..9335cf6 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveQuotaCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveQuotaCommandTest.java
@@ -22,7 +22,6 @@
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.storage_pool;
import org.ovirt.engine.core.compat.Guid;
-import
org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBaseMockUtils;
import org.ovirt.engine.core.dao.QuotaDAO;
import org.ovirt.engine.core.dao.StoragePoolDAO;
import org.ovirt.engine.core.dao.VmDAO;
@@ -91,7 +90,7 @@
command = spy(new RemoveQuotaCommand(param));
doReturn(storagePoolDAO).when(command).getStoragePoolDAO();
doReturn(quotaDAO).when(command).getQuotaDAO();
- AuditLogableBaseMockUtils.mockVmDao(command, vmDAO);
+ doReturn(vmDAO).when(command).getVmDAO();
return command;
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
index 40911e0..49cc145 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java
@@ -37,7 +37,6 @@
import org.ovirt.engine.core.common.interfaces.VDSBrokerFrontend;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.VdcBllMessages;
-import
org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBaseMockUtils;
import org.ovirt.engine.core.dao.DiskDao;
import org.ovirt.engine.core.dao.SnapshotDao;
import org.ovirt.engine.core.dao.StorageDomainDAO;
@@ -220,7 +219,7 @@
vm.setId(vmId);
vm.setStoragePoolId(spId);
vm.setStatus(VMStatus.Down);
- AuditLogableBaseMockUtils.mockVmDao(spyCommand, vmDAO);
+ doReturn(vmDAO).when(spyCommand).getVmDAO();
when(vmDAO.get(vmId)).thenReturn(vm);
return vm;
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java
index aa95bb9..4ab5caf 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java
@@ -55,7 +55,6 @@
import org.ovirt.engine.core.compat.NGuid;
import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.dal.VdcBllMessages;
-import
org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBaseMockUtils;
import org.ovirt.engine.core.dao.DiskDao;
import org.ovirt.engine.core.dao.StorageDomainDAO;
import org.ovirt.engine.core.dao.StoragePoolDAO;
@@ -310,7 +309,7 @@
private VM mockVm(RunVmCommand<RunVmParams> spyVmCommand) {
VM vm = new VM();
vm.setStatus(VMStatus.Down);
- AuditLogableBaseMockUtils.mockVmDao(spyVmCommand, vmDAO);
+ doReturn(vmDAO).when(command).getVmDAO();
when(vmDAO.get(command.getParameters().getVmId())).thenReturn(vm);
return vm;
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommandTest.java
index 34bde96..7b67747 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommandTest.java
@@ -16,7 +16,6 @@
import org.ovirt.engine.core.common.businessentities.VMStatus;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.VdcBllMessages;
-import
org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBaseMockUtils;
import org.ovirt.engine.core.dao.SnapshotDao;
import org.ovirt.engine.core.dao.VmDAO;
@@ -52,7 +51,7 @@
cmd = spy(new
TryBackToAllSnapshotsOfVmCommand<TryBackToAllSnapshotsOfVmParameters>(params));
doNothing().when(cmd).updateVmDisksFromDb();
doReturn(snapshotDao).when(cmd).getSnapshotDao();
- AuditLogableBaseMockUtils.mockVmDao(cmd, vmDao);
+ doReturn(vmDao).when(cmd).getVmDAO();
}
@Test
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
index 6f186e5..ada8d34 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
@@ -34,7 +34,6 @@
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.dal.VdcBllMessages;
-import
org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBaseMockUtils;
import org.ovirt.engine.core.dao.VdsDAO;
import org.ovirt.engine.core.dao.VmDAO;
import org.ovirt.engine.core.utils.MockConfigRule;
@@ -232,7 +231,7 @@
}
private void mockVmDaoGetVm() {
- AuditLogableBaseMockUtils.mockVmDao(command, vmDAO);
+ doReturn(vmDAO).when(command).getVmDAO();
when(vmDAO.get(any(Guid.class))).thenReturn(vm);
}
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 f56c045..bc8c4d1 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
@@ -30,7 +30,6 @@
import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.dal.VdcBllMessages;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-import
org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBaseMockUtils;
import org.ovirt.engine.core.dao.DiskDao;
import org.ovirt.engine.core.dao.DiskImageDAO;
import org.ovirt.engine.core.dao.SnapshotDao;
@@ -150,7 +149,7 @@
}
private void mockNullVm() {
- AuditLogableBaseMockUtils.mockVmDao(command, vmDAO);
+ doReturn(vmDAO).when(command).getVmDAO();
mockGetForDisk(null);
mockGetVmsListForDisk(null);
when(vmDAO.get(command.getParameters().getVmId())).thenReturn(null);
@@ -164,7 +163,7 @@
vm.setStatus(VMStatus.Down);
vm.setGuestOs("rhel6");
vm.setId(vmId);
- AuditLogableBaseMockUtils.mockVmDao(command, vmDAO);
+ doReturn(vmDAO).when(command).getVmDAO();
mockGetForDisk(vm);
mockGetVmsListForDisk(vm);
storage_pool storagePool = mockStoragePool(Version.v3_1);
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommandTest.java
index 53590a0..d77abb9 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommandTest.java
@@ -33,7 +33,6 @@
import org.ovirt.engine.core.compat.NGuid;
import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.dal.VdcBllMessages;
-import
org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBaseMockUtils;
import org.ovirt.engine.core.dao.DiskImageDAO;
import org.ovirt.engine.core.dao.StorageDomainDAO;
import org.ovirt.engine.core.dao.StoragePoolDAO;
@@ -224,7 +223,7 @@
}
private void mockVmDao() {
- AuditLogableBaseMockUtils.mockVmDao(command, vmDao);
+ doReturn(vmDao).when(command).getVmDAO();
}
private void mockDiskImageDao() {
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseMockUtils.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseMockUtils.java
deleted file mode 100644
index 1340c82..0000000
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseMockUtils.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.ovirt.engine.core.dal.dbbroker.auditloghandling;
-
-import static org.mockito.Mockito.doReturn;
-
-import org.ovirt.engine.core.dao.VmDAO;
-
-/**
- * Utility class to help mock out behavior inherited from {@link
AuditLogableBase}, since it may have been inherited
- * from another package, and it's protected methods can't be accessed.
- */
-public class AuditLogableBaseMockUtils {
-
- /**
- * Mock that the given {@link AuditLogableBase} uses the given {@link
VmDAO}.
- *
- * @param auditLogableBase
- * The base class instance.
- * @param vmDao
- * The DAO to use.
- */
- public static void mockVmDao(AuditLogableBase auditLogableBase, VmDAO
vmDao) {
- doReturn(vmDao).when(auditLogableBase).getVmDAO();
- }
-}
--
To view, visit http://gerrit.ovirt.org/11606
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib44258e3679ef3cd1d05aa4326ec09fff4c9d2bd
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
