From cfc3777218bcc32d634ec8b58248fb778d1ad30a Mon Sep 17 00:00:00 2001 From: Jannik Pulfer <pulfer@puzzle.ch> Date: Tue, 28 Jan 2025 16:20:32 +0100 Subject: [PATCH] Fix backend tests --- backend/src/main/java/ch/puzzle/okr/models/Quarter.java | 2 +- .../okr/service/business/OverviewBusinessServiceTest.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/ch/puzzle/okr/models/Quarter.java b/backend/src/main/java/ch/puzzle/okr/models/Quarter.java index 7ffd9fe3d7..5144efaf6e 100644 --- a/backend/src/main/java/ch/puzzle/okr/models/Quarter.java +++ b/backend/src/main/java/ch/puzzle/okr/models/Quarter.java @@ -61,7 +61,7 @@ public void setEndDate(LocalDate endDate) { } public boolean isBacklogQuarter() { - return this.label.equals(BACKLOG_QUARTER_LABEL) && this.startDate == null && this.endDate == null; + return Objects.equals(this.label, BACKLOG_QUARTER_LABEL) && this.startDate == null && this.endDate == null; } @Override diff --git a/backend/src/test/java/ch/puzzle/okr/service/business/OverviewBusinessServiceTest.java b/backend/src/test/java/ch/puzzle/okr/service/business/OverviewBusinessServiceTest.java index 9c38145ffe..d6c726a6c6 100644 --- a/backend/src/test/java/ch/puzzle/okr/service/business/OverviewBusinessServiceTest.java +++ b/backend/src/test/java/ch/puzzle/okr/service/business/OverviewBusinessServiceTest.java @@ -17,6 +17,8 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; + +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -114,6 +116,7 @@ private static List<Overview> createOverviews(AuthorizationUser authorizationUse void shouldReturnListOfOverviewsUsingGetFilteredOverview() { when(overviewPersistenceService.getFilteredOverview(QUARTER_ID, teamIds, "Objective", authorizationUser)) .thenReturn(createOverviews()); + when(quarterBusinessService.getQuarterById(any())).thenReturn(new Quarter()); List<Overview> overviews = overviewBusinessService.getFilteredOverview(QUARTER_ID, teamIds, "Objective", authorizationUser); @@ -135,6 +138,7 @@ void shouldReturnListOfOverviewsWhenQuarterIsNullUsingGetFilteredOverview() { .thenReturn(createOverviews()); when(quarterBusinessService.getCurrentQuarter()) .thenReturn(Quarter.Builder.builder().withId(QUARTER_ID).withLabel("GJ 22/23-Q2").build()); + when(quarterBusinessService.getQuarterById(any())).thenReturn(new Quarter()); List<Overview> overviews = overviewBusinessService.getFilteredOverview(null, teamIds, "", authorizationUser); @@ -200,6 +204,7 @@ void shouldReturnSortedListWithUserTeamsFirstUsingGetFilteredOverview() { AuthorizationUser user = mockAuthorizationUser(defaultUser(13L)); when(overviewPersistenceService.getFilteredOverview(QUARTER_ID, teamIds, null, user)) .thenReturn(createOverviews(user)); + when(quarterBusinessService.getQuarterById(any())).thenReturn(new Quarter()); List<Overview> overviews = overviewBusinessService.getFilteredOverview(QUARTER_ID, teamIds, null, user);