Daniel Erez has submitted this change and it was merged. Change subject: core: Re-enable AddDiskToVmCommandTest ...................................................................... core: Re-enable AddDiskToVmCommandTest This test was marked with @Ignore a while ago. This patch enables the test again, and removes the annotation. In order to achieve this, some subtle refactoring was performed on AddDiskCommand, AbstractDiskVmCommand and CommandBase (extracting methods to hide external resources), and PowerMockito was removed from the test. A single test which tests the validation of the disk type passed to the command was removed, since this functionallity is no longer supported. Change-Id: I3b061a6f381f4e19d6666b24140b0583a244a63d Signed-off-by: Allon Mureinik <amureini(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java 4 files changed, 137 insertions(+), 164 deletions(-) Approvals: Daniel Erez: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/5392 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3b061a6f381f4e19d6666b24140b0583a244a63d Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt; Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com&gt; Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com&gt; Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com&gt;