- Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: core: RemoveAuditLogByIdCommandTest @Spy annotation
by tnisan＠redhat.com 20 Oct '16

20 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: RemoveAuditLogByIdCommandTest @Spy annotation ...................................................................... core: RemoveAuditLogByIdCommandTest @Spy annotation Spy the command with the @Spy annotation instead of explicitly calling Mockito.spy in order to facilitate using injected mocks instead of explicitly spying their return. Change-Id: I64e61b8e67d046d01b012359f6cb8bb2fa6c550b Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveAuditLogByIdCommandTest.java 1 file changed, 8 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/64788 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64e61b8e67d046d01b012359f6cb8bb2fa6c550b Gerrit-PatchSet: 17 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: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(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: AbstractRolesCommandTestBase @Spy annotation
by tnisan＠redhat.com 20 Oct '16

20 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: AbstractRolesCommandTestBase @Spy annotation ...................................................................... core: AbstractRolesCommandTestBase @Spy annotation Spy the command with the @Spy annotation instead of explicitly calling Mockito.spy in order to use injected mocks instead of explicitly spying their return. Change-Id: I97ce644bd73c75e12485e98f981806df8d833304 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractRolesCommandTestBase.java 1 file changed, 7 insertions(+), 5 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Ravi Nori: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64787 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I97ce644bd73c75e12485e98f981806df8d833304 Gerrit-PatchSet: 17 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: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Ravi Nori <rnori(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: AttachNetworkToClusterInternalCommandTest stubbing
by tnisan＠redhat.com 20 Oct '16

20 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: AttachNetworkToClusterInternalCommandTest stubbing ...................................................................... core: AttachNetworkToClusterInternalCommandTest stubbing Remove TestAttachNetworkToClusterCommand and replace it with a standard @Spy instance. In order to accomplish this, AuditLogableBase#getNetworkClusterDao and AuditLogableBase#getNetworkDao had to be made public like the other getXYZDao methods in that class. Note that they will be removed and replaced with injection at the end of this series anyway. Change-Id: I4db8895ed8ce9bd564c92cdad4eb21d8495fa35e Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateClusterCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/UpdateStoragePoolCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToClusterInternalCommandTest.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java 5 files changed, 17 insertions(+), 56 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64786 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4db8895ed8ce9bd564c92cdad4eb21d8495fa35e Gerrit-PatchSet: 17 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: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Yevgeny Zaspitsky <yzaspits(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: UpdateRngDeviceTest annotations
by tnisan＠redhat.com 20 Oct '16

20 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: UpdateRngDeviceTest annotations ...................................................................... core: UpdateRngDeviceTest annotations Convert mocking and spying to annotations as per the project's standard in order to facilitate injecting mocks in the following patches. Change-Id: Id4c6a26723852cd5a1e56b8d3d6d9541dd4ac9e0 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateRngDeviceTest.java 1 file changed, 21 insertions(+), 12 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jakub Niedermertl: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64785 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id4c6a26723852cd5a1e56b8d3d6d9541dd4ac9e0 Gerrit-PatchSet: 17 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: UpdateRngDeviceTest spying
by tnisan＠redhat.com 20 Oct '16

20 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: UpdateRngDeviceTest spying ...................................................................... core: UpdateRngDeviceTest spying Spy the command instead of stubbing it as per the project's standard. Although this approach is semantically similar, it saves a lot of code bloating and sets up the ability to inject mocked DAOs in the following patches. Change-Id: I02fe3da9160f9e6ff11ed218a32a9d39489623b5 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateRngDeviceTest.java 1 file changed, 6 insertions(+), 21 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jakub Niedermertl: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64784 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I02fe3da9160f9e6ff11ed218a32a9d39489623b5 Gerrit-PatchSet: 17 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: AbstractRngDeviceCommand#init
by tnisan＠redhat.com 20 Oct '16

20 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: AbstractRngDeviceCommand#init ...................................................................... core: AbstractRngDeviceCommand#init Move the initialization logic from the constructor to the init method, as per the project's standard. The init() method is called as part of the command construction framework, and since it's done in the postConstruct phase, it's safe to use DAO calls there, allowing the test to be cleaned up in the following patch. Change-Id: I9e8dfdcc791e7e42f2b01df2a2aec2ef47cbce4d Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractRngDeviceCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateRngDeviceTest.java 2 files changed, 7 insertions(+), 2 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jakub Niedermertl: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64783 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9e8dfdcc791e7e42f2b01df2a2aec2ef47cbce4d Gerrit-PatchSet: 17 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: EditAffinityGroupCommandTest @Spy annotation
by tnisan＠redhat.com 20 Oct '16

20 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: EditAffinityGroupCommandTest @Spy annotation ...................................................................... core: EditAffinityGroupCommandTest @Spy annotation Spy the command with the @Spy annotation instead of explicitly calling Mockito.spy in order to use injected mocks instead of explicitly spying their return. Note that as the order of execution between @Mock and @Spy can't be relied upon the parameters objects was converted from a mock to a real instance. As this object is a simple data-POJO, there is no real reason to mock it anyway, and doing so just adds complexity to the test. Change-Id: Ia11e4739a6ca7277fa04b1a21c321d3629fd4cf6 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/commands/EditAffinityGroupCommandTest.java 1 file changed, 7 insertions(+), 6 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Roman Mohr: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64782 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia11e4739a6ca7277fa04b1a21c321d3629fd4cf6 Gerrit-PatchSet: 17 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

Change in ovirt-engine[master]: core: EditAffinityGroupCommandTest stubbing
by tnisan＠redhat.com 20 Oct '16

20 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: EditAffinityGroupCommandTest stubbing ...................................................................... core: EditAffinityGroupCommandTest stubbing Removed stubbing and replaced it with easier to read spying, as per the project's standard. Change-Id: I1f83191a0c6d2d0f3fdd6f879539807b38d5fc5f Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/commands/EditAffinityGroupCommandTest.java 1 file changed, 5 insertions(+), 9 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Roman Mohr: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64781 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1f83191a0c6d2d0f3fdd6f879539807b38d5fc5f Gerrit-PatchSet: 17 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

Change in ovirt-engine[master]: core: AffinityGroupCRUDCommand#init
by tnisan＠redhat.com 20 Oct '16

20 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: AffinityGroupCRUDCommand#init ...................................................................... core: AffinityGroupCRUDCommand#init Move the initialization logic from the command's constructor to the init() method, as per the project's standard. This is done in order to move any DAO calls to the postConstruct phase, where it's safe to use them, and better facilitate testing these commands. Change-Id: I7ca5b59817d7b93924814a5c1e848e7afa19e580 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/AffinityGroupCRUDCommand.java 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Roman Mohr: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64780 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ca5b59817d7b93924814a5c1e848e7afa19e580 Gerrit-PatchSet: 17 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

Change in ovirt-engine[master]: core: EndExternalStepCommandTest @Spy annotation
by tnisan＠redhat.com 20 Oct '16

20 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: EndExternalStepCommandTest @Spy annotation ...................................................................... core: EndExternalStepCommandTest @Spy annotation Use the @Spy annotation to facilitate injecting mocks to the command under test in the following patches in the series. Change-Id: I1019f5c55345aca8a594911de993c61b2817a762 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/EndExternalStepCommandTest.java 1 file changed, 20 insertions(+), 21 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64794 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1019f5c55345aca8a594911de993c61b2817a762 Gerrit-PatchSet: 17 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: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0