- Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: core: ImportVMFromConfigurationCommandTest command initializ...
by amureini＠redhat.com 13 Oct '16

13 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: ImportVMFromConfigurationCommandTest command initialization ...................................................................... core: ImportVMFromConfigurationCommandTest command initialization Moved the initialization of the tested command to the @Before method in preparation of moving it to be initialized by a @Spy annotation. Note that the SimpleDependencyInjector is used to initialize the command's data members so it must be mocked before the command instance is created. Hence, this patch moves its handling to a @BeforeClass method in order to be on the safe side. Change-Id: I2cc73afe0167d1618e5ff76fae1db2d3a3c563b7 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/ImportVMFromConfigurationCommandTest.java 1 file changed, 21 insertions(+), 26 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests -- To view, visit https://gerrit.ovirt.org/64669 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2cc73afe0167d1618e5ff76fae1db2d3a3c563b7 Gerrit-PatchSet: 11 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Betak <mbetak(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: AddStorageServerConnectionCommandTest unused mocking
by amureini＠redhat.com 13 Oct '16

13 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: AddStorageServerConnectionCommandTest unused mocking ...................................................................... core: AddStorageServerConnectionCommandTest unused mocking Removed mocking of unused dependencies. Change-Id: I6f163b34f6fac9889bd98ef0b1aa17fda15dd3b7 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/connection/AddStorageServerConnectionCommandTest.java 1 file changed, 0 insertions(+), 10 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests Ala Hino: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/64706 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6f163b34f6fac9889bd98ef0b1aa17fda15dd3b7 Gerrit-PatchSet: 11 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: RemoveSnapshotCommandTest @Spy annotation
by amureini＠redhat.com 13 Oct '16

13 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: RemoveSnapshotCommandTest @Spy annotation ...................................................................... core: RemoveSnapshotCommandTest @Spy annotation Spy the command with the @Spy annotation instead of explicitly calling Mockito.spy. This change has two advantages - first, it's a tad more elegant, as it saves the duplicate Mockito.spy calls. Second, and more importantly, it sets the ground for using injected mocks in these tests in the future. Change-Id: Ic9f18e6a3b0836045724ad728263141197345ca1 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotCommandTest.java 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests Freddy Rolland: Looks good to me, but someone else must approve Ala Hino: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/64705 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic9f18e6a3b0836045724ad728263141197345ca1 Gerrit-PatchSet: 11 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: RemoveSnapshotCommandTest local vars
by amureini＠redhat.com 13 Oct '16

13 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: RemoveSnapshotCommandTest local vars ...................................................................... core: RemoveSnapshotCommandTest local vars Convert an unneeded data member to a local variable to make the code more concise. Change-Id: I84cf013f3e728a7c16796c8e23fa41afff17658a Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotCommandTest.java 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests Freddy Rolland: Looks good to me, but someone else must approve Ala Hino: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/64704 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I84cf013f3e728a7c16796c8e23fa41afff17658a Gerrit-PatchSet: 11 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: TryBackToAllSnapshotsOfVmCommandTest mocking
by amureini＠redhat.com 13 Oct '16

13 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: TryBackToAllSnapshotsOfVmCommandTest mocking ...................................................................... core: TryBackToAllSnapshotsOfVmCommandTest mocking Remove the mocking in testValidateWithEmptySnapshotGuid that's just duplicated from the setUp method. Change-Id: I7a4ff850146116a73dc373c08bb36b5b31707aef Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/TryBackToAllSnapshotsOfVmCommandTest.java 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests Freddy Rolland: Looks good to me, but someone else must approve Ala Hino: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/64703 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7a4ff850146116a73dc373c08bb36b5b31707aef Gerrit-PatchSet: 11 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: TryBackToAllSnapshotsOfVmCommandTest @Spy annotation
by amureini＠redhat.com 13 Oct '16

