Allon Mureinik has submitted this change and it was merged. Change subject: core: Fix and enable GetWatchdogQuery ignored test ...................................................................... core: Fix and enable GetWatchdogQuery ignored test Fixed GetWatchdofQueryTest.executeQueryCommandWithWatchdog() and removed the @Ignore annotation from it now that it's functioning. This patch includes: 1. Using the infrastructure provided by AbstractQueryTest. 2. Moving general initializations (e.g., the DAO) to the setUp() method, where they belong. 3. Removing unneeded Mockito calls. 4. Asserting the result from getQueryReturnValue() as queries are supposed to instead of getReturnValue() which will always return null for queries. Change-Id: I0aefd1d95cfefc4ab8391b318844dfb815f33ea5 Signed-off-by: Allon Mureinik <amureini@redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetWatchdogQueryTest.java 1 file changed, 16 insertions(+), 19 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/23350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0aefd1d95cfefc4ab8391b318844dfb815f33ea5 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Doron Fediuck <dfediuck@redhat.com> Gerrit-Reviewer: Gilad Chaplik <gchaplik@redhat.com> Gerrit-Reviewer: Laszlo Hornyak <lhornyak@redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server