From a928002d07a5cbcfca169f4f2d2e7e5320fa0ffd Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Thu, 9 Nov 2023 22:31:09 +0000 Subject: [PATCH 01/31] improve unit test coverage for exception to 100% --- .../exception/BadRequestExceptionTest.java | 44 +++++++++ .../exception/GlobalExceptionHandlerTest.java | 55 +++++++++++ .../InvalidOrganizationExceptionTest.java | 20 ++++ ...rganizationAlreadyExistsExceptionTest.java | 20 ++++ .../OrganizationNotFoundExceptionTest.java | 20 ++++ .../SimpleChallengeGlobalExceptionTest.java | 99 +++++++++++++++++++ 6 files changed, 258 insertions(+) create mode 100644 apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java create mode 100644 apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java create mode 100644 apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java create mode 100644 apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/OrganizationAlreadyExistsExceptionTest.java create mode 100644 apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/OrganizationNotFoundExceptionTest.java create mode 100644 apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java new file mode 100644 index 0000000000..5cf57c28b9 --- /dev/null +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java @@ -0,0 +1,44 @@ +package org.sagebionetworks.openchallenges.organization.service.exception; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.Test; + +public class BadRequestExceptionTest { + + @Test + public void BadRequestException_ShouldReturnType_WhenTypeKeyIsPassed() { + // Set up the input detail + String detail = "Errordetail"; + + // Create an instance of BadRequestException + BadRequestException exception = new BadRequestException(detail); + + // Verify the properties of the exception + assertThat(exception.getType()).isEqualTo(ErrorConstants.BAD_REQUEST.getType()); + } + + @Test + public void BadRequestException_ShouldReturnStatus_WhenStatusKeyIsPassed() { + // Set up the input detail + String detail = "Errordetail"; + + // Create an instance of BadRequestException + BadRequestException exception = new BadRequestException(detail); + + // Verify the properties of the exception + assertThat(exception.getStatus()).isEqualTo(ErrorConstants.BAD_REQUEST.getStatus()); + } + + @Test + public void BadRequestException_ShouldReturnDetail_WhenDetailKeyIsPassed() { + // Set up the input detail + String detail = "Errordetail"; + + // Create an instance of BadRequestException + BadRequestException exception = new BadRequestException(detail); + + // Verify the properties of the exception + assertThat(exception.getDetail()).isEqualTo(detail); + } +} diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java new file mode 100644 index 0000000000..69ffaad524 --- /dev/null +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java @@ -0,0 +1,55 @@ +package org.sagebionetworks.openchallenges.organization.service.exception; + +import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; +import org.springframework.http.ResponseEntity; + +import java.beans.Transient; +import java.util.Locale; +import org.sagebionetworks.openchallenges.organization.service.model.dto.BasicErrorDto; +import org.sagebionetworks.openchallenges.organization.service.exception.SimpleChallengeGlobalException; +import org.springframework.http.HttpStatus; + +public class GlobalExceptionHandlerTest { + + @Test + public void HandleException_ShouldReturnStatus_WhenExceptionAndLocalePassed() { + // Create a sample Exception + Exception exception = new Exception("An exception occurred"); + Locale locale = Locale.getDefault(); + String details = "Something went wrong"; + + // Create the GlobalExceptionHandler instance + GlobalExceptionHandler exceptionHandler = new GlobalExceptionHandler(); + + // Call handleException + ResponseEntity responseEntity = exceptionHandler.handleException(exception, locale); + + // Verify the response + assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR); + } + + @Test + public void GlobalExceptionHandler_ShouldFunction_WhenCalled() { + // Create a sample Exception + //Exception exception = new Exception("An exception occurred"); + Locale locale = Locale.getDefault(); + // String details = "Something went wrong"; + // Define the exception details + String type = "ExceptionType"; + String title = "Exception Title"; + HttpStatus status = HttpStatus.BAD_REQUEST; + String detail = "Exception detail message"; + + //Create newSimpleChallengeGlobalException instance + SimpleChallengeGlobalException exception = + new SimpleChallengeGlobalException(type, title, status, detail); + + // Create the GlobalExceptionHandler instance + GlobalExceptionHandler exceptionHandler = new GlobalExceptionHandler(); + + //Call handleGlobalException + ResponseEntity responseEntity = exceptionHandler.handleGlobalException(exception, locale); + + } +} \ No newline at end of file diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java new file mode 100644 index 0000000000..27c6202d01 --- /dev/null +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java @@ -0,0 +1,20 @@ +package org.sagebionetworks.openchallenges.organization.service.exception; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.Test; + +public class InvalidOrganizationExceptionTest { + + @Test + public void InvalidOrganizationException_ShouldReturnDetail_WhenDetailKeyIsPassed() { + // Set up the input detail + String detail = "Errordetail"; + + // Create an instance of InvalidOrganizationException + InvalidOrganizationException exception = new InvalidOrganizationException(detail); + + // Verify the properties of the exception + assertThat(exception.getDetail()).isEqualTo(detail); + } +} diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/OrganizationAlreadyExistsExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/OrganizationAlreadyExistsExceptionTest.java new file mode 100644 index 0000000000..56e11ca0a7 --- /dev/null +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/OrganizationAlreadyExistsExceptionTest.java @@ -0,0 +1,20 @@ +package org.sagebionetworks.openchallenges.organization.service.exception; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.Test; + +public class OrganizationAlreadyExistsExceptionTest { + + @Test + public void OrganizationAlreadyExistsException_ShouldReturnDetail_WhenDetailKeyIsPassed() { + // Set up the input detail + String detail = "Errordetail"; + + // Create an instance of OrganizationAlreadyExistsException + OrganizationAlreadyExistsException exception = new OrganizationAlreadyExistsException(detail); + + // Verify the properties of the exception + assertThat(exception.getDetail()).isEqualTo(detail); + } +} diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/OrganizationNotFoundExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/OrganizationNotFoundExceptionTest.java new file mode 100644 index 0000000000..e9a20ef375 --- /dev/null +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/OrganizationNotFoundExceptionTest.java @@ -0,0 +1,20 @@ +package org.sagebionetworks.openchallenges.organization.service.exception; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.Test; + +public class OrganizationNotFoundExceptionTest { + + @Test + public void OrganizationNotFoundException_ShouldReturnDetail_WhenDetailKeyIsPassed() { + // Set up the input detail + String detail = "Errordetail"; + + // Create an instance of OrganizationNotFoundException + OrganizationNotFoundException exception = new OrganizationNotFoundException(detail); + + // Verify the properties of the exception + assertThat(exception.getDetail()).isEqualTo(detail); + } +} diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java new file mode 100644 index 0000000000..0912925152 --- /dev/null +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java @@ -0,0 +1,99 @@ +package org.sagebionetworks.openchallenges.organization.service.exception; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Locale; +import org.junit.jupiter.api.Test; +import org.sagebionetworks.openchallenges.organization.service.model.dto.BasicErrorDto; +import org.sagebionetworks.openchallenges.organization.service.exception.SimpleChallengeGlobalException; +import org.springframework.http.HttpStatus; + +public class SimpleChallengeGlobalExceptionTest { + + @Test + public void SimpleChallengeGlobalException_ShouldReturnMessage_WhenMessageKeyIsPassed() { + // Create an instance of SimpleChallengeGlobalException using the constructor with details + String details = "Something went wrong"; + SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(details); + + // Verify the exception details + assertThat(exception.getMessage()).isEqualTo(details); + } + + @Test + public void SimpleChallengeGlobalException_ShouldReturnType_WhenTypeKeyIsPassed() { + // Define the exception details + String type = "ExceptionType"; + String title = "Exception Title"; + HttpStatus status = HttpStatus.BAD_REQUEST; + String detail = "Exception detail message"; + + // Create an instance of SimpleChallengeGlobalException using the all-args constructor + SimpleChallengeGlobalException exception = + new SimpleChallengeGlobalException(type, title, status, detail); + + // Verify the exception details + assertThat(exception.getType()).isEqualTo(type); + } + + @Test + public void SimpleChallengeGlobalException_ShouldReturnTitle_WhenTitleKeyIsPassed() { + // Define the exception details + String type = "ExceptionType"; + String title = "Exception Title"; + HttpStatus status = HttpStatus.BAD_REQUEST; + String detail = "Exception detail message"; + + // Create an instance of SimpleChallengeGlobalException using the all-args constructor + SimpleChallengeGlobalException exception = + new SimpleChallengeGlobalException(type, title, status, detail); + + // Verify the exception details + assertThat(exception.getTitle()).isEqualTo(title); + } + + @Test + public void SimpleChallengeGlobalException_ShouldReturnStatus_WhenStatusKeyIsPassed() { + // Define the exception details + String type = "ExceptionType"; + String title = "Exception Title"; + HttpStatus status = HttpStatus.BAD_REQUEST; + String detail = "Exception detail message"; + + // Create an instance of SimpleChallengeGlobalException using the all-args constructor + SimpleChallengeGlobalException exception = + new SimpleChallengeGlobalException(type, title, status, detail); + + // Verify the exception details + assertThat(exception.getStatus()).isEqualTo(status); + } + + @Test + public void SimpleChallengeGlobalException_ShouldFunction_WhenCalledUsingNoArgsConstructor() { + + // Create an instance of SimpleChallengeGlobalException using the no-args constructor + SimpleChallengeGlobalException exception = + new SimpleChallengeGlobalException(); + + } + + @Test + public void SimpleChallengeGlobalException_ShouldSetArgs_WhenArgsPassed() { + // Define the exception details + String type = "ExceptionType"; + String title = "Exception Title"; + HttpStatus status = HttpStatus.BAD_REQUEST; + String detail = "Exception detail message"; + + // Create an instance of SimpleChallengeGlobalException using the no-args constructor + SimpleChallengeGlobalException exception = + new SimpleChallengeGlobalException(); + + //Create args for the exception + exception.setType(type); + exception.setTitle(title); + exception.setStatus(status); + exception.setDetail(detail); + + } +} From c5512ed17fee15b1d7b952d958133ec3ad38b946 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Thu, 9 Nov 2023 22:31:28 +0000 Subject: [PATCH 02/31] update unit test formatting --- .../exception/GlobalExceptionHandlerTest.java | 23 +++++++++---------- .../SimpleChallengeGlobalExceptionTest.java | 15 ++++-------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java index 69ffaad524..12ac70d52f 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java @@ -1,17 +1,15 @@ package org.sagebionetworks.openchallenges.organization.service.exception; import static org.assertj.core.api.Assertions.assertThat; -import org.junit.jupiter.api.Test; -import org.springframework.http.ResponseEntity; -import java.beans.Transient; import java.util.Locale; +import org.junit.jupiter.api.Test; import org.sagebionetworks.openchallenges.organization.service.model.dto.BasicErrorDto; -import org.sagebionetworks.openchallenges.organization.service.exception.SimpleChallengeGlobalException; import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; public class GlobalExceptionHandlerTest { - + @Test public void HandleException_ShouldReturnStatus_WhenExceptionAndLocalePassed() { // Create a sample Exception @@ -23,7 +21,8 @@ public void HandleException_ShouldReturnStatus_WhenExceptionAndLocalePassed() { GlobalExceptionHandler exceptionHandler = new GlobalExceptionHandler(); // Call handleException - ResponseEntity responseEntity = exceptionHandler.handleException(exception, locale); + ResponseEntity responseEntity = + exceptionHandler.handleException(exception, locale); // Verify the response assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR); @@ -32,7 +31,7 @@ public void HandleException_ShouldReturnStatus_WhenExceptionAndLocalePassed() { @Test public void GlobalExceptionHandler_ShouldFunction_WhenCalled() { // Create a sample Exception - //Exception exception = new Exception("An exception occurred"); + // Exception exception = new Exception("An exception occurred"); Locale locale = Locale.getDefault(); // String details = "Something went wrong"; // Define the exception details @@ -41,15 +40,15 @@ public void GlobalExceptionHandler_ShouldFunction_WhenCalled() { HttpStatus status = HttpStatus.BAD_REQUEST; String detail = "Exception detail message"; - //Create newSimpleChallengeGlobalException instance + // Create newSimpleChallengeGlobalException instance SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(type, title, status, detail); // Create the GlobalExceptionHandler instance GlobalExceptionHandler exceptionHandler = new GlobalExceptionHandler(); - //Call handleGlobalException - ResponseEntity responseEntity = exceptionHandler.handleGlobalException(exception, locale); - + // Call handleGlobalException + ResponseEntity responseEntity = + exceptionHandler.handleGlobalException(exception, locale); } -} \ No newline at end of file +} diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java index 0912925152..90699b8ed2 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java @@ -2,10 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.util.Locale; import org.junit.jupiter.api.Test; -import org.sagebionetworks.openchallenges.organization.service.model.dto.BasicErrorDto; -import org.sagebionetworks.openchallenges.organization.service.exception.SimpleChallengeGlobalException; import org.springframework.http.HttpStatus; public class SimpleChallengeGlobalExceptionTest { @@ -72,9 +69,7 @@ public void SimpleChallengeGlobalException_ShouldReturnStatus_WhenStatusKeyIsPas public void SimpleChallengeGlobalException_ShouldFunction_WhenCalledUsingNoArgsConstructor() { // Create an instance of SimpleChallengeGlobalException using the no-args constructor - SimpleChallengeGlobalException exception = - new SimpleChallengeGlobalException(); - + SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(); } @Test @@ -86,14 +81,12 @@ public void SimpleChallengeGlobalException_ShouldSetArgs_WhenArgsPassed() { String detail = "Exception detail message"; // Create an instance of SimpleChallengeGlobalException using the no-args constructor - SimpleChallengeGlobalException exception = - new SimpleChallengeGlobalException(); - - //Create args for the exception + SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(); + + // Create args for the exception exception.setType(type); exception.setTitle(title); exception.setStatus(status); exception.setDetail(detail); - } } From 6664e37b082145f5573b5bf8bb62464925864215 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Thu, 9 Nov 2023 22:38:44 +0000 Subject: [PATCH 03/31] update format --- .../service/exception/GlobalExceptionHandlerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java index 12ac70d52f..091ac4a3af 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java @@ -29,7 +29,7 @@ public void HandleException_ShouldReturnStatus_WhenExceptionAndLocalePassed() { } @Test - public void GlobalExceptionHandler_ShouldFunction_WhenCalled() { + public void HandleGlobalException_ShouldFunction_WhenCalled() { // Create a sample Exception // Exception exception = new Exception("An exception occurred"); Locale locale = Locale.getDefault(); From fab86287c5873bc9f5cddefe10677350f7cef9eb Mon Sep 17 00:00:00 2001 From: mdsage1 <122999770+mdsage1@users.noreply.github.com> Date: Fri, 10 Nov 2023 09:10:45 -0800 Subject: [PATCH 04/31] Update apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java Co-authored-by: Thomas Schaffter --- .../service/exception/GlobalExceptionHandlerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java index 091ac4a3af..0d723fff1e 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java @@ -11,7 +11,7 @@ public class GlobalExceptionHandlerTest { @Test - public void HandleException_ShouldReturnStatus_WhenExceptionAndLocalePassed() { + public void GlobalExceptionHandler_ShouldReturnStatus_WhenExceptionAndLocalePassed() { // Create a sample Exception Exception exception = new Exception("An exception occurred"); Locale locale = Locale.getDefault(); From 6e267df097323f4e0877bd8dc014e08a248b00c4 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Fri, 10 Nov 2023 18:50:04 +0000 Subject: [PATCH 05/31] add changes to condense tests --- .../SimpleChallengeGlobalExceptionTest.java | 45 ++----------------- 1 file changed, 3 insertions(+), 42 deletions(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java index 90699b8ed2..ff93d0df64 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java @@ -7,48 +7,6 @@ public class SimpleChallengeGlobalExceptionTest { - @Test - public void SimpleChallengeGlobalException_ShouldReturnMessage_WhenMessageKeyIsPassed() { - // Create an instance of SimpleChallengeGlobalException using the constructor with details - String details = "Something went wrong"; - SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(details); - - // Verify the exception details - assertThat(exception.getMessage()).isEqualTo(details); - } - - @Test - public void SimpleChallengeGlobalException_ShouldReturnType_WhenTypeKeyIsPassed() { - // Define the exception details - String type = "ExceptionType"; - String title = "Exception Title"; - HttpStatus status = HttpStatus.BAD_REQUEST; - String detail = "Exception detail message"; - - // Create an instance of SimpleChallengeGlobalException using the all-args constructor - SimpleChallengeGlobalException exception = - new SimpleChallengeGlobalException(type, title, status, detail); - - // Verify the exception details - assertThat(exception.getType()).isEqualTo(type); - } - - @Test - public void SimpleChallengeGlobalException_ShouldReturnTitle_WhenTitleKeyIsPassed() { - // Define the exception details - String type = "ExceptionType"; - String title = "Exception Title"; - HttpStatus status = HttpStatus.BAD_REQUEST; - String detail = "Exception detail message"; - - // Create an instance of SimpleChallengeGlobalException using the all-args constructor - SimpleChallengeGlobalException exception = - new SimpleChallengeGlobalException(type, title, status, detail); - - // Verify the exception details - assertThat(exception.getTitle()).isEqualTo(title); - } - @Test public void SimpleChallengeGlobalException_ShouldReturnStatus_WhenStatusKeyIsPassed() { // Define the exception details @@ -63,6 +21,9 @@ public void SimpleChallengeGlobalException_ShouldReturnStatus_WhenStatusKeyIsPas // Verify the exception details assertThat(exception.getStatus()).isEqualTo(status); + assertThat(exception.getTitle()).isEqualTo(title); + assertThat(exception.getType()).isEqualTo(type); + assertThat(exception.getMessage()).isEqualTo(details); } @Test From 15f89fde5bde3d4ad4d169b4cffb47c842ac8ee9 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Fri, 10 Nov 2023 18:50:57 +0000 Subject: [PATCH 06/31] fix variable name --- .../service/exception/SimpleChallengeGlobalExceptionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java index ff93d0df64..825014a19a 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java @@ -23,7 +23,7 @@ public void SimpleChallengeGlobalException_ShouldReturnStatus_WhenStatusKeyIsPas assertThat(exception.getStatus()).isEqualTo(status); assertThat(exception.getTitle()).isEqualTo(title); assertThat(exception.getType()).isEqualTo(type); - assertThat(exception.getMessage()).isEqualTo(details); + assertThat(exception.getMessage()).isEqualTo(detail); } @Test From c954c9f1f47ebd22a1025e13f0afe545b615dca5 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Fri, 10 Nov 2023 18:54:28 +0000 Subject: [PATCH 07/31] add back unit test --- .../exception/SimpleChallengeGlobalExceptionTest.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java index 825014a19a..ddf50eff8d 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java @@ -7,6 +7,16 @@ public class SimpleChallengeGlobalExceptionTest { + @Test + public void SimpleChallengeGlobalException_ShouldReturnMessage_WhenMessageKeyIsPassed() { + // Create an instance of SimpleChallengeGlobalException using the constructor with details + String details = "Something went wrong"; + SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(details); + + // Verify the exception details + + } + @Test public void SimpleChallengeGlobalException_ShouldReturnStatus_WhenStatusKeyIsPassed() { // Define the exception details @@ -23,7 +33,6 @@ public void SimpleChallengeGlobalException_ShouldReturnStatus_WhenStatusKeyIsPas assertThat(exception.getStatus()).isEqualTo(status); assertThat(exception.getTitle()).isEqualTo(title); assertThat(exception.getType()).isEqualTo(type); - assertThat(exception.getMessage()).isEqualTo(detail); } @Test From 6130fbf2b2c42d215a379a2ccb29fa5ffa3ff40e Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Fri, 10 Nov 2023 18:55:08 +0000 Subject: [PATCH 08/31] format --- .../service/exception/SimpleChallengeGlobalExceptionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java index ddf50eff8d..ed540d1aa3 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java @@ -14,7 +14,7 @@ public void SimpleChallengeGlobalException_ShouldReturnMessage_WhenMessageKeyIsP SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(details); // Verify the exception details - + } @Test From 1dd4fa817e69227450fed1f8fe1f5a2b4224db0f Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Fri, 10 Nov 2023 21:58:13 +0000 Subject: [PATCH 09/31] condense unit tests --- .../exception/BadRequestExceptionTest.java | 25 ++----------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java index 5cf57c28b9..fabe5d04ca 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java @@ -7,38 +7,17 @@ public class BadRequestExceptionTest { @Test - public void BadRequestException_ShouldReturnType_WhenTypeKeyIsPassed() { + public void BadRequestException_ShouldReturnExceptionConstructors_WhenKeyIsPassed() { // Set up the input detail String detail = "Errordetail"; - // Create an instance of BadRequestException - BadRequestException exception = new BadRequestException(detail); - - // Verify the properties of the exception - assertThat(exception.getType()).isEqualTo(ErrorConstants.BAD_REQUEST.getType()); - } - - @Test - public void BadRequestException_ShouldReturnStatus_WhenStatusKeyIsPassed() { - // Set up the input detail - String detail = "Errordetail"; // Create an instance of BadRequestException BadRequestException exception = new BadRequestException(detail); // Verify the properties of the exception assertThat(exception.getStatus()).isEqualTo(ErrorConstants.BAD_REQUEST.getStatus()); - } - - @Test - public void BadRequestException_ShouldReturnDetail_WhenDetailKeyIsPassed() { - // Set up the input detail - String detail = "Errordetail"; - - // Create an instance of BadRequestException - BadRequestException exception = new BadRequestException(detail); - - // Verify the properties of the exception assertThat(exception.getDetail()).isEqualTo(detail); + assertThat(exception.getType()).isEqualTo(ErrorConstants.BAD_REQUEST.getType()); } } From 0a2d8a80cad31e912645e8bd806b4a033e4be03d Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Fri, 10 Nov 2023 21:58:46 +0000 Subject: [PATCH 10/31] update format --- .../organization/service/exception/BadRequestExceptionTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java index fabe5d04ca..4ec7ed5a89 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java @@ -11,7 +11,6 @@ public void BadRequestException_ShouldReturnExceptionConstructors_WhenKeyIsPasse // Set up the input detail String detail = "Errordetail"; - // Create an instance of BadRequestException BadRequestException exception = new BadRequestException(detail); From 5b24f09e326fa8a413f4d079bfa8eb5be581c482 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Sun, 12 Nov 2023 23:45:43 +0000 Subject: [PATCH 11/31] update tests --- .../service/exception/InvalidOrganizationExceptionTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java index 27c6202d01..4f7d989940 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java @@ -7,7 +7,7 @@ public class InvalidOrganizationExceptionTest { @Test - public void InvalidOrganizationException_ShouldReturnDetail_WhenDetailKeyIsPassed() { + public void InvalidOrganizationException_ShouldReturnExceptionConstructors_WhenKeyIsPassed() { // Set up the input detail String detail = "Errordetail"; @@ -16,5 +16,7 @@ public void InvalidOrganizationException_ShouldReturnDetail_WhenDetailKeyIsPasse // Verify the properties of the exception assertThat(exception.getDetail()).isEqualTo(detail); + assertThat(exception.getType()).isEqualTo(ErrorConstants.BAD_REQUEST.getType()); + assertThat(exception.getStatus()).isEqualTo(ErrorConstants.BAD_REQUEST.getStatus()); } } From e2cd511a912184314eed69537b8406524e4f9193 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Sun, 12 Nov 2023 23:49:18 +0000 Subject: [PATCH 12/31] fix bad request --- .../service/exception/InvalidOrganizationExceptionTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java index 4f7d989940..69a7e45d95 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java @@ -16,7 +16,7 @@ public void InvalidOrganizationException_ShouldReturnExceptionConstructors_WhenK // Verify the properties of the exception assertThat(exception.getDetail()).isEqualTo(detail); - assertThat(exception.getType()).isEqualTo(ErrorConstants.BAD_REQUEST.getType()); - assertThat(exception.getStatus()).isEqualTo(ErrorConstants.BAD_REQUEST.getStatus()); + assertThat(exception.getType()).isEqualTo(ErrorConstants.ENTITY_NOT_FOUND.getType()); + assertThat(exception.getStatus()).isEqualTo(ErrorConstants.ENTITY_NOT_FOUND.getStatus()); } } From dfee1d3080b6b71adc8e2eb352e672c83190a8b8 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Wed, 15 Nov 2023 20:17:12 +0000 Subject: [PATCH 13/31] update test name --- .../service/exception/InvalidOrganizationExceptionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java index 69a7e45d95..547e964053 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java @@ -7,7 +7,7 @@ public class InvalidOrganizationExceptionTest { @Test - public void InvalidOrganizationException_ShouldReturnExceptionConstructors_WhenKeyIsPassed() { + public void InvalidOrganizationException_ShouldReturnExceptionObject_WhenDetailIsPassed() { // Set up the input detail String detail = "Errordetail"; From d2bcde28b1a99949e480331807ce3a3da7ac0bd4 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Wed, 15 Nov 2023 20:35:39 +0000 Subject: [PATCH 14/31] update test name --- .../service/exception/InvalidOrganizationExceptionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java index 547e964053..14d2b59a06 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java @@ -7,7 +7,7 @@ public class InvalidOrganizationExceptionTest { @Test - public void InvalidOrganizationException_ShouldReturnExceptionObject_WhenDetailIsPassed() { + public void InvalidOrganizationException_ShouldReturnExceptionObject_WhenDetailKeyIsPassed() { // Set up the input detail String detail = "Errordetail"; From 8c4315829736fb46e70257e1bc9d2f8b824dece2 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Fri, 17 Nov 2023 22:19:39 +0000 Subject: [PATCH 15/31] update tests --- .../organization/service/exception/BadRequestExceptionTest.java | 1 + .../service/exception/InvalidOrganizationExceptionTest.java | 1 + 2 files changed, 2 insertions(+) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java index 4ec7ed5a89..885d3edddb 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java @@ -18,5 +18,6 @@ public void BadRequestException_ShouldReturnExceptionConstructors_WhenKeyIsPasse assertThat(exception.getStatus()).isEqualTo(ErrorConstants.BAD_REQUEST.getStatus()); assertThat(exception.getDetail()).isEqualTo(detail); assertThat(exception.getType()).isEqualTo(ErrorConstants.BAD_REQUEST.getType()); + assertThat(exception.getTitle()).isEqualTo(ErrorConstants.BAD_REQUEST.getTitle()); } } diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java index 14d2b59a06..f358586181 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/InvalidOrganizationExceptionTest.java @@ -18,5 +18,6 @@ public void InvalidOrganizationException_ShouldReturnExceptionObject_WhenDetailK assertThat(exception.getDetail()).isEqualTo(detail); assertThat(exception.getType()).isEqualTo(ErrorConstants.ENTITY_NOT_FOUND.getType()); assertThat(exception.getStatus()).isEqualTo(ErrorConstants.ENTITY_NOT_FOUND.getStatus()); + assertThat(exception.getTitle()).isEqualTo(ErrorConstants.ENTITY_NOT_FOUND.getTitle()); } } From 4f10231d1ac44aa2d44c10be1e16f057e55cb37e Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Fri, 17 Nov 2023 22:31:29 +0000 Subject: [PATCH 16/31] update test --- .../exception/OrganizationAlreadyExistsExceptionTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/OrganizationAlreadyExistsExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/OrganizationAlreadyExistsExceptionTest.java index 56e11ca0a7..7d6e05e95e 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/OrganizationAlreadyExistsExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/OrganizationAlreadyExistsExceptionTest.java @@ -7,14 +7,14 @@ public class OrganizationAlreadyExistsExceptionTest { @Test - public void OrganizationAlreadyExistsException_ShouldReturnDetail_WhenDetailKeyIsPassed() { + public void OrganizationAlreadyExistsException_ShouldReturnMessage_WhenMessageKeyIsPassed() { // Set up the input detail - String detail = "Errordetail"; + String message = "Errordetail"; // Create an instance of OrganizationAlreadyExistsException - OrganizationAlreadyExistsException exception = new OrganizationAlreadyExistsException(detail); + OrganizationAlreadyExistsException exception = new OrganizationAlreadyExistsException(message); // Verify the properties of the exception - assertThat(exception.getDetail()).isEqualTo(detail); + assertThat(exception.getDetail()).isEqualTo(message); } } From ff358795f564b4ffda4876b7b3bb7b150f3c528b Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Sat, 18 Nov 2023 02:29:17 +0000 Subject: [PATCH 17/31] update unit test --- .../exception/SimpleChallengeGlobalExceptionTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java index ed540d1aa3..2f3512cf1d 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java @@ -10,8 +10,8 @@ public class SimpleChallengeGlobalExceptionTest { @Test public void SimpleChallengeGlobalException_ShouldReturnMessage_WhenMessageKeyIsPassed() { // Create an instance of SimpleChallengeGlobalException using the constructor with details - String details = "Something went wrong"; - SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(details); + String message = "Something went wrong"; + SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(message); // Verify the exception details @@ -40,7 +40,9 @@ public void SimpleChallengeGlobalException_ShouldFunction_WhenCalledUsingNoArgsC // Create an instance of SimpleChallengeGlobalException using the no-args constructor SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(); - } + assertNotNull(exception); + +} @Test public void SimpleChallengeGlobalException_ShouldSetArgs_WhenArgsPassed() { From cf4a474006d516ce45b15f566f7c6698c502e7f3 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Sat, 18 Nov 2023 02:29:49 +0000 Subject: [PATCH 18/31] format update --- .../service/exception/SimpleChallengeGlobalExceptionTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java index 2f3512cf1d..1aec780242 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java @@ -41,8 +41,7 @@ public void SimpleChallengeGlobalException_ShouldFunction_WhenCalledUsingNoArgsC // Create an instance of SimpleChallengeGlobalException using the no-args constructor SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(); assertNotNull(exception); - -} + } @Test public void SimpleChallengeGlobalException_ShouldSetArgs_WhenArgsPassed() { From 885ff673280536f1c8f2cf8addd5e179ce04b257 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Tue, 21 Nov 2023 15:52:33 +0000 Subject: [PATCH 19/31] add changes to unit tests --- .../SimpleChallengeGlobalExceptionTest.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java index 1aec780242..1a6fac5b35 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java @@ -14,11 +14,12 @@ public void SimpleChallengeGlobalException_ShouldReturnMessage_WhenMessageKeyIsP SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(message); // Verify the exception details + assertThat(exception.getMessage()).isEqualTo(message); } @Test - public void SimpleChallengeGlobalException_ShouldReturnStatus_WhenStatusKeyIsPassed() { + public void SimpleChallengeGlobalException_ShouldReturnStatusTypeTitleDetail_WhenArgsPassed() { // Define the exception details String type = "ExceptionType"; String title = "Exception Title"; @@ -33,14 +34,19 @@ public void SimpleChallengeGlobalException_ShouldReturnStatus_WhenStatusKeyIsPas assertThat(exception.getStatus()).isEqualTo(status); assertThat(exception.getTitle()).isEqualTo(title); assertThat(exception.getType()).isEqualTo(type); + assertThat(exception.getDetail()).isEqualTo(detail); } @Test - public void SimpleChallengeGlobalException_ShouldFunction_WhenCalledUsingNoArgsConstructor() { + public void SimpleChallengeGlobalException_ShouldReturnNullArgs_WhenCalledUsingNoArgsConstructor() { // Create an instance of SimpleChallengeGlobalException using the no-args constructor SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(); - assertNotNull(exception); + + assertThat(exception.getTitle()).isEqualTo(null); + assertThat(exception.getType()).isEqualTo(null); + assertThat(exception.getStatus()).isEqualTo(null); + assertThat(exception.getDetail()).isEqualTo(null); } @Test From e0e0f227df9af82884d81053a767dda370879dd4 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Tue, 21 Nov 2023 15:52:49 +0000 Subject: [PATCH 20/31] formatting --- .../service/exception/SimpleChallengeGlobalExceptionTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java index 1a6fac5b35..101e5d9e79 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java @@ -15,7 +15,6 @@ public void SimpleChallengeGlobalException_ShouldReturnMessage_WhenMessageKeyIsP // Verify the exception details assertThat(exception.getMessage()).isEqualTo(message); - } @Test @@ -38,7 +37,8 @@ public void SimpleChallengeGlobalException_ShouldReturnStatusTypeTitleDetail_Whe } @Test - public void SimpleChallengeGlobalException_ShouldReturnNullArgs_WhenCalledUsingNoArgsConstructor() { + public void + SimpleChallengeGlobalException_ShouldReturnNullArgs_WhenCalledUsingNoArgsConstructor() { // Create an instance of SimpleChallengeGlobalException using the no-args constructor SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(); From c1b70e2824d1e9b9f8ed9a5dc4f37602472a7b3b Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Tue, 21 Nov 2023 16:02:04 +0000 Subject: [PATCH 21/31] push changes again --- .../organization/service/exception/BadRequestExceptionTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java index 885d3edddb..b42a505c4e 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java @@ -1,7 +1,6 @@ package org.sagebionetworks.openchallenges.organization.service.exception; import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; public class BadRequestExceptionTest { From ef1fe76986ba7ade25088bb6d691d61dd65084c1 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Tue, 21 Nov 2023 16:02:44 +0000 Subject: [PATCH 22/31] update changes --- .../organization/service/exception/BadRequestExceptionTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java index b42a505c4e..885d3edddb 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/BadRequestExceptionTest.java @@ -1,6 +1,7 @@ package org.sagebionetworks.openchallenges.organization.service.exception; import static org.assertj.core.api.Assertions.assertThat; + import org.junit.jupiter.api.Test; public class BadRequestExceptionTest { From 7b1da9a99c056f055f1da2625a681fbd5f5b1bc2 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Tue, 21 Nov 2023 17:17:07 +0000 Subject: [PATCH 23/31] use .isNull() --- .../exception/SimpleChallengeGlobalExceptionTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java index 101e5d9e79..0a27c44e07 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java @@ -43,10 +43,10 @@ public void SimpleChallengeGlobalException_ShouldReturnStatusTypeTitleDetail_Whe // Create an instance of SimpleChallengeGlobalException using the no-args constructor SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(); - assertThat(exception.getTitle()).isEqualTo(null); - assertThat(exception.getType()).isEqualTo(null); - assertThat(exception.getStatus()).isEqualTo(null); - assertThat(exception.getDetail()).isEqualTo(null); + assertThat(exception.getTitle()).isNull(); + assertThat(exception.getType()).isNull(); + assertThat(exception.getStatus()).isNull(); + assertThat(exception.getDetail()).isNull(); } @Test From c524182ad03b9406305516d21b8ad82216a494be Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Tue, 21 Nov 2023 21:29:21 +0000 Subject: [PATCH 24/31] assert Response Entity for both exception types --- .../exception/GlobalExceptionHandlerTest.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java index 0d723fff1e..18c97e6ef9 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java @@ -11,7 +11,7 @@ public class GlobalExceptionHandlerTest { @Test - public void GlobalExceptionHandler_ShouldReturnStatus_WhenExceptionAndLocalePassed() { + public void GlobalExceptionHandler_ShouldReturnInternalServerErrorStatusCode_WhenExceptionAndLocalePassed() { // Create a sample Exception Exception exception = new Exception("An exception occurred"); Locale locale = Locale.getDefault(); @@ -29,11 +29,11 @@ public void GlobalExceptionHandler_ShouldReturnStatus_WhenExceptionAndLocalePass } @Test - public void HandleGlobalException_ShouldFunction_WhenCalled() { + public void GlobalExceptionHandler_ShouldReturnStatusOfSimpleChallengeGlobalExceptionResponseEntityObject_WhenArgsPassedToSimpleChallengeGlobalException() { + // Create a sample Exception - // Exception exception = new Exception("An exception occurred"); Locale locale = Locale.getDefault(); - // String details = "Something went wrong"; + // Define the exception details String type = "ExceptionType"; String title = "Exception Title"; @@ -50,5 +50,8 @@ public void HandleGlobalException_ShouldFunction_WhenCalled() { // Call handleGlobalException ResponseEntity responseEntity = exceptionHandler.handleGlobalException(exception, locale); + + //confirm that the status code that was set was retrieved and applied to the Response Entity object + assertThat(responseEntity.getStatusCode()).isEqualTo(exception.getStatus()); } -} +} \ No newline at end of file From 218f9a13ce3be39b0224b331d0901fc3183f3756 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Tue, 21 Nov 2023 21:32:32 +0000 Subject: [PATCH 25/31] fix test comments and name --- .../exception/GlobalExceptionHandlerTest.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java index 18c97e6ef9..f53e84f386 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java @@ -11,11 +11,12 @@ public class GlobalExceptionHandlerTest { @Test - public void GlobalExceptionHandler_ShouldReturnInternalServerErrorStatusCode_WhenExceptionAndLocalePassed() { + public void + GlobalExceptionHandler_ShouldReturnInternalServerErrorStatusCode_WhenExceptionAndLocalePassed() { + // Create a sample Exception Exception exception = new Exception("An exception occurred"); Locale locale = Locale.getDefault(); - String details = "Something went wrong"; // Create the GlobalExceptionHandler instance GlobalExceptionHandler exceptionHandler = new GlobalExceptionHandler(); @@ -24,13 +25,14 @@ public void GlobalExceptionHandler_ShouldReturnInternalServerErrorStatusCode_Whe ResponseEntity responseEntity = exceptionHandler.handleException(exception, locale); - // Verify the response + // Verify the Response Entity matches the Internal Server Error Code assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR); } @Test - public void GlobalExceptionHandler_ShouldReturnStatusOfSimpleChallengeGlobalExceptionResponseEntityObject_WhenArgsPassedToSimpleChallengeGlobalException() { - + public void + GlobalExceptionHandler_ShouldReturnStatusCodeOfSimpleChallengeGlobalExceptionResponseEntityObject_WhenArgsPassedToSimpleChallengeGlobalException() { + // Create a sample Exception Locale locale = Locale.getDefault(); @@ -51,7 +53,8 @@ public void GlobalExceptionHandler_ShouldReturnStatusOfSimpleChallengeGlobalExce ResponseEntity responseEntity = exceptionHandler.handleGlobalException(exception, locale); - //confirm that the status code that was set was retrieved and applied to the Response Entity object + // confirm that the status code that was set was retrieved and applied to the Response Entity + // object assertThat(responseEntity.getStatusCode()).isEqualTo(exception.getStatus()); } -} \ No newline at end of file +} From 8b7417c484de5d8f21e00ac35e0bcb1f503f2a18 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Tue, 21 Nov 2023 21:32:56 +0000 Subject: [PATCH 26/31] remove whitespace --- .../service/exception/GlobalExceptionHandlerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java index f53e84f386..7357f98429 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/GlobalExceptionHandlerTest.java @@ -13,7 +13,7 @@ public class GlobalExceptionHandlerTest { @Test public void GlobalExceptionHandler_ShouldReturnInternalServerErrorStatusCode_WhenExceptionAndLocalePassed() { - + // Create a sample Exception Exception exception = new Exception("An exception occurred"); Locale locale = Locale.getDefault(); From 038485cc7a33868fb9e4bbb0d2befcd98ca4bf17 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Tue, 21 Nov 2023 21:40:42 +0000 Subject: [PATCH 27/31] update assertions of the exception --- .../exception/SimpleChallengeGlobalExceptionTest.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java index 0a27c44e07..a75968fcf6 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java @@ -43,6 +43,7 @@ public void SimpleChallengeGlobalException_ShouldReturnStatusTypeTitleDetail_Whe // Create an instance of SimpleChallengeGlobalException using the no-args constructor SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(); + //confirm that not passing args leads to null arguments assertThat(exception.getTitle()).isNull(); assertThat(exception.getType()).isNull(); assertThat(exception.getStatus()).isNull(); @@ -65,5 +66,11 @@ public void SimpleChallengeGlobalException_ShouldSetArgs_WhenArgsPassed() { exception.setTitle(title); exception.setStatus(status); exception.setDetail(detail); + + //confirm that the args were passed + assertThat(exception.getType()).isEqualTo(type); + assertThat(exception.getTitle()).isEqualTo(title); + assertThat(exception.getStatus()).isEqualTo(status); + assertThat(exception.getDetail()).isEqualTo(detail); } } From 15d12f2656c107430f5769c6fdaefce4373070dc Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Tue, 21 Nov 2023 21:41:33 +0000 Subject: [PATCH 28/31] update comments --- .../service/exception/SimpleChallengeGlobalExceptionTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java index a75968fcf6..7e7233cf19 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java @@ -43,7 +43,7 @@ public void SimpleChallengeGlobalException_ShouldReturnStatusTypeTitleDetail_Whe // Create an instance of SimpleChallengeGlobalException using the no-args constructor SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(); - //confirm that not passing args leads to null arguments + // confirm that not passing args leads to null arguments assertThat(exception.getTitle()).isNull(); assertThat(exception.getType()).isNull(); assertThat(exception.getStatus()).isNull(); @@ -67,7 +67,7 @@ public void SimpleChallengeGlobalException_ShouldSetArgs_WhenArgsPassed() { exception.setStatus(status); exception.setDetail(detail); - //confirm that the args were passed + // confirm that the args were passed assertThat(exception.getType()).isEqualTo(type); assertThat(exception.getTitle()).isEqualTo(title); assertThat(exception.getStatus()).isEqualTo(status); From 5e57be80193ef42d4f7ce2bdb821999cbb15dcb9 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Tue, 21 Nov 2023 21:44:10 +0000 Subject: [PATCH 29/31] update test name --- .../service/exception/SimpleChallengeGlobalExceptionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java index 7e7233cf19..ac8f677e4a 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java @@ -51,7 +51,7 @@ public void SimpleChallengeGlobalException_ShouldReturnStatusTypeTitleDetail_Whe } @Test - public void SimpleChallengeGlobalException_ShouldSetArgs_WhenArgsPassed() { + public void SimpleChallengeGlobalException_ShouldSetArgs_WhenNoArgsConstructorExceptionPassedArgsKeys() { // Define the exception details String type = "ExceptionType"; String title = "Exception Title"; From 016bc79bf2bd6589e67a84a56ed0e457444f7d08 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Tue, 21 Nov 2023 21:44:47 +0000 Subject: [PATCH 30/31] fix format --- .../service/exception/SimpleChallengeGlobalExceptionTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java index ac8f677e4a..623c1432d5 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/SimpleChallengeGlobalExceptionTest.java @@ -51,7 +51,8 @@ public void SimpleChallengeGlobalException_ShouldReturnStatusTypeTitleDetail_Whe } @Test - public void SimpleChallengeGlobalException_ShouldSetArgs_WhenNoArgsConstructorExceptionPassedArgsKeys() { + public void + SimpleChallengeGlobalException_ShouldSetArgs_WhenNoArgsConstructorExceptionPassedArgsKeys() { // Define the exception details String type = "ExceptionType"; String title = "Exception Title"; From 0c09ab59bbe3a34ec656bbac2fe37b991eee6a23 Mon Sep 17 00:00:00 2001 From: mdsage1 Date: Wed, 29 Nov 2023 19:05:34 +0000 Subject: [PATCH 31/31] changed message back to detail --- .../exception/OrganizationAlreadyExistsExceptionTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/OrganizationAlreadyExistsExceptionTest.java b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/OrganizationAlreadyExistsExceptionTest.java index 7d6e05e95e..56e11ca0a7 100644 --- a/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/OrganizationAlreadyExistsExceptionTest.java +++ b/apps/openchallenges/organization-service/src/test/java/org/sagebionetworks/openchallenges/organization/service/exception/OrganizationAlreadyExistsExceptionTest.java @@ -7,14 +7,14 @@ public class OrganizationAlreadyExistsExceptionTest { @Test - public void OrganizationAlreadyExistsException_ShouldReturnMessage_WhenMessageKeyIsPassed() { + public void OrganizationAlreadyExistsException_ShouldReturnDetail_WhenDetailKeyIsPassed() { // Set up the input detail - String message = "Errordetail"; + String detail = "Errordetail"; // Create an instance of OrganizationAlreadyExistsException - OrganizationAlreadyExistsException exception = new OrganizationAlreadyExistsException(message); + OrganizationAlreadyExistsException exception = new OrganizationAlreadyExistsException(detail); // Verify the properties of the exception - assertThat(exception.getDetail()).isEqualTo(message); + assertThat(exception.getDetail()).isEqualTo(detail); } }