Change in ovirt-engine[master]: restapi: Consolidate TestHelper params matchers

Code Review gerrit at ovirt.org
Mon Jan 23 07:17:33 UTC 2017


>From Allon Mureinik <amureini at redhat.com>:

Allon Mureinik has submitted this change and it was merged.

Change subject: restapi: Consolidate TestHelper params matchers
......................................................................


restapi: Consolidate TestHelper params matchers

With the changes in ArgumentMatcher that were delivered in the upgrade
to Mockito 2.x, the ActionParameterEquals and QueryParameterEquals
matchers became almost completely identical, except for their generic
specification.

This patch applies a generic T parameter to the matchers and unifies
them to a single ParametersEquals matcher which saves code bloating and
is easier to maintain.

Change-Id: If5716f42c9309250a1856c04d3bc77673f79eeea
Signed-off-by: Allon Mureinik <amureini at redhat.com>
---
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResourceTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendAttachedStorageDomainsResourceTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/test/util/TestHelper.java
8 files changed, 36 insertions(+), 84 deletions(-)

Approvals:
  Juan Hernandez: Looks good to me, approved
  Allon Mureinik: Verified; Passed CI tests

Objections:
  Jenkins CI: Failed CI tests



-- 
To view, visit https://gerrit.ovirt.org/70306
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If5716f42c9309250a1856c04d3bc77673f79eeea
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>


More information about the Engine-commits mailing list