From 23224ed0d8d330f73d71dd572a3f6ee4eb53550e Mon Sep 17 00:00:00 2001 From: Marcos Lopez Gonzalez Date: Wed, 2 Jun 2021 16:37:44 +0200 Subject: [PATCH] fixed tests --- .../AuthPreCheckCreationRequestFilter.java | 3 ++- .../AuthPreCheckCreationRequestFilterTest.java | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/registry-security/src/main/java/org/gbif/registry/security/precheck/AuthPreCheckCreationRequestFilter.java b/registry-security/src/main/java/org/gbif/registry/security/precheck/AuthPreCheckCreationRequestFilter.java index bf90b1c3cc..f2318c1dc5 100644 --- a/registry-security/src/main/java/org/gbif/registry/security/precheck/AuthPreCheckCreationRequestFilter.java +++ b/registry-security/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/registry-security/src/test/java/org/gbif/registry/security/precheck/AuthPreCheckCreationRequestFilterTest.java b/registry-security/src/test/java/org/gbif/registry/security/precheck/AuthPreCheckCreationRequestFilterTest.java index 98b56edd65..1cbe207718 100644 --- a/registry-security/src/test/java/org/gbif/registry/security/precheck/AuthPreCheckCreationRequestFilterTest.java +++ b/registry-security/src/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); } }