Michael Kublin has submitted this change and it was merged. Change subject: core: UnPowerMock AddVmCommandTest ...................................................................... core: UnPowerMock AddVmCommandTest Removed PowerMock dependency from AddVmCommandTest and replaced it with spying the command directly. This improvement required some subtle refactoing in the add command classes themselves and the static handlers they use. Change-Id: Ib791c30f5453eddbecb8a780e54001201aec713b Signed-off-by: Allon Mureinik <amureini(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java 6 files changed, 177 insertions(+), 179 deletions(-) Approvals: Michael Kublin: Looks good to me, approved Allon Mureinik: Verified -- To view, visit http://gerrit.ovirt.org/5922 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib791c30f5453eddbecb8a780e54001201aec713b Gerrit-PatchSet: 3 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: Laszlo Hornyak <lhornyak(a)redhat.com&gt; Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com&gt; Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com&gt; Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com&gt;