[Engine-patches] Change in ovirt-engine[master]: core: ActiveStorageDomainCommand refactoring

[vvolansk]

Vered Volansky has uploaded a new change for review.

Change subject: core: ActiveStorageDomainCommand refactoring
......................................................................

core: ActiveStorageDomainCommand refactoring

Rearranged code in helper functions in order to reduce code duplication

Change-Id: Ib5962dab111cf2c799029081526a4344d7b15f52
Signed-off-by: Vered Volansky <vvola...@redhat.com>
---
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommandTest.java
1 file changed, 29 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/21276/1

diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommandTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommandTest.java
index ab2b4e0..a8c9525 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommandTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommandTest.java
@@ -42,8 +42,6 @@
     @Test
     public void internalLockedAllowed() {
         testInternalExecution(StorageDomainStatus.Locked);
-        canDoActionSucceeds();
-        noIllegalStatusMessage();
     }
 
     @Test
@@ -57,57 +55,43 @@
     @Test
     public void internalInactiveAllowed() {
         testInternalExecution(StorageDomainStatus.InActive);
-        canDoActionSucceeds();
-        noIllegalStatusMessage();
     }
 
     @Test
     public void nonInternalInactiveAllowed() {
-        testExecution(StorageDomainStatus.InActive);
-        canDoActionSucceeds();
-        noIllegalStatusMessage();
+        nonInternalActionAllowed(StorageDomainStatus.InActive);
     }
 
     @Test
     public void activeDisallowed() {
         testExecution(StorageDomainStatus.Active);
-        canDoActionFails();
-        hasIllegalStatusMessage();
+        testActionDisallowed();
     }
 
     @Test
     public void internalActiveDisallowed() {
         testInternalExecution(StorageDomainStatus.Active);
-        canDoActionFails();
-        hasIllegalStatusMessage();
+        testActionDisallowed();
     }
 
     @Test
     public void internalUnknownAllowed() {
-        testInternalExecution(StorageDomainStatus.Unknown);
-        canDoActionSucceeds();
-        noIllegalStatusMessage();
+        internalActionAllowed(StorageDomainStatus.Unknown);
     }
 
     @Test
     public void nonInternalUnknownAllowed() {
-        testExecution(StorageDomainStatus.Unknown);
-        canDoActionSucceeds();
-        noIllegalStatusMessage();
+        nonInternalActionAllowed(StorageDomainStatus.Unknown);
     }
 
     @Test
     public void internalMaintenanceAllowed() {
-        testInternalExecution(StorageDomainStatus.Maintenance);
-        canDoActionSucceeds();
-        noIllegalStatusMessage();
+        internalActionAllowed(StorageDomainStatus.Maintenance);
     }
 
     @Test
     public void nonInternalMaintenanceAllowed() {
-        testExecution(StorageDomainStatus.Maintenance);
-        canDoActionSucceeds();
-        noIllegalStatusMessage();
+        nonInternalActionAllowed(StorageDomainStatus.Maintenance);
     }
 
     @Test
@@ -118,6 +102,28 @@
                 VdcBllMessages.ACTION_TYPE_FAILED_NO_VDS_IN_POOL.name()));
     }
 
+    private void testActionAllowed()
+    {
+        canDoActionSucceeds();
+        noIllegalStatusMessage();
+    }
+
+    private void testActionDisallowed()
+    {
+        canDoActionSucceeds();
+        hasIllegalStatusMessage();
+    }
+
+    public void internalActionAllowed(StorageDomainStatus status) {
+        testInternalExecution(status);
+        testActionAllowed();
+    }
+
+    public void nonInternalActionAllowed(StorageDomainStatus status) {
+        testExecution(status);
+        testActionAllowed();
+    }
+
     private void testNonActiveVdsExecution(StorageDomainStatus status) {
         createStorageDomain(status);
         createUpStoragePool();


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

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