fixed tests

gbif · Jun 2, 2021 · 23224ed · 23224ed
1 parent a3c66b9
commit 23224ed
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/.../src/main/java/org/gbif/registry/security/precheck/AuthPreCheckCreationRequestFilter.java b/.../src/main/java/org/gbif/registry/security/precheck/AuthPreCheckCreationRequestFilter.java
@@ -351,7 +351,8 @@ private boolean isEmptyBody(String content) {
     return contentNormalized.isEmpty() || contentNormalized.equals("{}");
   }
 
-  private static class Resource {
+  @VisibleForTesting
+  static class Resource {
     String name;
     UUID key;
 

diff --git a/.../test/java/org/gbif/registry/security/precheck/AuthPreCheckCreationRequestFilterTest.java b/.../test/java/org/gbif/registry/security/precheck/AuthPreCheckCreationRequestFilterTest.java
@@ -43,47 +43,47 @@ public void getResourceToCreateTest() {
     when(mockRequest.getRequestURI()).thenReturn("/grscicoll/institution");
     assertEquals(
         GrSciCollEditorAuthorizationFilter.INSTITUTION,
-        authPreCheckCreationRequestFilter.getResourceToCreate(mockRequest).get());
+        authPreCheckCreationRequestFilter.getResourceToCreate(mockRequest).get().name);
 
     when(mockRequest.getRequestURI()).thenReturn("/grscicoll/collection");
     assertEquals(
         GrSciCollEditorAuthorizationFilter.COLLECTION,
-        authPreCheckCreationRequestFilter.getResourceToCreate(mockRequest).get());
+        authPreCheckCreationRequestFilter.getResourceToCreate(mockRequest).get().name);
 
     when(mockRequest.getRequestURI()).thenReturn("/dataset");
     when(mockRequest.getMethod()).thenReturn("POST");
     assertEquals(
         EditorAuthorizationFilter.DATASET,
-        authPreCheckCreationRequestFilter.getResourceToCreate(mockRequest).get());
+        authPreCheckCreationRequestFilter.getResourceToCreate(mockRequest).get().name);
 
     when(mockRequest.getRequestURI()).thenReturn("/organization");
     when(mockRequest.getMethod()).thenReturn("POST");
     assertEquals(
         EditorAuthorizationFilter.ORGANIZATION,
-        authPreCheckCreationRequestFilter.getResourceToCreate(mockRequest).get());
+        authPreCheckCreationRequestFilter.getResourceToCreate(mockRequest).get().name);
 
     when(mockRequest.getRequestURI()).thenReturn("/installation");
     when(mockRequest.getMethod()).thenReturn("POST");
     assertEquals(
         EditorAuthorizationFilter.INSTALLATION,
-        authPreCheckCreationRequestFilter.getResourceToCreate(mockRequest).get());
+        authPreCheckCreationRequestFilter.getResourceToCreate(mockRequest).get().name);
 
     when(mockRequest.getRequestURI())
         .thenReturn("/dataset/f822c473-fea5-467c-93ca-3f09befd9817/machineTag");
     assertEquals(
         EditorAuthorizationFilter.MACHINE_TAG,
-        authPreCheckCreationRequestFilter.getResourceToCreate(mockRequest).get());
+        authPreCheckCreationRequestFilter.getResourceToCreate(mockRequest).get().name);
 
     when(mockRequest.getRequestURI())
         .thenReturn("/grscicoll/institution/f822c473-fea5-467c-93ca-3f09befd9817/merge");
     assertEquals(
         AuthPreCheckCreationRequestFilter.INSTITUTION_MERGE,
-        authPreCheckCreationRequestFilter.getResourceToCreate(mockRequest).get());
+        authPreCheckCreationRequestFilter.getResourceToCreate(mockRequest).get().name);
 
     when(mockRequest.getRequestURI())
         .thenReturn("/grscicoll/collection/f822c473-fea5-467c-93ca-3f09befd9817/merge");
     assertEquals(
         AuthPreCheckCreationRequestFilter.COLLECTION_MERGE,
-        authPreCheckCreationRequestFilter.getResourceToCreate(mockRequest).get());
+        authPreCheckCreationRequestFilter.getResourceToCreate(mockRequest).get().name);
   }
 }