Allon Mureinik has submitted this change and it was merged. Change subject: core: Resurrect VdsBrokerObjectBuilderTest ...................................................................... core: Resurrect VdsBrokerObjectBuilderTest VdsBrokerObjectBuilderTest was commented out in patch 7469b8d5392840a30e1cb8e6a05eafce83114d6c, since it used PowerMock which slowed down the build considerably. This patch uncomments the class and properly removes PowerMock usages so this test can be used again. With regard to performance, this test runs in ~800 milliseconds on my laptop, which is completely reasonable, although exact times may change depending on the machine, the load it's experiencing, etc. Note that this patch is pretty raw, and just introduces the minimal work required to re-enable this test. Following patches in the series will continue to improve this class as per the project's standards. Changes performed: * Uncommented all the class. * Removed the top "TODO" comment, as this patch does exactly that. * Removed PowerMockito calls and annotations. * Replaced the test runner with MockitoJUnitRunner. * Re-introduced JsonObjectDeserializer#deserializeUnformattedJson removed in b2983fad2002ac47cfc98a7d84401daa85874c5e that's needed for asserting the disk statistics results. * Removed usages of XmlRpcStruct and replaced them with Map<String, Object> as done in VdsBrokerObjectsBuilder in commit fa3c96ad55ed3aac5b0a923c0a30363c57d5c293. * Reordered the imports to comply with the checkstyle verification added in commit a4f50e3be1717fd9cc60314f87b3d56bae6ba048. Change-Id: I7b05b287f7938fa26197dc4dfd3f5681ea7a86a2 Signed-off-by: Allon Mureinik <amureini@redhat.com> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectDeserializer.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectBuilderTest.java 2 files changed, 338 insertions(+), 346 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/43734 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7b05b287f7938fa26197dc4dfd3f5681ea7a86a2 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Omer Frenkel <ofrenkel@redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali@redhat.com> Gerrit-Reviewer: Roy Golan <rgolan@redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan@redhat.com> Gerrit-Reviewer: automation@ovirt.org