- Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: core: Clean up AddVm*CommandTests
by tnisan＠redhat.com 19 Oct '16

19 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: Clean up AddVm*CommandTests ...................................................................... core: Clean up AddVm*CommandTests Created a new base class, AddVmCommandTestBase, for all the AddVm*CommandTests and moved common functionality and mocking there. Made the command under test a member and redirected all the methods to use it. Change-Id: I5142cd7e1af92302f8fcf8d56db12a68409d0716 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java A backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTestBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommandTest.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java 6 files changed, 453 insertions(+), 612 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64653 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5142cd7e1af92302f8fcf8d56db12a68409d0716 Gerrit-PatchSet: 12 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: Jakub Niedermertl <jniederm(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: Relocate tests for AddVmFromSnapshotCommand
by tnisan＠redhat.com 19 Oct '16

19 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: Relocate tests for AddVmFromSnapshotCommand ...................................................................... core: Relocate tests for AddVmFromSnapshotCommand Moved all the test cases for AddVmFromSnapshotCommand to the appropriate place - AddVmFromSnapshopCommandTest. Change-Id: I87e3798068717b5cc573c19e63464dbee6804fe0 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommandTest.java 3 files changed, 65 insertions(+), 68 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64652 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I87e3798068717b5cc573c19e63464dbee6804fe0 Gerrit-PatchSet: 12 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: Relocate tests for AddVmFromTemplateCommand
by tnisan＠redhat.com 19 Oct '16

19 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: Relocate tests for AddVmFromTemplateCommand ...................................................................... core: Relocate tests for AddVmFromTemplateCommand Moved all the test cases for AddVmFromTemplateCommand to the appropriate place - AddVmFromTemaplteCommandTest. Change-Id: Ia4c5b4ad5542ca940a06537d8774324aad03da50 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommandTest.java 2 files changed, 231 insertions(+), 221 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64651 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia4c5b4ad5542ca940a06537d8774324aad03da50 Gerrit-PatchSet: 12 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: UpdateVmCommandTest single command instance
by tnisan＠redhat.com 19 Oct '16

19 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: UpdateVmCommandTest single command instance ...................................................................... core: UpdateVmCommandTest single command instance Rework the test to use a single command instance, annotated with @Spy and @InjectMocks in order to reduce code duplication and allow easier injections. Note that the OsRepository is used to initialize a data member in VmCommand, so it must be mocked in a static context, before the command instance is created. Change-Id: Id91070d1cde2ea8a5d4a8b00ec49d57237786fbb Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java 1 file changed, 31 insertions(+), 18 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64650 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id91070d1cde2ea8a5d4a8b00ec49d57237786fbb Gerrit-PatchSet: 12 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: MoveOrCopyDiskCommandTest @Spy annotation
by tnisan＠redhat.com 19 Oct '16

19 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: MoveOrCopyDiskCommandTest @Spy annotation ...................................................................... core: MoveOrCopyDiskCommandTest @Spy annotation Spy the command with the @Spy annotation instead of explicitly calling Mockito.spy in order to set the ground for using injected mocks in these tests in the future. Note that the MoreOrCopyImageGroupParameters#setOperation method had to be exposed in order to allow overriding its value after the parameters object was created. Change-Id: Icdb834aa28e2d54d0c4dfc397d647a82114f4363 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/MoveOrCopyDiskCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MoveOrCopyImageGroupParameters.java 2 files changed, 39 insertions(+), 30 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified Freddy Rolland: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/64718 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icdb834aa28e2d54d0c4dfc397d647a82114f4363 Gerrit-PatchSet: 13 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: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot(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: Pool command tests @Spy annotation
by tnisan＠redhat.com 19 Oct '16

19 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: Pool command tests @Spy annotation ...................................................................... core: Pool command tests @Spy annotation Spy the commands 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: I8913ed27aeadba957385055122368c718d284077 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmPoolCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolCommandTestAbstract.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmPoolCommandTest.java 3 files changed, 10 insertions(+), 19 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Martin Betak: Looks good to me, but someone else must approve Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64661 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8913ed27aeadba957385055122368c718d284077 Gerrit-PatchSet: 12 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: MoveOrCopyDiskCommand#init
by tnisan＠redhat.com 19 Oct '16

19 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: MoveOrCopyDiskCommand#init ...................................................................... core: MoveOrCopyDiskCommand#init Override the init() method and move the logic from defineVmTemplate() there, so we don't have to make any database calls from the constructor. This change allows us to clean up the test and remove [now] redundant the MoveOrCopyDiskCommandDummy class. Change-Id: I32fb4306af2d2e05292cf23614c991d3499627b8 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/MoveOrCopyDiskCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/MoveOrCopyDiskCommandTest.java 2 files changed, 6 insertions(+), 20 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified Freddy Rolland: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/64717 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32fb4306af2d2e05292cf23614c991d3499627b8 Gerrit-PatchSet: 13 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: Amit Aviram <aaviram(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot(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: storage connection command tests @Spy annotation
by tnisan＠redhat.com 19 Oct '16

19 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: storage connection command tests @Spy annotation ...................................................................... core: storage connection command tests @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: I2744292707142216c1906c70c5ea5225faf584c4 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 M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/connection/StorageServerConnectionTestCommon.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/connection/UpdateStorageServerConnectionCommandTest.java 3 files changed, 44 insertions(+), 41 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64711 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2744292707142216c1906c70c5ea5225faf584c4 Gerrit-PatchSet: 12 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: 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: HotPlugDiskToVmCommandTest @Spy annotation
by tnisan＠redhat.com 19 Oct '16

19 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: HotPlugDiskToVmCommandTest @Spy annotation ...................................................................... core: HotPlugDiskToVmCommandTest @Spy annotation Spy the command with the @Spy annotation instead of explicitly calling Mockito.spy in order to set the ground for using injected mocks in these tests in the future. Note that VmCommand initializes its osRepository directly as a data members with a SimpleDependencyInjector, so it must be mocked before the command is created - i.e., in a @BeforeClass method in a static context. Change-Id: Iddf8b1ae36e0466dc4b6e121fbac05789834788f Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/HotPlugDiskToVmCommandTest.java 1 file changed, 13 insertions(+), 6 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64716 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iddf8b1ae36e0466dc4b6e121fbac05789834788f Gerrit-PatchSet: 13 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: Amit Aviram <aaviram(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: Replace VmHandlerRule with injection
by tnisan＠redhat.com 19 Oct '16

19 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: Replace VmHandlerRule with injection ...................................................................... core: Replace VmHandlerRule with injection The current injection facilities provide a much simpler, safer (as they don't rely on field name reflection) way to inject dependencies into the VmHandler. This patch removes the outdated VmHandlerRule and replaces its usages with more straight-forward injections. Change-Id: I795db463f7be8e48e4e51042ba8be10f510f7451 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java D backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerRule.java 2 files changed, 2 insertions(+), 79 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Martin Betak: Looks good to me, but someone else must approve Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/65191 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I795db463f7be8e48e4e51042ba8be10f510f7451 Gerrit-PatchSet: 4 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: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0