October 2016 - Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: core: CommonVmPoolCommandTestAbstract mocks
by tnisan＠redhat.com 19 Oct '16

19 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: CommonVmPoolCommandTestAbstract mocks ...................................................................... core: CommonVmPoolCommandTestAbstract mocks Remove unused mocks. Change-Id: I1f2063b28784a8e400415bd5676c94600a080b3a Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolCommandTestAbstract.java 1 file changed, 0 insertions(+), 25 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/64660 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1f2063b28784a8e400415bd5676c94600a080b3a 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: CommonVmPoolCommandTestAbstract monitor num
by tnisan＠redhat.com 19 Oct '16

19 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: CommonVmPoolCommandTestAbstract monitor num ...................................................................... core: CommonVmPoolCommandTestAbstract monitor num Use a list of strings instead of redundantly splitting a hard-coded string. Change-Id: I483f0eb9d434490588df51177643de2f4a3b98f6 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolCommandTestAbstract.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64659 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I483f0eb9d434490588df51177643de2f4a3b98f6 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: PoolCommand tests mocking
by tnisan＠redhat.com 19 Oct '16

19 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: PoolCommand tests mocking ...................................................................... core: PoolCommand tests mocking Use doNothing() for mocking instead of bloating the code with stubs. Change-Id: Iaf724af32503eba46b35d359521890a291c167c2 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, 5 insertions(+), 27 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/64655 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf724af32503eba46b35d359521890a291c167c2 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: Pool commands mockito initialization
by tnisan＠redhat.com 19 Oct '16

19 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: Pool commands mockito initialization ...................................................................... core: Pool commands mockito initialization Removed redundant initialization of Mockito as the base class, BaseCommandTest already handles it. Change-Id: I8d9274d6fad0037489f1c27d9c863baa66fd7c57 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 2 files changed, 0 insertions(+), 5 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/64657 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d9274d6fad0037489f1c27d9c863baa66fd7c57 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: PoolCommand tests init()
by tnisan＠redhat.com 19 Oct '16

19 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: PoolCommand tests init() ...................................................................... core: PoolCommand tests init() Use init() instead of postConstruct() (which just handles internal CommandBase issues this test should care about) in order to stop creating a CommandContext which does nothing but distract attention from the test's actual parts. Change-Id: I5f08eb4c2ef843536ee10966cdd762d336d56657 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, 3 insertions(+), 6 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/64656 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5f08eb4c2ef843536ee10966cdd762d336d56657 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: AddVm*CommandTest space mocking
by tnisan＠redhat.com 19 Oct '16

19 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: AddVm*CommandTest space mocking ...................................................................... core: AddVm*CommandTest space mocking Since the free space validations are done by the StorgeDomainValidator (which is mocked anyway), setting up free space and disk sizes in the test is redundant, and steals focus from what the test actually tests. This patch removes this redundant information to help make the code easier to read. Change-Id: I5b54719d2cc9e46fe4fe6997db773a50e44afd86 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/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 4 files changed, 22 insertions(+), 36 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64654 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5b54719d2cc9e46fe4fe6997db773a50e44afd86 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: Amit Aviram <aaviram(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: 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