13 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: TryBackToAllSnapshotsOfVmCommandTest @Spy annotation ...................................................................... core: TryBackToAllSnapshotsOfVmCommandTest @Spy annotation Spy the command with the @Spy annotation instead of explicitly calling Mockito.spy. This change has two advantages - first, it's a tad more elegant, as it saves the duplicate Mockito.spy calls. Second, and more importantly, it sets the ground for using injected mocks in these tests in the future. Note: A public setDstSnapshotId was added to TryBackToAllSnapshotsOfVmParameters in order to facilitate this change. Change-Id: I16a39f9fb3cb09cad18a926eda8c817c24005cca Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/TryBackToAllSnapshotsOfVmCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/TryBackToAllSnapshotsOfVmParameters.java 2 files changed, 17 insertions(+), 15 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests Freddy Rolland: Looks good to me, but someone else must approve Ala Hino: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/64702 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I16a39f9fb3cb09cad18a926eda8c817c24005cca Gerrit-PatchSet: 11 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: TryBackToAllSnapshotsOfVmCommandTest InjectorRule
by amureini＠redhat.com 13 Oct '16

13 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: TryBackToAllSnapshotsOfVmCommandTest InjectorRule ...................................................................... core: TryBackToAllSnapshotsOfVmCommandTest InjectorRule Remove the InjectorRule that does nothing but shadow the one in the base class. Change-Id: Ieb107e115cef2f519d1e5d0887520bfc186b0946 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/TryBackToAllSnapshotsOfVmCommandTest.java 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests Freddy Rolland: Looks good to me, but someone else must approve Ala Hino: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/64701 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieb107e115cef2f519d1e5d0887520bfc186b0946 Gerrit-PatchSet: 11 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: ImportVMFromConfigurationCommandTest stubbing
by amureini＠redhat.com 13 Oct '16

13 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: ImportVMFromConfigurationCommandTest stubbing ...................................................................... core: ImportVMFromConfigurationCommandTest stubbing Replaced the command's stubbing with standard mocking. It seems as though this was originally done when logic was used in the constructor, but since it was moved out to the init() method, it's no longer needed. Change-Id: Iff90201a6ae0df955756a998f1f35d36fe06dd6d Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/ImportVMFromConfigurationCommandTest.java 1 file changed, 3 insertions(+), 20 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests -- To view, visit https://gerrit.ovirt.org/64670 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iff90201a6ae0df955756a998f1f35d36fe06dd6d Gerrit-PatchSet: 11 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Betak <mbetak(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: TryBackToAllSnapshotsofVmCommandTest local var
by amureini＠redhat.com 13 Oct '16

13 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: TryBackToAllSnapshotsofVmCommandTest local var ...................................................................... core: TryBackToAllSnapshotsofVmCommandTest local var Convert the snapshot member to a local variable to make the code cleaner and more concise. Change-Id: Ife6a86294825d44e9d2dbb89317b5daa1a9b66da Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/TryBackToAllSnapshotsOfVmCommandTest.java 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests Freddy Rolland: Looks good to me, but someone else must approve Ala Hino: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/64700 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife6a86294825d44e9d2dbb89317b5daa1a9b66da Gerrit-PatchSet: 11 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: VmsSlaPolicyCommandTest @Spy annotation
by amureini＠redhat.com 13 Oct '16

13 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: VmsSlaPolicyCommandTest @Spy annotation ...................................................................... core: VmsSlaPolicyCommandTest @Spy annotation Spy the command with the @Spy annotation instead of explicitly calling Mockito.spy. This change has two advantages - first, it's a tad more elegant, as it saves the duplicate Mockito.spy calls. Second, and more importantly, it allows using injected mocks. Change-Id: I729e078a29929f617636cecf3bf560da303cc207 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmSlaPolicyCommandTest.java 1 file changed, 7 insertions(+), 6 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests -- To view, visit https://gerrit.ovirt.org/64688 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I729e078a29929f617636cecf3bf560da303cc207 Gerrit-PatchSet: 11 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0