[TEMP] use services in matchers as they seem to work locally

Author: Jens Vannerum

dspace-server-webapp/src/test/java/org/dspace/app/rest/LoginAsEPersonIT.java

@@ -208,7 +208,7 @@ public void createEmptyWorkspaceItemLoginOnBehalfOfCheckSubmitterTest() throws E
             getClient(authToken).perform(get("/api/submission/workspaceitems/" + wsi.get())
                                             .param("embed", "submitter"))
                                 .andExpect(jsonPath("$._embedded.submitter",
-                                                    EPersonMatcher.matchEPersonOnEmail(eperson.getEmail())));
+                                                    EPersonMatcher.matchProperties(eperson)));
 
         } finally {
             WorkspaceItemBuilder.deleteWorkspaceItem(wsi.get());

dspace-server-webapp/src/test/java/org/dspace/app/rest/SubscriptionRestRepositoryIT.java

@@ -1078,7 +1078,7 @@ public void linkedEpersonOfSubscriptionAdminTest() throws Exception {
         String tokenAdmin = getAuthToken(admin.getEmail(), password);
         getClient(tokenAdmin).perform(get("/api/core/subscriptions/" + subscription.getID() + "/eperson"))
                              .andExpect(status().isOk())
-                             .andExpect(jsonPath("$", is(EPersonMatcher.matchEPersonOnEmail(eperson.getEmail()))));
+                             .andExpect(jsonPath("$", is(EPersonMatcher.matchEPersonEntry(eperson))));
     }
 
     @Test
@@ -1096,7 +1096,7 @@ public void linkedEpersonOfSubscriptionTest() throws Exception {
         String tokenEPerson = getAuthToken(eperson.getEmail(), password);
         getClient(tokenEPerson).perform(get("/api/core/subscriptions/" + subscription.getID() + "/eperson"))
                                .andExpect(status().isOk())
-                               .andExpect(jsonPath("$", is(EPersonMatcher.matchEPersonOnEmail(eperson.getEmail()))));
+                               .andExpect(jsonPath("$", is(EPersonMatcher.matchProperties(eperson))));
     }
 
     @Test