Daniel Erez has uploaded a new change for review. Change subject: core: add tests for AddExistingBlockStorageDomainCommand ......................................................................
core: add tests for AddExistingBlockStorageDomainCommand Added a new unit tests class AddExistingBlockStorageDomainCommandTest. Change-Id: Iddcb20d1dcacbbb72c37ffb89449f5451bcccbb8 Signed-off-by: Daniel Erez <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommand.java A backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommandTest.java A backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommandTest.java 3 files changed, 122 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/29781/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommand.java index c40fa93..183984a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommand.java @@ -46,7 +46,7 @@ return true; } - private List<LUNs> getLUNsFromVgInfo(String vgId) { + protected List<LUNs> getLUNsFromVgInfo(String vgId) { List<LUNs> luns = new ArrayList<>(); VDSReturnValue returnValue; @@ -64,7 +64,7 @@ return luns; } - private void saveLUNsInDB(final List<LUNs> luns) { + protected void saveLUNsInDB(final List<LUNs> luns) { TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { @Override public Void runInTransaction() { diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommandTest.java new file mode 100644 index 0000000..232066f --- /dev/null +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingBlockStorageDomainCommandTest.java @@ -0,0 +1,60 @@ +package org.ovirt.engine.core.bll.storage; + +import static org.junit.Assert.assertTrue; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.runners.MockitoJUnitRunner; +import org.ovirt.engine.core.common.action.StorageDomainManagementParameter; +import org.ovirt.engine.core.common.businessentities.LUNs; +import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; +import org.ovirt.engine.core.compat.Guid; + +import java.util.ArrayList; +import java.util.List; + +@RunWith(MockitoJUnitRunner.class) +public class AddExistingBlockStorageDomainCommandTest { + + private AddExistingBlockStorageDomainCommand<StorageDomainManagementParameter> command; + private StorageDomainManagementParameter parameters; + + @Before + public void setUp() { + parameters = new StorageDomainManagementParameter(getStorageDomain()); + parameters.setVdsId(Guid.newGuid()); + command = spy(new AddExistingBlockStorageDomainCommand<>(parameters)); + + doNothing().when(command).addStorageDomainInDb(); + doNothing().when(command).updateStorageDomainDynamicFromIrs(); + doNothing().when(command).saveLUNsInDB(any(List.class)); + } + + @Test + public void testAddExistingBlockDomainSuccessfully() { + when(command.getLUNsFromVgInfo(parameters.getStorageDomain().getStorage())).thenReturn(getLUNs()); + + command.executeCommand(); + + assertTrue(command.getReturnValue().getSucceeded()); + } + + private StorageDomainStatic getStorageDomain() { + StorageDomainStatic storageDomain = new StorageDomainStatic(); + storageDomain.setStorage(Guid.newGuid().toString()); + return storageDomain; + } + + private List<LUNs> getLUNs() { + List<LUNs> luns = new ArrayList<>(); + LUNs lun = new LUNs(); + lun.setId(Guid.newGuid().toString()); + luns.add(lun); + return luns; + } +} diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommandTest.java new file mode 100644 index 0000000..6ef6d52 --- /dev/null +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommandTest.java @@ -0,0 +1,60 @@ +package org.ovirt.engine.core.bll.storage; + +import static org.junit.Assert.assertTrue; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.runners.MockitoJUnitRunner; +import org.ovirt.engine.core.common.action.StorageDomainManagementParameter; +import org.ovirt.engine.core.common.businessentities.LUNs; +import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; +import org.ovirt.engine.core.compat.Guid; + +import java.util.ArrayList; +import java.util.List; + +@RunWith(MockitoJUnitRunner.class) +public class AddExistingFileStorageDomainCommandTest { + + private AddExistingBlockStorageDomainCommand<StorageDomainManagementParameter> command; + private StorageDomainManagementParameter parameters; + + @Before + public void setUp() { + parameters = new StorageDomainManagementParameter(getStorageDomain()); + parameters.setVdsId(Guid.newGuid()); + command = spy(new AddExistingBlockStorageDomainCommand<>(parameters)); + + doNothing().when(command).addStorageDomainInDb(); + doNothing().when(command).updateStorageDomainDynamicFromIrs(); + doNothing().when(command).saveLUNsInDB(any(List.class)); + } + + @Test + public void testAddExistingBlockDomainSuccessfully() { + command.executeCommand(); + + when(command.getLUNsFromVgInfo(parameters.getStorageDomain().getStorage())).thenReturn(getLUNs()); + + assertTrue(command.getReturnValue().getSucceeded()); + } + + private StorageDomainStatic getStorageDomain() { + StorageDomainStatic storageDomain = new StorageDomainStatic(); + storageDomain.setStorage(Guid.newGuid().toString()); + return storageDomain; + } + + private List<LUNs> getLUNs() { + List<LUNs> luns = new ArrayList<>(); + LUNs lun = new LUNs(); + lun.setId(Guid.newGuid().toString()); + luns.add(lun); + return luns; + } +} -- To view, visit http://gerrit.ovirt.org/29781 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iddcb20d1dcacbbb72c37ffb89449f5451bcccbb8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
