From 6033f38d398a654d0ce13bca00c357e27f4666e3 Mon Sep 17 00:00:00 2001 From: kirisaki_vk Date: Fri, 11 Apr 2025 09:43:43 +0300 Subject: [PATCH 1/6] chore: moved student1 to MockObjects --- .../event/AnnouncementSendInitServiceIT.java | 2 +- .../haapi/endpoint/event/LetterEventIT.java | 2 +- .../StudentsWithOverdueReminderServiceIT.java | 2 +- .../rest/validator/CreateMpbsValidatorIT.java | 8 +- .../CreateStudentWorkFileValidatorIT.java | 10 +- .../school/hei/haapi/integration/AdminIT.java | 4 +- .../hei/haapi/integration/AnnouncementIT.java | 40 ++++---- .../hei/haapi/integration/AttendanceIT.java | 6 +- .../haapi/integration/AwardedCourseIT.java | 6 +- .../hei/haapi/integration/CommentIT.java | 6 +- .../hei/haapi/integration/CourseIT.java | 30 +++--- .../school/hei/haapi/integration/EventIT.java | 54 +++++------ .../school/hei/haapi/integration/ExamIT.java | 40 ++++---- .../school/hei/haapi/integration/FeeIT.java | 46 ++++----- .../hei/haapi/integration/FeeTemplateIT.java | 28 +++--- .../school/hei/haapi/integration/GradeIT.java | 40 ++++---- .../hei/haapi/integration/GroupFlowIT.java | 26 ++--- .../school/hei/haapi/integration/GroupIT.java | 30 +++--- .../hei/haapi/integration/LetterIT.java | 50 +++++----- .../hei/haapi/integration/ManagerIT.java | 20 ++-- .../hei/haapi/integration/MonitorIT.java | 22 ++--- .../integration/MonitoringStudentIT.java | 32 +++---- .../school/hei/haapi/integration/MpbsIT.java | 28 +++--- .../haapi/integration/MpbsVerificationIT.java | 22 ++--- .../hei/haapi/integration/OrganizerIT.java | 30 +++--- .../hei/haapi/integration/PaginationIT.java | 24 ++--- .../hei/haapi/integration/PaymentIT.java | 44 ++++----- .../hei/haapi/integration/PromotionIT.java | 36 +++---- .../hei/haapi/integration/SchoolFileIT.java | 18 ++-- .../hei/haapi/integration/SecurityIT.java | 18 ++-- .../haapi/integration/SpringSecurityIT.java | 6 +- .../hei/haapi/integration/StaffMemberIT.java | 24 ++--- .../hei/haapi/integration/StudentIT.java | 96 +++++-------------- .../hei/haapi/integration/TeacherIT.java | 38 ++++---- .../hei/haapi/integration/UserFileIT.java | 40 ++++---- .../hei/haapi/integration/WorkDocumentIT.java | 22 ++--- .../integration/conf/utils/MockObjects.java | 68 +++++++++++++ .../conf/{ => utils}/TestUtils.java | 91 ++++-------------- .../hei/haapi/service/FeeServiceTest.java | 4 +- .../hei/haapi/service/PaymentServiceTest.java | 23 ++--- ...cholarshipCertificateDataProviderTest.java | 8 +- .../hei/haapi/service/UserServiceTest.java | 14 +-- .../haapi/unit/CheckStudentsStatusTest.java | 20 ++-- .../hei/haapi/unit/utils/DateUtilsTest.java | 4 +- .../unit/validator/FeeValidatorTest.java | 2 +- .../unit/validator/PaymentValidatorTest.java | 2 +- 46 files changed, 577 insertions(+), 609 deletions(-) create mode 100644 src/test/java/school/hei/haapi/integration/conf/utils/MockObjects.java rename src/test/java/school/hei/haapi/integration/conf/{ => utils}/TestUtils.java (94%) diff --git a/src/test/java/school/hei/haapi/endpoint/event/AnnouncementSendInitServiceIT.java b/src/test/java/school/hei/haapi/endpoint/event/AnnouncementSendInitServiceIT.java index 765bd85343..ac03c56c1a 100644 --- a/src/test/java/school/hei/haapi/endpoint/event/AnnouncementSendInitServiceIT.java +++ b/src/test/java/school/hei/haapi/endpoint/event/AnnouncementSendInitServiceIT.java @@ -5,7 +5,7 @@ import static org.mockito.Mockito.verify; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; import static school.hei.haapi.endpoint.rest.model.Scope.GLOBAL; -import static school.hei.haapi.integration.conf.TestUtils.anAvailableRandomPort; +import static school.hei.haapi.integration.conf.utils.TestUtils.anAvailableRandomPort; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/school/hei/haapi/endpoint/event/LetterEventIT.java b/src/test/java/school/hei/haapi/endpoint/event/LetterEventIT.java index 7fa9010f4e..8d31061477 100644 --- a/src/test/java/school/hei/haapi/endpoint/event/LetterEventIT.java +++ b/src/test/java/school/hei/haapi/endpoint/event/LetterEventIT.java @@ -4,7 +4,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; -import static school.hei.haapi.integration.conf.TestUtils.anAvailableRandomPort; +import static school.hei.haapi.integration.conf.utils.TestUtils.anAvailableRandomPort; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/school/hei/haapi/endpoint/event/StudentsWithOverdueReminderServiceIT.java b/src/test/java/school/hei/haapi/endpoint/event/StudentsWithOverdueReminderServiceIT.java index fcb3a53f6a..dc50a27816 100644 --- a/src/test/java/school/hei/haapi/endpoint/event/StudentsWithOverdueReminderServiceIT.java +++ b/src/test/java/school/hei/haapi/endpoint/event/StudentsWithOverdueReminderServiceIT.java @@ -4,7 +4,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; -import static school.hei.haapi.integration.conf.TestUtils.anAvailableRandomPort; +import static school.hei.haapi.integration.conf.utils.TestUtils.anAvailableRandomPort; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/src/test/java/school/hei/haapi/endpoint/rest/validator/CreateMpbsValidatorIT.java b/src/test/java/school/hei/haapi/endpoint/rest/validator/CreateMpbsValidatorIT.java index 66f935f99f..81c34df48d 100644 --- a/src/test/java/school/hei/haapi/endpoint/rest/validator/CreateMpbsValidatorIT.java +++ b/src/test/java/school/hei/haapi/endpoint/rest/validator/CreateMpbsValidatorIT.java @@ -4,10 +4,10 @@ import static org.junit.Assert.assertTrue; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; import static school.hei.haapi.endpoint.rest.model.MobileMoneyType.ORANGE_MONEY; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.anAvailableRandomPort; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.anAvailableRandomPort; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/school/hei/haapi/endpoint/rest/validator/CreateStudentWorkFileValidatorIT.java b/src/test/java/school/hei/haapi/endpoint/rest/validator/CreateStudentWorkFileValidatorIT.java index a5bc6084d5..852008a88e 100644 --- a/src/test/java/school/hei/haapi/endpoint/rest/validator/CreateStudentWorkFileValidatorIT.java +++ b/src/test/java/school/hei/haapi/endpoint/rest/validator/CreateStudentWorkFileValidatorIT.java @@ -4,10 +4,10 @@ import static org.junit.Assert.assertTrue; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; import static school.hei.haapi.endpoint.rest.model.ProfessionalExperienceFileTypeEnum.WORKER_STUDENT; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.anAvailableRandomPort; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.anAvailableRandomPort; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import java.time.Instant; import org.junit.jupiter.api.BeforeEach; @@ -20,7 +20,7 @@ import school.hei.haapi.endpoint.rest.client.ApiClient; import school.hei.haapi.integration.conf.AbstractContextInitializer; import school.hei.haapi.integration.conf.MockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import school.hei.haapi.model.exception.ApiException; @SpringBootTest(webEnvironment = RANDOM_PORT) diff --git a/src/test/java/school/hei/haapi/integration/AdminIT.java b/src/test/java/school/hei/haapi/integration/AdminIT.java index e51caa13f5..b5de529d1c 100644 --- a/src/test/java/school/hei/haapi/integration/AdminIT.java +++ b/src/test/java/school/hei/haapi/integration/AdminIT.java @@ -1,6 +1,6 @@ package school.hei.haapi.integration; -import static school.hei.haapi.integration.conf.TestUtils.*; +import static school.hei.haapi.integration.conf.utils.TestUtils.*; import org.junit.jupiter.api.BeforeEach; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; @@ -8,7 +8,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; import school.hei.haapi.endpoint.rest.client.ApiClient; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import software.amazon.awssdk.services.eventbridge.EventBridgeClient; @Testcontainers diff --git a/src/test/java/school/hei/haapi/integration/AnnouncementIT.java b/src/test/java/school/hei/haapi/integration/AnnouncementIT.java index c8c7fd5e31..e0efb8a1ca 100644 --- a/src/test/java/school/hei/haapi/integration/AnnouncementIT.java +++ b/src/test/java/school/hei/haapi/integration/AnnouncementIT.java @@ -7,25 +7,25 @@ import static school.hei.haapi.endpoint.rest.model.ReactionEnum.UNCHECK; import static school.hei.haapi.endpoint.rest.model.Scope.TEACHER; import static school.hei.haapi.integration.ManagerIT.manager1; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.ADMIN1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.ANNOUNCEMENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.ANNOUNCEMENT2_ID; -import static school.hei.haapi.integration.conf.TestUtils.ANNOUNCEMENT3_ID; -import static school.hei.haapi.integration.conf.TestUtils.ANNOUNCEMENT4_ID; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.MONITOR1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.announcementEspeciallyForG1; -import static school.hei.haapi.integration.conf.TestUtils.announcementForAll; -import static school.hei.haapi.integration.conf.TestUtils.announcementForManager; -import static school.hei.haapi.integration.conf.TestUtils.announcementForTeacher; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.createAnnouncementWithGroupTarget; -import static school.hei.haapi.integration.conf.TestUtils.expectedAnnouncementCreated1; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.ADMIN1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.ANNOUNCEMENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.ANNOUNCEMENT2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.ANNOUNCEMENT3_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.ANNOUNCEMENT4_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.MONITOR1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.announcementEspeciallyForG1; +import static school.hei.haapi.integration.conf.utils.TestUtils.announcementForAll; +import static school.hei.haapi.integration.conf.utils.TestUtils.announcementForManager; +import static school.hei.haapi.integration.conf.utils.TestUtils.announcementForTeacher; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.createAnnouncementWithGroupTarget; +import static school.hei.haapi.integration.conf.utils.TestUtils.expectedAnnouncementCreated1; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import java.time.Instant; import java.util.List; @@ -41,7 +41,7 @@ import school.hei.haapi.endpoint.rest.model.Announcement; import school.hei.haapi.endpoint.rest.model.ReactToAnnouncementRequest; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; @Testcontainers @AutoConfigureMockMvc diff --git a/src/test/java/school/hei/haapi/integration/AttendanceIT.java b/src/test/java/school/hei/haapi/integration/AttendanceIT.java index 5322edc72b..37e878d9f3 100644 --- a/src/test/java/school/hei/haapi/integration/AttendanceIT.java +++ b/src/test/java/school/hei/haapi/integration/AttendanceIT.java @@ -5,9 +5,9 @@ import static school.hei.haapi.endpoint.rest.model.AttendanceStatus.UNCHECKED; import static school.hei.haapi.endpoint.rest.model.EventType.COURSE; import static school.hei.haapi.integration.StudentIT.*; -import static school.hei.haapi.integration.StudentIT.student1; import static school.hei.haapi.integration.StudentIT.student2; -import static school.hei.haapi.integration.conf.TestUtils.*; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.*; import static school.hei.haapi.model.User.Status.ENABLED; import java.time.Instant; @@ -24,7 +24,7 @@ import school.hei.haapi.endpoint.rest.client.ApiException; import school.hei.haapi.endpoint.rest.model.*; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import school.hei.haapi.model.User; import school.hei.haapi.repository.UserRepository; import school.hei.haapi.service.UserService; diff --git a/src/test/java/school/hei/haapi/integration/AwardedCourseIT.java b/src/test/java/school/hei/haapi/integration/AwardedCourseIT.java index 9b46d28845..44df6de06a 100644 --- a/src/test/java/school/hei/haapi/integration/AwardedCourseIT.java +++ b/src/test/java/school/hei/haapi/integration/AwardedCourseIT.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.*; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.*; import java.util.List; import org.junit.jupiter.api.BeforeEach; @@ -15,7 +15,7 @@ import school.hei.haapi.endpoint.rest.client.ApiException; import school.hei.haapi.endpoint.rest.model.AwardedCourse; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; @Testcontainers @AutoConfigureMockMvc diff --git a/src/test/java/school/hei/haapi/integration/CommentIT.java b/src/test/java/school/hei/haapi/integration/CommentIT.java index 1bb3f1faf4..91e32fb52e 100644 --- a/src/test/java/school/hei/haapi/integration/CommentIT.java +++ b/src/test/java/school/hei/haapi/integration/CommentIT.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static school.hei.haapi.endpoint.rest.model.OrderDirection.ASC; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.*; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.*; import java.util.List; import org.junit.jupiter.api.BeforeEach; @@ -16,7 +16,7 @@ import school.hei.haapi.endpoint.rest.client.ApiException; import school.hei.haapi.endpoint.rest.model.Comment; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; @Testcontainers @AutoConfigureMockMvc diff --git a/src/test/java/school/hei/haapi/integration/CourseIT.java b/src/test/java/school/hei/haapi/integration/CourseIT.java index 3f2f2a54fd..cf94d1d565 100644 --- a/src/test/java/school/hei/haapi/integration/CourseIT.java +++ b/src/test/java/school/hei/haapi/integration/CourseIT.java @@ -2,20 +2,20 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.COURSE1_ID; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsApiException; -import static school.hei.haapi.integration.conf.TestUtils.course1; -import static school.hei.haapi.integration.conf.TestUtils.course2; -import static school.hei.haapi.integration.conf.TestUtils.course3; -import static school.hei.haapi.integration.conf.TestUtils.createCourse; -import static school.hei.haapi.integration.conf.TestUtils.isBefore; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; -import static school.hei.haapi.integration.conf.TestUtils.someCreatableCourseList; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.COURSE1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsApiException; +import static school.hei.haapi.integration.conf.utils.TestUtils.course1; +import static school.hei.haapi.integration.conf.utils.TestUtils.course2; +import static school.hei.haapi.integration.conf.utils.TestUtils.course3; +import static school.hei.haapi.integration.conf.utils.TestUtils.createCourse; +import static school.hei.haapi.integration.conf.utils.TestUtils.isBefore; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.TestUtils.someCreatableCourseList; import java.util.List; import org.junit.jupiter.api.BeforeEach; @@ -29,7 +29,7 @@ import school.hei.haapi.endpoint.rest.model.Course; import school.hei.haapi.endpoint.rest.model.CourseDirection; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; @Testcontainers @AutoConfigureMockMvc diff --git a/src/test/java/school/hei/haapi/integration/EventIT.java b/src/test/java/school/hei/haapi/integration/EventIT.java index 06598f95bd..3563dfffb5 100644 --- a/src/test/java/school/hei/haapi/integration/EventIT.java +++ b/src/test/java/school/hei/haapi/integration/EventIT.java @@ -14,33 +14,33 @@ import static school.hei.haapi.endpoint.rest.model.FrequencyScopeDay.FRIDAY; import static school.hei.haapi.endpoint.rest.model.FrequencyScopeDay.MONDAY; import static school.hei.haapi.endpoint.rest.model.FrequencyScopeDay.WEDNESDAY; -import static school.hei.haapi.integration.StudentIT.student1; import static school.hei.haapi.integration.StudentIT.student2; -import static school.hei.haapi.integration.conf.TestUtils.ADMIN1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.EVENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.EVENT2_ID; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsApiException; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.createEventCourse1; -import static school.hei.haapi.integration.conf.TestUtils.createIntegrationEvent; -import static school.hei.haapi.integration.conf.TestUtils.event1; -import static school.hei.haapi.integration.conf.TestUtils.event2; -import static school.hei.haapi.integration.conf.TestUtils.event3; -import static school.hei.haapi.integration.conf.TestUtils.expectedCourseEventCreated; -import static school.hei.haapi.integration.conf.TestUtils.expectedIntegrationEventCreated; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; -import static school.hei.haapi.integration.conf.TestUtils.someCreatableEvent; -import static school.hei.haapi.integration.conf.TestUtils.someCreatableEventByManager1; -import static school.hei.haapi.integration.conf.TestUtils.student1AttendEvent2; -import static school.hei.haapi.integration.conf.TestUtils.student1MissEvent1; -import static school.hei.haapi.integration.conf.TestUtils.student2AttendEvent2; -import static school.hei.haapi.integration.conf.TestUtils.student3AttendEvent1; -import static school.hei.haapi.integration.conf.TestUtils.student3MissEvent2; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.ADMIN1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.EVENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.EVENT2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsApiException; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.createEventCourse1; +import static school.hei.haapi.integration.conf.utils.TestUtils.createIntegrationEvent; +import static school.hei.haapi.integration.conf.utils.TestUtils.event1; +import static school.hei.haapi.integration.conf.utils.TestUtils.event2; +import static school.hei.haapi.integration.conf.utils.TestUtils.event3; +import static school.hei.haapi.integration.conf.utils.TestUtils.expectedCourseEventCreated; +import static school.hei.haapi.integration.conf.utils.TestUtils.expectedIntegrationEventCreated; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.TestUtils.someCreatableEvent; +import static school.hei.haapi.integration.conf.utils.TestUtils.someCreatableEventByManager1; +import static school.hei.haapi.integration.conf.utils.TestUtils.student1AttendEvent2; +import static school.hei.haapi.integration.conf.utils.TestUtils.student1MissEvent1; +import static school.hei.haapi.integration.conf.utils.TestUtils.student2AttendEvent2; +import static school.hei.haapi.integration.conf.utils.TestUtils.student3AttendEvent1; +import static school.hei.haapi.integration.conf.utils.TestUtils.student3MissEvent2; import java.time.Duration; import java.time.Instant; @@ -61,7 +61,7 @@ import school.hei.haapi.endpoint.rest.model.EventStats; import school.hei.haapi.endpoint.rest.model.UpdateEventParticipant; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; @Slf4j @Testcontainers diff --git a/src/test/java/school/hei/haapi/integration/ExamIT.java b/src/test/java/school/hei/haapi/integration/ExamIT.java index f23474d3aa..1d8a794073 100644 --- a/src/test/java/school/hei/haapi/integration/ExamIT.java +++ b/src/test/java/school/hei/haapi/integration/ExamIT.java @@ -3,25 +3,25 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.AWARDED_COURSE1_ID; -import static school.hei.haapi.integration.conf.TestUtils.EXAM1_ID; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsApiException; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.createExam; -import static school.hei.haapi.integration.conf.TestUtils.createExam1; -import static school.hei.haapi.integration.conf.TestUtils.exam1; -import static school.hei.haapi.integration.conf.TestUtils.exam2; -import static school.hei.haapi.integration.conf.TestUtils.exam3; -import static school.hei.haapi.integration.conf.TestUtils.exam4; -import static school.hei.haapi.integration.conf.TestUtils.exam5; -import static school.hei.haapi.integration.conf.TestUtils.group1; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; -import static school.hei.haapi.integration.conf.TestUtils.studentGrade1; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.AWARDED_COURSE1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.EXAM1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsApiException; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.createExam; +import static school.hei.haapi.integration.conf.utils.TestUtils.createExam1; +import static school.hei.haapi.integration.conf.utils.TestUtils.exam1; +import static school.hei.haapi.integration.conf.utils.TestUtils.exam2; +import static school.hei.haapi.integration.conf.utils.TestUtils.exam3; +import static school.hei.haapi.integration.conf.utils.TestUtils.exam4; +import static school.hei.haapi.integration.conf.utils.TestUtils.exam5; +import static school.hei.haapi.integration.conf.utils.TestUtils.group1; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.TestUtils.studentGrade1; import java.time.Instant; import java.util.List; @@ -36,7 +36,7 @@ import school.hei.haapi.endpoint.rest.model.ExamInfo; import school.hei.haapi.endpoint.rest.model.StudentGrade; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; @Testcontainers @AutoConfigureMockMvc diff --git a/src/test/java/school/hei/haapi/integration/FeeIT.java b/src/test/java/school/hei/haapi/integration/FeeIT.java index f66ae8b5b7..a870710709 100644 --- a/src/test/java/school/hei/haapi/integration/FeeIT.java +++ b/src/test/java/school/hei/haapi/integration/FeeIT.java @@ -15,28 +15,28 @@ import static school.hei.haapi.endpoint.rest.model.FeeTypeEnum.HARDWARE; import static school.hei.haapi.endpoint.rest.model.FeeTypeEnum.REMEDIAL_COSTS; import static school.hei.haapi.endpoint.rest.model.FeeTypeEnum.TUITION; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.FEE1_ID; -import static school.hei.haapi.integration.conf.TestUtils.FEE2_ID; -import static school.hei.haapi.integration.conf.TestUtils.FEE3_ID; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.MONITOR1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT2_ID; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsApiException; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.creatableFee1; -import static school.hei.haapi.integration.conf.TestUtils.creatableStudentFee; -import static school.hei.haapi.integration.conf.TestUtils.createFeeForTest; -import static school.hei.haapi.integration.conf.TestUtils.fee1; -import static school.hei.haapi.integration.conf.TestUtils.fee2; -import static school.hei.haapi.integration.conf.TestUtils.fee3; -import static school.hei.haapi.integration.conf.TestUtils.fee4; -import static school.hei.haapi.integration.conf.TestUtils.requestFile; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE3_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.MONITOR1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsApiException; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.creatableFee1; +import static school.hei.haapi.integration.conf.utils.TestUtils.creatableStudentFee; +import static school.hei.haapi.integration.conf.utils.TestUtils.createFeeForTest; +import static school.hei.haapi.integration.conf.utils.TestUtils.fee1; +import static school.hei.haapi.integration.conf.utils.TestUtils.fee2; +import static school.hei.haapi.integration.conf.utils.TestUtils.fee3; +import static school.hei.haapi.integration.conf.utils.TestUtils.fee4; +import static school.hei.haapi.integration.conf.utils.TestUtils.requestFile; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import jakarta.persistence.EntityManager; import jakarta.persistence.Query; @@ -65,7 +65,7 @@ import school.hei.haapi.endpoint.rest.model.FeesStatistics; import school.hei.haapi.endpoint.rest.model.FeesWithStats; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import school.hei.haapi.repository.FeeRepository; import school.hei.haapi.repository.dao.FeeDao; import school.hei.haapi.service.event.AdvancedFeeStatsComputationTriggeredService; diff --git a/src/test/java/school/hei/haapi/integration/FeeTemplateIT.java b/src/test/java/school/hei/haapi/integration/FeeTemplateIT.java index 1e4e64f17c..b438464cb5 100644 --- a/src/test/java/school/hei/haapi/integration/FeeTemplateIT.java +++ b/src/test/java/school/hei/haapi/integration/FeeTemplateIT.java @@ -2,19 +2,19 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.FEE_TEMPLATE1_ID; -import static school.hei.haapi.integration.conf.TestUtils.FEE_TEMPLATE1_NAME; -import static school.hei.haapi.integration.conf.TestUtils.FEE_TEMPLATE2_ID; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.createFeeTemplate2; -import static school.hei.haapi.integration.conf.TestUtils.feeTemplate1; -import static school.hei.haapi.integration.conf.TestUtils.feeTemplate2; -import static school.hei.haapi.integration.conf.TestUtils.feeTemplate3; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; -import static school.hei.haapi.integration.conf.TestUtils.updateFeeTemplate1; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE_TEMPLATE1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE_TEMPLATE1_NAME; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE_TEMPLATE2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.createFeeTemplate2; +import static school.hei.haapi.integration.conf.utils.TestUtils.feeTemplate1; +import static school.hei.haapi.integration.conf.utils.TestUtils.feeTemplate2; +import static school.hei.haapi.integration.conf.utils.TestUtils.feeTemplate3; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.TestUtils.updateFeeTemplate1; import java.util.List; import org.junit.jupiter.api.BeforeEach; @@ -26,7 +26,7 @@ import school.hei.haapi.endpoint.rest.client.ApiException; import school.hei.haapi.endpoint.rest.model.FeeTemplate; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; @Testcontainers @AutoConfigureMockMvc diff --git a/src/test/java/school/hei/haapi/integration/GradeIT.java b/src/test/java/school/hei/haapi/integration/GradeIT.java index 4a8fb1aa0c..8d97231440 100644 --- a/src/test/java/school/hei/haapi/integration/GradeIT.java +++ b/src/test/java/school/hei/haapi/integration/GradeIT.java @@ -5,25 +5,25 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.EXAM1_ID; -import static school.hei.haapi.integration.conf.TestUtils.EXAM2_ID; -import static school.hei.haapi.integration.conf.TestUtils.GROUP1_ID; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT2_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT3_ID; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.awardedCourseExam1; -import static school.hei.haapi.integration.conf.TestUtils.awardedCourseExam2; -import static school.hei.haapi.integration.conf.TestUtils.awardedCourseExam4; -import static school.hei.haapi.integration.conf.TestUtils.exam1; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; -import static school.hei.haapi.integration.conf.TestUtils.studentGrade1; -import static school.hei.haapi.integration.conf.TestUtils.studentGrade7; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.EXAM1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.EXAM2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.GROUP1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT3_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.awardedCourseExam1; +import static school.hei.haapi.integration.conf.utils.TestUtils.awardedCourseExam2; +import static school.hei.haapi.integration.conf.utils.TestUtils.awardedCourseExam4; +import static school.hei.haapi.integration.conf.utils.TestUtils.exam1; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.TestUtils.studentGrade1; +import static school.hei.haapi.integration.conf.utils.TestUtils.studentGrade7; import static school.hei.haapi.model.User.Status.ENABLED; import java.util.List; @@ -43,7 +43,7 @@ import school.hei.haapi.endpoint.rest.model.StudentGrade; import school.hei.haapi.endpoint.rest.model.UpdateGrade; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import school.hei.haapi.model.User; import school.hei.haapi.repository.UserRepository; import school.hei.haapi.service.UserService; diff --git a/src/test/java/school/hei/haapi/integration/GroupFlowIT.java b/src/test/java/school/hei/haapi/integration/GroupFlowIT.java index c79662caf4..67a00e9466 100644 --- a/src/test/java/school/hei/haapi/integration/GroupFlowIT.java +++ b/src/test/java/school/hei/haapi/integration/GroupFlowIT.java @@ -5,19 +5,19 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static school.hei.haapi.endpoint.rest.model.CreateGroupFlow.MoveTypeEnum.JOIN; import static school.hei.haapi.endpoint.rest.model.CreateGroupFlow.MoveTypeEnum.LEAVE; -import static school.hei.haapi.integration.StudentIT.student1; import static school.hei.haapi.integration.StudentIT.student2; -import static school.hei.haapi.integration.conf.TestUtils.GROUP1_ID; -import static school.hei.haapi.integration.conf.TestUtils.GROUP2_ID; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT2_ID; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsApiException; -import static school.hei.haapi.integration.conf.TestUtils.group1; -import static school.hei.haapi.integration.conf.TestUtils.group2; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.GROUP1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.GROUP2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsApiException; +import static school.hei.haapi.integration.conf.utils.TestUtils.group1; +import static school.hei.haapi.integration.conf.utils.TestUtils.group2; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import java.util.List; import org.junit.jupiter.api.BeforeEach; @@ -31,7 +31,7 @@ import school.hei.haapi.endpoint.rest.model.CreateGroupFlow; import school.hei.haapi.endpoint.rest.model.Student; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import software.amazon.awssdk.services.eventbridge.EventBridgeClient; @Testcontainers diff --git a/src/test/java/school/hei/haapi/integration/GroupIT.java b/src/test/java/school/hei/haapi/integration/GroupIT.java index ec38f16052..850163d818 100644 --- a/src/test/java/school/hei/haapi/integration/GroupIT.java +++ b/src/test/java/school/hei/haapi/integration/GroupIT.java @@ -5,20 +5,20 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.BAD_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.GROUP1_ID; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT2_ID; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.group3; -import static school.hei.haapi.integration.conf.TestUtils.group5; -import static school.hei.haapi.integration.conf.TestUtils.isValidUUID; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.BAD_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.GROUP1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.group3; +import static school.hei.haapi.integration.conf.utils.TestUtils.group5; +import static school.hei.haapi.integration.conf.utils.TestUtils.isValidUUID; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import java.time.Instant; import java.util.ArrayList; @@ -34,7 +34,7 @@ import school.hei.haapi.endpoint.rest.model.Group; import school.hei.haapi.endpoint.rest.model.Student; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; @Testcontainers @AutoConfigureMockMvc diff --git a/src/test/java/school/hei/haapi/integration/LetterIT.java b/src/test/java/school/hei/haapi/integration/LetterIT.java index 5805a362e4..e1fcbced50 100644 --- a/src/test/java/school/hei/haapi/integration/LetterIT.java +++ b/src/test/java/school/hei/haapi/integration/LetterIT.java @@ -10,30 +10,30 @@ import static school.hei.haapi.endpoint.rest.model.LetterStatus.PENDING; import static school.hei.haapi.endpoint.rest.model.LetterStatus.RECEIVED; import static school.hei.haapi.endpoint.rest.model.LetterStatus.REJECTED; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.ADMIN1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.EVENT2_ID; -import static school.hei.haapi.integration.conf.TestUtils.EVENT_PARTICIPANT5_ID; -import static school.hei.haapi.integration.conf.TestUtils.LETTER1_ID; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STAFF_MEMBER1_ID; -import static school.hei.haapi.integration.conf.TestUtils.STAFF_MEMBER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT2_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT3_ID; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_ID; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.getMockedFile; -import static school.hei.haapi.integration.conf.TestUtils.letter1; -import static school.hei.haapi.integration.conf.TestUtils.letter2; -import static school.hei.haapi.integration.conf.TestUtils.letter3; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; -import static school.hei.haapi.integration.conf.TestUtils.teacherLetter; -import static school.hei.haapi.integration.conf.TestUtils.uploadLetter; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.ADMIN1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.EVENT2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.EVENT_PARTICIPANT5_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.LETTER1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STAFF_MEMBER1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STAFF_MEMBER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT3_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.getMockedFile; +import static school.hei.haapi.integration.conf.utils.TestUtils.letter1; +import static school.hei.haapi.integration.conf.utils.TestUtils.letter2; +import static school.hei.haapi.integration.conf.utils.TestUtils.letter3; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.TestUtils.teacherLetter; +import static school.hei.haapi.integration.conf.utils.TestUtils.uploadLetter; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; @@ -60,7 +60,7 @@ import school.hei.haapi.endpoint.rest.model.LetterStats; import school.hei.haapi.endpoint.rest.model.UpdateLettersStatus; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import software.amazon.awssdk.services.eventbridge.EventBridgeClient; @Testcontainers diff --git a/src/test/java/school/hei/haapi/integration/ManagerIT.java b/src/test/java/school/hei/haapi/integration/ManagerIT.java index c7541a9f64..2e8b70c773 100644 --- a/src/test/java/school/hei/haapi/integration/ManagerIT.java +++ b/src/test/java/school/hei/haapi/integration/ManagerIT.java @@ -2,15 +2,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static school.hei.haapi.endpoint.rest.model.EnableStatus.ENABLED; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.coordinatesWithValues; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; -import static school.hei.haapi.integration.conf.TestUtils.uploadProfilePicture; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.coordinatesWithValues; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.TestUtils.uploadProfilePicture; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; @@ -33,7 +33,7 @@ import school.hei.haapi.endpoint.rest.model.Manager; import school.hei.haapi.endpoint.rest.model.Sex; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; @Testcontainers @AutoConfigureMockMvc diff --git a/src/test/java/school/hei/haapi/integration/MonitorIT.java b/src/test/java/school/hei/haapi/integration/MonitorIT.java index ed43447fd5..a857448b93 100644 --- a/src/test/java/school/hei/haapi/integration/MonitorIT.java +++ b/src/test/java/school/hei/haapi/integration/MonitorIT.java @@ -4,16 +4,16 @@ import static school.hei.haapi.endpoint.rest.model.EnableStatus.ENABLED; import static school.hei.haapi.endpoint.rest.model.Sex.F; import static school.hei.haapi.endpoint.rest.model.Sex.M; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.MONITOR1_ID; -import static school.hei.haapi.integration.conf.TestUtils.MONITOR1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.coordinatesWithNullValues; -import static school.hei.haapi.integration.conf.TestUtils.coordinatesWithValues; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.MONITOR1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MONITOR1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.coordinatesWithNullValues; +import static school.hei.haapi.integration.conf.utils.TestUtils.coordinatesWithValues; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; import java.time.Instant; import java.time.LocalDate; @@ -31,7 +31,7 @@ import school.hei.haapi.endpoint.rest.model.Monitor; import school.hei.haapi.endpoint.rest.model.Sex; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import software.amazon.awssdk.services.eventbridge.EventBridgeClient; @Testcontainers diff --git a/src/test/java/school/hei/haapi/integration/MonitoringStudentIT.java b/src/test/java/school/hei/haapi/integration/MonitoringStudentIT.java index 5832a5e4bc..412460fc17 100644 --- a/src/test/java/school/hei/haapi/integration/MonitoringStudentIT.java +++ b/src/test/java/school/hei/haapi/integration/MonitoringStudentIT.java @@ -3,21 +3,21 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.MONITOR1_ID; -import static school.hei.haapi.integration.conf.TestUtils.MONITOR2_ID; -import static school.hei.haapi.integration.conf.TestUtils.MONITOR2_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT2_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT3_ID; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.monitor1Link; -import static school.hei.haapi.integration.conf.TestUtils.monitor2Link; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; -import static school.hei.haapi.integration.conf.TestUtils.student1; -import static school.hei.haapi.integration.conf.TestUtils.student2; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.MockObjects.student2; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.MONITOR1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MONITOR2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MONITOR2_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT3_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.monitor1Link; +import static school.hei.haapi.integration.conf.utils.TestUtils.monitor2Link; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; import java.util.List; import org.junit.jupiter.api.BeforeEach; @@ -34,7 +34,7 @@ import school.hei.haapi.endpoint.rest.model.Fee; import school.hei.haapi.endpoint.rest.model.Student; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import software.amazon.awssdk.services.eventbridge.EventBridgeClient; @Testcontainers diff --git a/src/test/java/school/hei/haapi/integration/MpbsIT.java b/src/test/java/school/hei/haapi/integration/MpbsIT.java index 421361ad87..e3831eb189 100644 --- a/src/test/java/school/hei/haapi/integration/MpbsIT.java +++ b/src/test/java/school/hei/haapi/integration/MpbsIT.java @@ -9,19 +9,19 @@ import static school.hei.haapi.endpoint.rest.model.MobileMoneyType.ORANGE_MONEY; import static school.hei.haapi.endpoint.rest.model.MpbsStatus.PENDING; import static school.hei.haapi.endpoint.rest.model.MpbsStatus.SUCCESS; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.FEE1_ID; -import static school.hei.haapi.integration.conf.TestUtils.FEE2_ID; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.MONITOR1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT2_ID; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.getMockedFile; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.MONITOR1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.getMockedFile; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import static software.amazon.awssdk.core.internal.util.ChunkContentUtils.CRLF; import com.fasterxml.jackson.core.type.TypeReference; @@ -61,7 +61,7 @@ import school.hei.haapi.endpoint.rest.model.FeeStatusEnum; import school.hei.haapi.endpoint.rest.model.Mpbs; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import school.hei.haapi.service.MpbsVerificationService; import software.amazon.awssdk.services.eventbridge.EventBridgeClient; diff --git a/src/test/java/school/hei/haapi/integration/MpbsVerificationIT.java b/src/test/java/school/hei/haapi/integration/MpbsVerificationIT.java index badbc77d70..61d64d0569 100644 --- a/src/test/java/school/hei/haapi/integration/MpbsVerificationIT.java +++ b/src/test/java/school/hei/haapi/integration/MpbsVerificationIT.java @@ -8,16 +8,16 @@ import static school.hei.haapi.endpoint.rest.model.MobileMoneyType.AIRTEL_MONEY; import static school.hei.haapi.endpoint.rest.model.MobileMoneyType.MVOLA; import static school.hei.haapi.endpoint.rest.model.MobileMoneyType.ORANGE_MONEY; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.FEE1_ID; -import static school.hei.haapi.integration.conf.TestUtils.FEE2_ID; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT2_ID; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import java.time.Instant; import java.util.List; @@ -31,7 +31,7 @@ import school.hei.haapi.endpoint.rest.model.MpbsVerification; import school.hei.haapi.http.model.TransactionDetails; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import school.hei.haapi.model.exception.ApiException; import school.hei.haapi.service.mobileMoney.MobileMoneyApi; diff --git a/src/test/java/school/hei/haapi/integration/OrganizerIT.java b/src/test/java/school/hei/haapi/integration/OrganizerIT.java index 5bec10fe4d..e989d7680a 100644 --- a/src/test/java/school/hei/haapi/integration/OrganizerIT.java +++ b/src/test/java/school/hei/haapi/integration/OrganizerIT.java @@ -7,20 +7,20 @@ import static school.hei.haapi.endpoint.rest.model.EnableStatus.ENABLED; import static school.hei.haapi.endpoint.rest.model.Sex.F; import static school.hei.haapi.endpoint.rest.model.Sex.M; -import static school.hei.haapi.integration.conf.TestUtils.ADMIN1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.EVENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.ORGANIZER1_ID; -import static school.hei.haapi.integration.conf.TestUtils.ORGANIZER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.ORGANIZER2_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_ID; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; -import static school.hei.haapi.integration.conf.TestUtils.someCreatableEvent; -import static school.hei.haapi.integration.conf.TestUtils.student1MissEvent1; -import static school.hei.haapi.integration.conf.TestUtils.student3AttendEvent1; -import static school.hei.haapi.integration.conf.TestUtils.uploadProfilePicture; +import static school.hei.haapi.integration.conf.utils.TestUtils.ADMIN1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.EVENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.ORGANIZER1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.ORGANIZER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.ORGANIZER2_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.someCreatableEvent; +import static school.hei.haapi.integration.conf.utils.TestUtils.student1MissEvent1; +import static school.hei.haapi.integration.conf.utils.TestUtils.student3AttendEvent1; +import static school.hei.haapi.integration.conf.utils.TestUtils.uploadProfilePicture; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; @@ -47,7 +47,7 @@ import school.hei.haapi.endpoint.rest.model.EventType; import school.hei.haapi.endpoint.rest.model.Organizer; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import software.amazon.awssdk.services.eventbridge.EventBridgeClient; @Slf4j diff --git a/src/test/java/school/hei/haapi/integration/PaginationIT.java b/src/test/java/school/hei/haapi/integration/PaginationIT.java index 161c71e93b..a9171066f4 100644 --- a/src/test/java/school/hei/haapi/integration/PaginationIT.java +++ b/src/test/java/school/hei/haapi/integration/PaginationIT.java @@ -3,17 +3,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static school.hei.haapi.integration.ManagerIT.manager1; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.FEE1_ID; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsApiException; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; -import static school.hei.haapi.integration.conf.TestUtils.teacher1; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsApiException; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.TestUtils.teacher1; import java.time.Instant; import java.util.ArrayList; @@ -32,7 +32,7 @@ import school.hei.haapi.endpoint.rest.model.Payment; import school.hei.haapi.endpoint.rest.model.Student; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import software.amazon.awssdk.services.eventbridge.EventBridgeClient; @Testcontainers diff --git a/src/test/java/school/hei/haapi/integration/PaymentIT.java b/src/test/java/school/hei/haapi/integration/PaymentIT.java index 598c06b630..410049b8d8 100644 --- a/src/test/java/school/hei/haapi/integration/PaymentIT.java +++ b/src/test/java/school/hei/haapi/integration/PaymentIT.java @@ -9,27 +9,27 @@ import static school.hei.haapi.endpoint.rest.model.EnableStatus.SUSPENDED; import static school.hei.haapi.endpoint.rest.model.FeeStatusEnum.PAID; import static school.hei.haapi.integration.StudentIT.someCreatableStudent; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.FEE1_ID; -import static school.hei.haapi.integration.conf.TestUtils.FEE3_ID; -import static school.hei.haapi.integration.conf.TestUtils.FEE4_ID; -import static school.hei.haapi.integration.conf.TestUtils.FEE5_ID; -import static school.hei.haapi.integration.conf.TestUtils.FEE6_ID; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.MONITOR1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.PAYMENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.PAYMENT2_ID; -import static school.hei.haapi.integration.conf.TestUtils.PAYMENT4_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT2_ID; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsApiException; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.creatableFee1; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE3_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE4_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE5_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE6_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.MONITOR1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.PAYMENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.PAYMENT2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.PAYMENT4_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsApiException; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.creatableFee1; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import static school.hei.haapi.model.exception.ApiException.ExceptionType.SERVER_EXCEPTION; import jakarta.persistence.EntityManager; @@ -53,7 +53,7 @@ import school.hei.haapi.endpoint.rest.model.Payment; import school.hei.haapi.endpoint.rest.model.Student; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import software.amazon.awssdk.services.eventbridge.EventBridgeClient; @Testcontainers diff --git a/src/test/java/school/hei/haapi/integration/PromotionIT.java b/src/test/java/school/hei/haapi/integration/PromotionIT.java index efb761dcfc..4788ea1cab 100644 --- a/src/test/java/school/hei/haapi/integration/PromotionIT.java +++ b/src/test/java/school/hei/haapi/integration/PromotionIT.java @@ -4,23 +4,23 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.PROMOTION1_ID; -import static school.hei.haapi.integration.conf.TestUtils.PROMOTION3_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.addGroupToPromotion3; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.createGroupIdentifier; -import static school.hei.haapi.integration.conf.TestUtils.createPromotion4; -import static school.hei.haapi.integration.conf.TestUtils.group5; -import static school.hei.haapi.integration.conf.TestUtils.promotion21; -import static school.hei.haapi.integration.conf.TestUtils.promotion22; -import static school.hei.haapi.integration.conf.TestUtils.promotion23; -import static school.hei.haapi.integration.conf.TestUtils.removeGroupToPromotion3; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.PROMOTION1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.PROMOTION3_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.addGroupToPromotion3; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.createGroupIdentifier; +import static school.hei.haapi.integration.conf.utils.TestUtils.createPromotion4; +import static school.hei.haapi.integration.conf.utils.TestUtils.group5; +import static school.hei.haapi.integration.conf.utils.TestUtils.promotion21; +import static school.hei.haapi.integration.conf.utils.TestUtils.promotion22; +import static school.hei.haapi.integration.conf.utils.TestUtils.promotion23; +import static school.hei.haapi.integration.conf.utils.TestUtils.removeGroupToPromotion3; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import java.io.IOException; import java.net.URI; @@ -39,7 +39,7 @@ import school.hei.haapi.endpoint.rest.model.CrupdatePromotion; import school.hei.haapi.endpoint.rest.model.Promotion; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; @Testcontainers @AutoConfigureMockMvc diff --git a/src/test/java/school/hei/haapi/integration/SchoolFileIT.java b/src/test/java/school/hei/haapi/integration/SchoolFileIT.java index 10b9e0ed01..5e08fc5386 100644 --- a/src/test/java/school/hei/haapi/integration/SchoolFileIT.java +++ b/src/test/java/school/hei/haapi/integration/SchoolFileIT.java @@ -7,14 +7,14 @@ import static org.mockito.Mockito.when; import static org.springframework.http.HttpMethod.POST; import static school.hei.haapi.endpoint.rest.model.FileType.DOCUMENT; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.MONITOR1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.MONITOR1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import java.time.Instant; import java.util.List; @@ -32,7 +32,7 @@ import school.hei.haapi.endpoint.rest.model.FileInfo; import school.hei.haapi.endpoint.rest.model.ShareInfo; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import software.amazon.awssdk.services.eventbridge.EventBridgeClient; @Testcontainers diff --git a/src/test/java/school/hei/haapi/integration/SecurityIT.java b/src/test/java/school/hei/haapi/integration/SecurityIT.java index 9950d8a2f8..f26713135b 100644 --- a/src/test/java/school/hei/haapi/integration/SecurityIT.java +++ b/src/test/java/school/hei/haapi/integration/SecurityIT.java @@ -2,14 +2,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static school.hei.haapi.endpoint.rest.model.Whoami.RoleEnum.MONITOR; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.MONITOR1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.SUSPENDED_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.MONITOR1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.SUSPENDED_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import java.io.IOException; import java.net.URI; @@ -27,7 +27,7 @@ import school.hei.haapi.endpoint.rest.client.ApiException; import school.hei.haapi.endpoint.rest.model.Whoami; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; @Testcontainers @AutoConfigureMockMvc diff --git a/src/test/java/school/hei/haapi/integration/SpringSecurityIT.java b/src/test/java/school/hei/haapi/integration/SpringSecurityIT.java index 18cbdc2384..710b256193 100644 --- a/src/test/java/school/hei/haapi/integration/SpringSecurityIT.java +++ b/src/test/java/school/hei/haapi/integration/SpringSecurityIT.java @@ -5,9 +5,9 @@ import static org.springframework.http.HttpMethod.GET; import static org.springframework.http.HttpMethod.OPTIONS; import static org.springframework.http.HttpMethod.PUT; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.BAD_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.BAD_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import java.io.IOException; import java.net.URI; diff --git a/src/test/java/school/hei/haapi/integration/StaffMemberIT.java b/src/test/java/school/hei/haapi/integration/StaffMemberIT.java index b62a8cf8f1..07b7533e74 100644 --- a/src/test/java/school/hei/haapi/integration/StaffMemberIT.java +++ b/src/test/java/school/hei/haapi/integration/StaffMemberIT.java @@ -4,17 +4,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static school.hei.haapi.endpoint.rest.model.EnableStatus.ENABLED; import static school.hei.haapi.endpoint.rest.model.Sex.F; -import static school.hei.haapi.integration.conf.TestUtils.ADMIN1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STAFF_MEMBER1_ID; -import static school.hei.haapi.integration.conf.TestUtils.STAFF_MEMBER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.coordinatesWithNullValues; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; -import static school.hei.haapi.integration.conf.TestUtils.teacher1; -import static school.hei.haapi.integration.conf.TestUtils.uploadProfilePicture; +import static school.hei.haapi.integration.conf.utils.TestUtils.ADMIN1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STAFF_MEMBER1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STAFF_MEMBER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.coordinatesWithNullValues; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.TestUtils.teacher1; +import static school.hei.haapi.integration.conf.utils.TestUtils.uploadProfilePicture; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; @@ -38,7 +38,7 @@ import school.hei.haapi.endpoint.rest.client.ApiException; import school.hei.haapi.endpoint.rest.model.StaffMember; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import software.amazon.awssdk.services.eventbridge.EventBridgeClient; @Testcontainers diff --git a/src/test/java/school/hei/haapi/integration/StudentIT.java b/src/test/java/school/hei/haapi/integration/StudentIT.java index 6927d431d8..cf0b3afa4d 100644 --- a/src/test/java/school/hei/haapi/integration/StudentIT.java +++ b/src/test/java/school/hei/haapi/integration/StudentIT.java @@ -19,44 +19,41 @@ import static school.hei.haapi.endpoint.rest.model.Sex.M; import static school.hei.haapi.endpoint.rest.model.SpecializationField.COMMON_CORE; import static school.hei.haapi.endpoint.rest.model.SpecializationField.EL; -import static school.hei.haapi.endpoint.rest.model.SpecializationField.TN; import static school.hei.haapi.endpoint.rest.model.WorkStudyStatus.NOT_WORKING; import static school.hei.haapi.endpoint.rest.model.WorkStudyStatus.WORKING; import static school.hei.haapi.integration.GroupIT.updatedGroup3; import static school.hei.haapi.integration.GroupIT.updatedGroup5; -import static school.hei.haapi.integration.conf.TestUtils.EVENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.GROUP1_ID; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.MONITOR1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.PROMOTION1_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT2_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT3_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT8_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT8_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsApiException; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.coordinatesWithNullValues; -import static school.hei.haapi.integration.conf.TestUtils.coordinatesWithValues; -import static school.hei.haapi.integration.conf.TestUtils.getMockedFile; -import static school.hei.haapi.integration.conf.TestUtils.group1; -import static school.hei.haapi.integration.conf.TestUtils.group2; -import static school.hei.haapi.integration.conf.TestUtils.group3; -import static school.hei.haapi.integration.conf.TestUtils.requestFile; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; -import static school.hei.haapi.integration.conf.TestUtils.uploadProfilePicture; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.EVENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.GROUP1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.MONITOR1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.PROMOTION1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT3_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT8_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT8_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsApiException; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.coordinatesWithNullValues; +import static school.hei.haapi.integration.conf.utils.TestUtils.coordinatesWithValues; +import static school.hei.haapi.integration.conf.utils.TestUtils.getMockedFile; +import static school.hei.haapi.integration.conf.utils.TestUtils.group1; +import static school.hei.haapi.integration.conf.utils.TestUtils.group3; +import static school.hei.haapi.integration.conf.utils.TestUtils.requestFile; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.TestUtils.uploadProfilePicture; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.javafaker.Faker; -import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URI; -import java.net.URL; import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; @@ -88,7 +85,7 @@ import school.hei.haapi.endpoint.rest.model.Statistics; import school.hei.haapi.endpoint.rest.model.Student; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import software.amazon.awssdk.services.eventbridge.EventBridgeClient; import software.amazon.awssdk.services.eventbridge.model.PutEventsRequest; import software.amazon.awssdk.services.eventbridge.model.PutEventsRequestEntry; @@ -107,11 +104,6 @@ private ApiClient anApiClient(String token) { return TestUtils.anApiClient(token, localPort); } - File getFileFromResource(String resourceName) { - URL resource = this.getClass().getClassLoader().getResource(resourceName); - return new File(resource.getFile()); - } - public static CrupdateStudent createStudent1() { CrupdateStudent student = new CrupdateStudent(); student.setId("student1_id"); @@ -131,16 +123,6 @@ public static CrupdateStudent createStudent1() { return student; } - public static CrupdateStudent someUpdatableStudent() { - return createStudent1() - .address("Adr 999") - .sex(F) - .lastName("Other last") - .firstName("Other first") - .specializationField(TN) - .birthDate(LocalDate.parse("2000-01-03")); - } - public static CrupdateStudent someCreatableStudent() { CrupdateStudent student = new CrupdateStudent(); Faker faker = new Faker(); @@ -171,32 +153,6 @@ static List someCreatableStudentList(int nbOfStudent) { return studentList; } - public static Student student1() { - Student student = new Student(); - student.setId("student1_id"); - student.setFirstName("Ryan"); - student.setLastName("Andria"); - student.setEmail("test+ryan@hei.school"); - student.setRef("STD21001"); - student.setPhone("0322411123"); - student.setStatus(ENABLED); - student.setSex(M); - student.setBirthDate(LocalDate.parse("2000-01-01")); - student.setEntranceDatetime(Instant.parse("2021-11-08T08:25:24.00Z")); - student.setAddress("Adr 1"); - student.setNic(""); - student.setSpecializationField(COMMON_CORE); - student.setBirthPlace(""); - student.setCoordinates(new Coordinates().longitude(-123.123).latitude(123.0)); - student.setHighSchoolOrigin("Lycée Andohalo"); - student.setWorkStudyStatus(WORKING); - student.setProfessionalExperience(WORKER_STUDENT); - student.setCommitmentBeginDate(Instant.parse("2021-11-08T08:25:24Z")); - student.setGroups(List.of(group1(), group2())); - student.setIsRepeatingYear(false); - return student; - } - public static Student student2() { Student student = new Student(); student.setId("student2_id"); diff --git a/src/test/java/school/hei/haapi/integration/TeacherIT.java b/src/test/java/school/hei/haapi/integration/TeacherIT.java index 1d885691a4..79ad7bf9b6 100644 --- a/src/test/java/school/hei/haapi/integration/TeacherIT.java +++ b/src/test/java/school/hei/haapi/integration/TeacherIT.java @@ -10,24 +10,24 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.when; import static school.hei.haapi.endpoint.rest.model.EnableStatus.ENABLED; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_ID; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER2_ID; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsApiException; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.coordinatesWithNullValues; -import static school.hei.haapi.integration.conf.TestUtils.coordinatesWithValues; -import static school.hei.haapi.integration.conf.TestUtils.isValidUUID; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; -import static school.hei.haapi.integration.conf.TestUtils.someCreatableTeacher; -import static school.hei.haapi.integration.conf.TestUtils.someCreatableTeacherList; -import static school.hei.haapi.integration.conf.TestUtils.teacher1; -import static school.hei.haapi.integration.conf.TestUtils.teacher2; -import static school.hei.haapi.integration.conf.TestUtils.uploadProfilePicture; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsApiException; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.coordinatesWithNullValues; +import static school.hei.haapi.integration.conf.utils.TestUtils.coordinatesWithValues; +import static school.hei.haapi.integration.conf.utils.TestUtils.isValidUUID; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.TestUtils.someCreatableTeacher; +import static school.hei.haapi.integration.conf.utils.TestUtils.someCreatableTeacherList; +import static school.hei.haapi.integration.conf.utils.TestUtils.teacher1; +import static school.hei.haapi.integration.conf.utils.TestUtils.teacher2; +import static school.hei.haapi.integration.conf.utils.TestUtils.uploadProfilePicture; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; @@ -56,7 +56,7 @@ import school.hei.haapi.endpoint.rest.model.Sex; import school.hei.haapi.endpoint.rest.model.Teacher; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import software.amazon.awssdk.services.eventbridge.EventBridgeClient; import software.amazon.awssdk.services.eventbridge.model.PutEventsRequest; diff --git a/src/test/java/school/hei/haapi/integration/UserFileIT.java b/src/test/java/school/hei/haapi/integration/UserFileIT.java index 5d039d1077..ac8f3279ce 100644 --- a/src/test/java/school/hei/haapi/integration/UserFileIT.java +++ b/src/test/java/school/hei/haapi/integration/UserFileIT.java @@ -9,25 +9,25 @@ import static school.hei.haapi.endpoint.rest.model.EnableStatus.ENABLED; import static school.hei.haapi.endpoint.rest.model.FileType.TRANSCRIPT; import static school.hei.haapi.integration.SchoolFileIT.setUpRestTemplate; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.FEE1_ID; -import static school.hei.haapi.integration.conf.TestUtils.FEE4_ID; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.MONITOR1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.ORGANIZER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.PAYMENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT11_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT12_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT13_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT2_ID; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_ID; -import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE4_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.MONITOR1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.ORGANIZER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.PAYMENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT11_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT12_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT13_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import java.io.IOException; import java.net.URI; @@ -58,7 +58,7 @@ import school.hei.haapi.endpoint.rest.model.GenerationReceiptsRequest; import school.hei.haapi.endpoint.rest.model.Student; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import school.hei.haapi.service.utils.ScholarshipCertificateDataProvider; import software.amazon.awssdk.services.eventbridge.EventBridgeClient; diff --git a/src/test/java/school/hei/haapi/integration/WorkDocumentIT.java b/src/test/java/school/hei/haapi/integration/WorkDocumentIT.java index 79535e5269..e6b6334de4 100644 --- a/src/test/java/school/hei/haapi/integration/WorkDocumentIT.java +++ b/src/test/java/school/hei/haapi/integration/WorkDocumentIT.java @@ -4,16 +4,16 @@ import static school.hei.haapi.endpoint.rest.model.FileType.WORK_DOCUMENT; import static school.hei.haapi.endpoint.rest.model.ProfessionalExperienceFileTypeEnum.BUSINESS_OWNER; import static school.hei.haapi.endpoint.rest.model.ProfessionalExperienceFileTypeEnum.WORKER_STUDENT; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.MONITOR1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.assertThrowsApiException; -import static school.hei.haapi.integration.conf.TestUtils.getMockedFile; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.MONITOR1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsApiException; +import static school.hei.haapi.integration.conf.utils.TestUtils.getMockedFile; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import java.time.Instant; import java.util.List; @@ -28,7 +28,7 @@ import school.hei.haapi.endpoint.rest.client.ApiException; import school.hei.haapi.endpoint.rest.model.WorkDocumentInfo; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import software.amazon.awssdk.services.eventbridge.EventBridgeClient; @Testcontainers diff --git a/src/test/java/school/hei/haapi/integration/conf/utils/MockObjects.java b/src/test/java/school/hei/haapi/integration/conf/utils/MockObjects.java new file mode 100644 index 0000000000..54bee02b5c --- /dev/null +++ b/src/test/java/school/hei/haapi/integration/conf/utils/MockObjects.java @@ -0,0 +1,68 @@ +package school.hei.haapi.integration.conf.utils; + +import static school.hei.haapi.endpoint.rest.model.EnableStatus.ENABLED; +import static school.hei.haapi.endpoint.rest.model.ProfessionalExperienceFileTypeEnum.WORKER_STUDENT; +import static school.hei.haapi.endpoint.rest.model.Sex.F; +import static school.hei.haapi.endpoint.rest.model.Sex.M; +import static school.hei.haapi.endpoint.rest.model.SpecializationField.COMMON_CORE; +import static school.hei.haapi.endpoint.rest.model.WorkStudyStatus.WORKING; + +import java.time.Instant; +import java.time.LocalDate; +import java.util.List; +import school.hei.haapi.endpoint.rest.model.Coordinates; +import school.hei.haapi.endpoint.rest.model.Student; + +public class MockObjects { + public static Student student1() { + Student student = new Student(); + student.setId("student1_id"); + student.setFirstName("Ryan"); + student.setLastName("Andria"); + student.setEmail("test+ryan@hei.school"); + student.setRef("STD21001"); + student.setPhone("0322411123"); + student.setStatus(ENABLED); + student.setSex(M); + student.setBirthDate(LocalDate.parse("2000-01-01")); + student.setEntranceDatetime(Instant.parse("2021-11-08T08:25:24.00Z")); + student.setAddress("Adr 1"); + student.setNic(""); + student.setSpecializationField(COMMON_CORE); + student.setBirthPlace(""); + student.setCoordinates(new Coordinates().longitude(-123.123).latitude(123.0)); + student.setHighSchoolOrigin("Lycée Andohalo"); + student.setWorkStudyStatus(WORKING); + student.setProfessionalExperience(WORKER_STUDENT); + student.setCommitmentBeginDate(Instant.parse("2021-11-08T08:25:24Z")); + student.setGroups(List.of(TestUtils.group1(), TestUtils.group2())); + student.setIsRepeatingYear(false); + return student; + } + + public static Student student2() { + Student student = new Student(); + student.setId("student2_id"); + student.setFirstName("Two"); + student.setLastName("Student"); + student.setEmail("test+student2@hei.school"); + student.setRef("STD21002"); + student.setPhone("0322411124"); + student.setStatus(ENABLED); + student.setSex(F); + student.setBirthDate(LocalDate.parse("2000-01-02")); + student.setEntranceDatetime(Instant.parse("2021-11-09T08:26:24.00Z")); + student.setAddress("Adr 2"); + student.setBirthPlace(""); + student.setNic(""); + student.setSpecializationField(COMMON_CORE); + student.setCoordinates(new Coordinates().longitude(255.255).latitude(-255.255)); + student.setHighSchoolOrigin("Lycée Andohalo"); + student.setWorkStudyStatus(WORKING); + student.setProfessionalExperience(WORKER_STUDENT); + student.setCommitmentBeginDate(Instant.parse("2021-11-08T08:25:24.00Z")); + student.setGroups(List.of(TestUtils.group1())); + student.setIsRepeatingYear(false); + return student; + } +} diff --git a/src/test/java/school/hei/haapi/integration/conf/TestUtils.java b/src/test/java/school/hei/haapi/integration/conf/utils/TestUtils.java similarity index 94% rename from src/test/java/school/hei/haapi/integration/conf/TestUtils.java rename to src/test/java/school/hei/haapi/integration/conf/utils/TestUtils.java index c74d46a5e2..dc9ee72d34 100644 --- a/src/test/java/school/hei/haapi/integration/conf/TestUtils.java +++ b/src/test/java/school/hei/haapi/integration/conf/utils/TestUtils.java @@ -1,4 +1,4 @@ -package school.hei.haapi.integration.conf; +package school.hei.haapi.integration.conf.utils; import static java.util.UUID.randomUUID; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -24,15 +24,10 @@ import static school.hei.haapi.endpoint.rest.model.MobileMoneyType.ORANGE_MONEY; import static school.hei.haapi.endpoint.rest.model.Observer.RoleEnum.MANAGER; import static school.hei.haapi.endpoint.rest.model.Observer.RoleEnum.TEACHER; -import static school.hei.haapi.endpoint.rest.model.ProfessionalExperienceFileTypeEnum.WORKER_STUDENT; import static school.hei.haapi.endpoint.rest.model.Scope.GLOBAL; import static school.hei.haapi.endpoint.rest.model.Scope.STUDENT; -import static school.hei.haapi.endpoint.rest.model.Sex.F; -import static school.hei.haapi.endpoint.rest.model.Sex.M; -import static school.hei.haapi.endpoint.rest.model.SpecializationField.COMMON_CORE; import static school.hei.haapi.endpoint.rest.model.UpdatePromotionSGroup.TypeEnum.ADD; import static school.hei.haapi.endpoint.rest.model.UpdatePromotionSGroup.TypeEnum.REMOVE; -import static school.hei.haapi.endpoint.rest.model.WorkStudyStatus.WORKING; import static school.hei.haapi.integration.ManagerIT.manager1; import static school.hei.haapi.integration.MpbsIT.expectedMpbs1; import static school.hei.haapi.integration.StudentIT.student3; @@ -512,58 +507,6 @@ public static Group group5() { .size(0); } - public static Student student1() { - Student student = new Student(); - student.setId("student1_id"); - student.setFirstName("Ryan"); - student.setLastName("Andria"); - student.setEmail("test+ryan@hei.school"); - student.setRef("STD21001"); - student.setPhone("0322411123"); - student.setStatus(ENABLED); - student.setSex(M); - student.setBirthDate(LocalDate.parse("2000-01-01")); - student.setEntranceDatetime(Instant.parse("2021-11-08T08:25:24.00Z")); - student.setAddress("Adr 1"); - student.setNic(""); - student.setSpecializationField(COMMON_CORE); - student.setBirthPlace(""); - student.setCoordinates(new Coordinates().longitude(-123.123).latitude(123.0)); - student.setHighSchoolOrigin("Lycée Andohalo"); - student.setWorkStudyStatus(WORKING); - student.setProfessionalExperience(WORKER_STUDENT); - student.setCommitmentBeginDate(Instant.parse("2021-11-08T08:25:24Z")); - student.setGroups(List.of(group1(), group2())); - student.setIsRepeatingYear(false); - return student; - } - - public static Student student2() { - Student student = new Student(); - student.setId("student2_id"); - student.setFirstName("Two"); - student.setLastName("Student"); - student.setEmail("test+student2@hei.school"); - student.setRef("STD21002"); - student.setPhone("0322411124"); - student.setStatus(ENABLED); - student.setSex(F); - student.setBirthDate(LocalDate.parse("2000-01-02")); - student.setEntranceDatetime(Instant.parse("2021-11-09T08:26:24.00Z")); - student.setAddress("Adr 2"); - student.setBirthPlace(""); - student.setNic(""); - student.setSpecializationField(COMMON_CORE); - student.setCoordinates(new Coordinates().longitude(255.255).latitude(-255.255)); - student.setHighSchoolOrigin("Lycée Andohalo"); - student.setWorkStudyStatus(WORKING); - student.setProfessionalExperience(WORKER_STUDENT); - student.setCommitmentBeginDate(Instant.parse("2021-11-08T08:25:24.00Z")); - student.setGroups(List.of(group1())); - student.setIsRepeatingYear(false); - return student; - } - public static Teacher teacher1() { return new Teacher() .id("teacher1_id") @@ -954,27 +897,27 @@ public static Grade grade7() { } public static StudentGrade studentExamGrade1() { - return new StudentGrade().grade(grade1()).student(student1()); + return new StudentGrade().grade(grade1()).student(MockObjects.student1()); } public static StudentGrade studentExamGrade2() { - return new StudentGrade().grade(grade2()).student(student1()); + return new StudentGrade().grade(grade2()).student(MockObjects.student1()); } public static StudentGrade studentExamGrade3() { - return new StudentGrade().grade(grade3()).student(student1()); + return new StudentGrade().grade(grade3()).student(MockObjects.student1()); } public static StudentGrade studentExamGrade4() { - return new StudentGrade().grade(grade4()).student(student1()); + return new StudentGrade().grade(grade4()).student(MockObjects.student1()); } public static StudentGrade studentExamGrade5() { - return new StudentGrade().grade(grade5()).student(student1()); + return new StudentGrade().grade(grade5()).student(MockObjects.student1()); } public static StudentGrade studentGrade1() { - return new StudentGrade().grade(grade1()).student(student1()); + return new StudentGrade().grade(grade1()).student(MockObjects.student1()); } public static StudentGrade studentGrade2() { @@ -1232,7 +1175,7 @@ public static Comment comment1() { return new Comment() .id("comment1_id") .content("Good student") - .subject(student1()) + .subject(MockObjects.student1()) .observer(observerTeacher1()) .creationDatetime(Instant.parse("2021-11-09T08:26:24.00Z")); } @@ -1241,7 +1184,7 @@ public static Comment comment2() { return new Comment() .id("comment2_id") .content("Disruptive student") - .subject(student1()) + .subject(MockObjects.student1()) .observer(observerManager1()) .creationDatetime(Instant.parse("2021-11-09T09:26:24.00Z")); } @@ -1250,7 +1193,7 @@ public static Comment comment3() { return new Comment() .id("comment3_id") .content("Nothing to say here") - .subject(student2()) + .subject(MockObjects.student2()) .observer(observerTeacher1()) .creationDatetime(Instant.parse("2021-11-09T10:26:24.00Z")); } @@ -1272,7 +1215,7 @@ public static Comment commentCreatedByManager() { .id("comment4_id") .content("Comment about student 1") .observer(observerManager1()) - .subject(student1()); + .subject(MockObjects.student1()); } public static Comment commentCreatedByTeacher() { @@ -1403,7 +1346,7 @@ public static GroupIdentifier createGroupIdentifier(Group group) { } public static EventParticipant student1MissEvent1() { - return createParticipant(student1(), MISSING, "event_participant1_id", "GRP21001"); + return createParticipant(MockObjects.student1(), MISSING, "event_participant1_id", "GRP21001"); } public static EventParticipant student3AttendEvent1() { @@ -1411,11 +1354,11 @@ public static EventParticipant student3AttendEvent1() { } public static EventParticipant student1AttendEvent2() { - return createParticipant(student1(), PRESENT, "event_participant3_id", "GRP21001"); + return createParticipant(MockObjects.student1(), PRESENT, "event_participant3_id", "GRP21001"); } public static EventParticipant student2AttendEvent2() { - return createParticipant(student2(), PRESENT, "event_participant4_id", "GRP21002"); + return createParticipant(MockObjects.student2(), PRESENT, "event_participant4_id", "GRP21002"); } public static EventParticipant student3MissEvent2() { @@ -1656,7 +1599,7 @@ public static Letter letter1() { return new Letter() .id(LETTER1_ID) .ref(LETTER1_REF) - .user(toLetterStudent(student1())) + .user(toLetterStudent(MockObjects.student1())) .status(RECEIVED) .approvalDatetime(Instant.parse("2021-12-08T08:25:24.00Z")) .creationDatetime(Instant.parse("2021-11-08T08:25:24.00Z")) @@ -1668,7 +1611,7 @@ public static Letter letter2() { return new Letter() .id(LETTER2_ID) .ref(LETTER2_REF) - .user(toLetterStudent(student1())) + .user(toLetterStudent(MockObjects.student1())) .status(PENDING) .approvalDatetime(null) .creationDatetime(Instant.parse("2021-11-08T08:25:24.00Z")) @@ -1680,7 +1623,7 @@ public static Letter letter3() { return new Letter() .id(LETTER3_ID) .ref(LETTER3_REF) - .user(toLetterStudent(student2())) + .user(toLetterStudent(MockObjects.student2())) .status(PENDING) .approvalDatetime(null) .creationDatetime(Instant.parse("2021-11-08T08:25:24.00Z")) diff --git a/src/test/java/school/hei/haapi/service/FeeServiceTest.java b/src/test/java/school/hei/haapi/service/FeeServiceTest.java index aa9810f7f6..8f5a7ae61a 100644 --- a/src/test/java/school/hei/haapi/service/FeeServiceTest.java +++ b/src/test/java/school/hei/haapi/service/FeeServiceTest.java @@ -11,7 +11,7 @@ import static school.hei.haapi.endpoint.rest.model.FeeStatusEnum.UNPAID; import static school.hei.haapi.endpoint.rest.model.FeeTypeEnum.HARDWARE; import static school.hei.haapi.endpoint.rest.model.Payment.TypeEnum.CASH; -import static school.hei.haapi.integration.conf.TestUtils.FEE1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE1_ID; import java.time.Instant; import java.time.temporal.ChronoUnit; @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; import school.hei.haapi.endpoint.event.EventProducer; import school.hei.haapi.endpoint.rest.mapper.AdvancedFeeStatsMapper; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import school.hei.haapi.model.*; import school.hei.haapi.model.validator.FeeValidator; import school.hei.haapi.model.validator.UpdateFeeValidator; diff --git a/src/test/java/school/hei/haapi/service/PaymentServiceTest.java b/src/test/java/school/hei/haapi/service/PaymentServiceTest.java index 63aa7edf60..fde6fe53f9 100644 --- a/src/test/java/school/hei/haapi/service/PaymentServiceTest.java +++ b/src/test/java/school/hei/haapi/service/PaymentServiceTest.java @@ -9,15 +9,15 @@ import static school.hei.haapi.endpoint.rest.model.FeeTypeEnum.TUITION; import static school.hei.haapi.integration.MpbsIT.createableMpbsFromFeeIdWithStudent1; import static school.hei.haapi.integration.StudentIT.someCreatableStudent; -import static school.hei.haapi.integration.conf.TestUtils.FEE3_ID; -import static school.hei.haapi.integration.conf.TestUtils.FEE6_ID; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.anAvailableRandomPort; -import static school.hei.haapi.integration.conf.TestUtils.creatableFee1; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE3_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE6_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.anAvailableRandomPort; +import static school.hei.haapi.integration.conf.utils.TestUtils.creatableFee1; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import static school.hei.haapi.model.User.Sex.F; import static school.hei.haapi.model.User.Sex.M; @@ -41,7 +41,8 @@ import school.hei.haapi.endpoint.rest.client.ApiException; import school.hei.haapi.integration.conf.AbstractContextInitializer; import school.hei.haapi.integration.conf.MockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.MockObjects; +import school.hei.haapi.integration.conf.utils.TestUtils; import school.hei.haapi.model.Fee; import school.hei.haapi.model.User; import software.amazon.awssdk.services.eventbridge.EventBridgeClient; @@ -62,7 +63,7 @@ class PaymentServiceTest extends MockedThirdParties { @BeforeEach void setUp() { setUpCognito(cognitoComponentMock); - setUpS3Service(fileService, TestUtils.student1()); + setUpS3Service(fileService, MockObjects.student1()); setUpEventBridge(eventBridgeClientMock); } diff --git a/src/test/java/school/hei/haapi/service/ScholarshipCertificateDataProviderTest.java b/src/test/java/school/hei/haapi/service/ScholarshipCertificateDataProviderTest.java index 6087261a4a..98e591bff5 100644 --- a/src/test/java/school/hei/haapi/service/ScholarshipCertificateDataProviderTest.java +++ b/src/test/java/school/hei/haapi/service/ScholarshipCertificateDataProviderTest.java @@ -1,10 +1,10 @@ package school.hei.haapi.service; import static org.junit.jupiter.api.Assertions.assertEquals; -import static school.hei.haapi.integration.StudentIT.student1; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import java.time.Instant; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/school/hei/haapi/service/UserServiceTest.java b/src/test/java/school/hei/haapi/service/UserServiceTest.java index 6fb3c1b233..a11517cfbf 100644 --- a/src/test/java/school/hei/haapi/service/UserServiceTest.java +++ b/src/test/java/school/hei/haapi/service/UserServiceTest.java @@ -3,12 +3,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_ID; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; -import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service; -import static school.hei.haapi.integration.conf.TestUtils.student1; -import static school.hei.haapi.integration.conf.TestUtils.student2; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.MockObjects.student2; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import static school.hei.haapi.model.User.Role.STUDENT; import java.util.List; @@ -20,7 +20,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; import school.hei.haapi.endpoint.rest.client.ApiClient; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import school.hei.haapi.model.BoundedPageSize; import school.hei.haapi.model.PageFromOne; import school.hei.haapi.model.User; diff --git a/src/test/java/school/hei/haapi/unit/CheckStudentsStatusTest.java b/src/test/java/school/hei/haapi/unit/CheckStudentsStatusTest.java index e11383df46..529d5e3900 100644 --- a/src/test/java/school/hei/haapi/unit/CheckStudentsStatusTest.java +++ b/src/test/java/school/hei/haapi/unit/CheckStudentsStatusTest.java @@ -4,15 +4,15 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; import static school.hei.haapi.integration.MpbsIT.createableMpbsFromFeeIdForStudent; -import static school.hei.haapi.integration.conf.TestUtils.FEE4_ID; -import static school.hei.haapi.integration.conf.TestUtils.FEE5_ID; -import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT2_ID; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT2_TOKEN; -import static school.hei.haapi.integration.conf.TestUtils.anAvailableRandomPort; -import static school.hei.haapi.integration.conf.TestUtils.creatableFee1; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE4_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.FEE5_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT2_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.anAvailableRandomPort; +import static school.hei.haapi.integration.conf.utils.TestUtils.creatableFee1; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; import static school.hei.haapi.model.User.Sex.F; import static school.hei.haapi.model.User.Sex.M; import static school.hei.haapi.model.User.Status.ENABLED; @@ -38,7 +38,7 @@ import school.hei.haapi.endpoint.rest.model.Mpbs; import school.hei.haapi.integration.conf.AbstractContextInitializer; import school.hei.haapi.integration.conf.MockedThirdParties; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import school.hei.haapi.model.User; import school.hei.haapi.repository.UserRepository; import school.hei.haapi.service.FeeService; diff --git a/src/test/java/school/hei/haapi/unit/utils/DateUtilsTest.java b/src/test/java/school/hei/haapi/unit/utils/DateUtilsTest.java index 2fa5160ac6..f9a6dc38b9 100644 --- a/src/test/java/school/hei/haapi/unit/utils/DateUtilsTest.java +++ b/src/test/java/school/hei/haapi/unit/utils/DateUtilsTest.java @@ -2,8 +2,8 @@ import static java.util.Optional.empty; import static org.junit.jupiter.api.Assertions.assertEquals; -import static school.hei.haapi.integration.conf.TestUtils.setUpCognito; -import static school.hei.haapi.integration.conf.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; import java.time.LocalDate; import java.time.ZoneOffset; diff --git a/src/test/java/school/hei/haapi/unit/validator/FeeValidatorTest.java b/src/test/java/school/hei/haapi/unit/validator/FeeValidatorTest.java index 0dfd2df11b..bcbbaaa3c0 100644 --- a/src/test/java/school/hei/haapi/unit/validator/FeeValidatorTest.java +++ b/src/test/java/school/hei/haapi/unit/validator/FeeValidatorTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; -import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; diff --git a/src/test/java/school/hei/haapi/unit/validator/PaymentValidatorTest.java b/src/test/java/school/hei/haapi/unit/validator/PaymentValidatorTest.java index a82a2eb65b..d5d9448406 100644 --- a/src/test/java/school/hei/haapi/unit/validator/PaymentValidatorTest.java +++ b/src/test/java/school/hei/haapi/unit/validator/PaymentValidatorTest.java @@ -14,7 +14,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import school.hei.haapi.integration.conf.TestUtils; +import school.hei.haapi.integration.conf.utils.TestUtils; import school.hei.haapi.model.Fee; import school.hei.haapi.model.Payment; import school.hei.haapi.model.User; From eaebfce43d2416fb8e8f059814a3db151e942be3 Mon Sep 17 00:00:00 2001 From: kirisaki_vk Date: Fri, 11 Apr 2025 11:08:48 +0300 Subject: [PATCH 2/6] chore: fix tests asserts --- .../java/school/hei/haapi/integration/StudentIT.java | 2 +- .../school/hei/haapi/service/UserServiceTest.java | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/test/java/school/hei/haapi/integration/StudentIT.java b/src/test/java/school/hei/haapi/integration/StudentIT.java index cf0b3afa4d..150acd5311 100644 --- a/src/test/java/school/hei/haapi/integration/StudentIT.java +++ b/src/test/java/school/hei/haapi/integration/StudentIT.java @@ -402,7 +402,7 @@ void student_read_itself_repeating_this_year_ok() throws ApiException { Student actual = api.getStudentById(STUDENT8_ID); assertEquals(repeatingStudent2(), actual); - assertEquals(Boolean.TRUE, actual.getIsRepeatingYear()); + assertEquals(true, actual.getIsRepeatingYear()); } @Test diff --git a/src/test/java/school/hei/haapi/service/UserServiceTest.java b/src/test/java/school/hei/haapi/service/UserServiceTest.java index a11517cfbf..a1567f39da 100644 --- a/src/test/java/school/hei/haapi/service/UserServiceTest.java +++ b/src/test/java/school/hei/haapi/service/UserServiceTest.java @@ -18,9 +18,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.mock.mockito.MockBean; import org.testcontainers.junit.jupiter.Testcontainers; -import school.hei.haapi.endpoint.rest.client.ApiClient; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; -import school.hei.haapi.integration.conf.utils.TestUtils; import school.hei.haapi.model.BoundedPageSize; import school.hei.haapi.model.PageFromOne; import school.hei.haapi.model.User; @@ -50,12 +48,13 @@ void monitors_is_retrieve_by_student_id_ok() { } @Test + // TODO: void dao_can_handle_null_value_in_params() { List students = subject.getByCriteria( STUDENT, null, null, null, new PageFromOne(1), new BoundedPageSize(15), null, null); - assertEquals(student1().getId(), students.getFirst().getId()); - assertEquals(student2().getId(), students.get(1).getId()); + assertTrue(students.stream().anyMatch(user -> student1().getId().equals(user.getId()))); + assertTrue(students.stream().anyMatch(user -> student2().getId().equals(user.getId()))); } @Test @@ -68,8 +67,4 @@ void disabled_user_enable_ko() { student1.setStatus(User.Status.ENABLED); }); } - - private ApiClient anApiClient(String token) { - return TestUtils.anApiClient(token, localPort); - } } From c73865debf05a280bd487ecdd7fc2ffda78d8038 Mon Sep 17 00:00:00 2001 From: kirisaki_vk Date: Fri, 11 Apr 2025 14:49:38 +0300 Subject: [PATCH 3/6] chore: moved student3 to MockedObjects --- .../hei/haapi/integration/AttendanceIT.java | 30 ++++++- .../school/hei/haapi/integration/EventIT.java | 2 +- .../hei/haapi/integration/GroupFlowIT.java | 2 +- .../hei/haapi/integration/StudentIT.java | 85 ++----------------- .../integration/conf/utils/MockObjects.java | 26 ++++++ .../integration/conf/utils/TestUtils.java | 14 +-- .../hei/haapi/service/PaymentServiceTest.java | 32 ------- .../hei/haapi/service/UserServiceTest.java | 1 - 8 files changed, 62 insertions(+), 130 deletions(-) diff --git a/src/test/java/school/hei/haapi/integration/AttendanceIT.java b/src/test/java/school/hei/haapi/integration/AttendanceIT.java index 37e878d9f3..de634991e2 100644 --- a/src/test/java/school/hei/haapi/integration/AttendanceIT.java +++ b/src/test/java/school/hei/haapi/integration/AttendanceIT.java @@ -4,10 +4,23 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static school.hei.haapi.endpoint.rest.model.AttendanceStatus.UNCHECKED; import static school.hei.haapi.endpoint.rest.model.EventType.COURSE; -import static school.hei.haapi.integration.StudentIT.*; -import static school.hei.haapi.integration.StudentIT.student2; +import static school.hei.haapi.integration.GroupIT.group1; import static school.hei.haapi.integration.conf.utils.MockObjects.student1; -import static school.hei.haapi.integration.conf.utils.TestUtils.*; +import static school.hei.haapi.integration.conf.utils.MockObjects.student2; +import static school.hei.haapi.integration.conf.utils.MockObjects.student3; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.ORGANIZER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsApiException; +import static school.hei.haapi.integration.conf.utils.TestUtils.awardedCourse1; +import static school.hei.haapi.integration.conf.utils.TestUtils.course1; +import static school.hei.haapi.integration.conf.utils.TestUtils.course2; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.TestUtils.someCreatableEvent; +import static school.hei.haapi.integration.conf.utils.TestUtils.teacher1; +import static school.hei.haapi.integration.conf.utils.TestUtils.teacher4; import static school.hei.haapi.model.User.Status.ENABLED; import java.time.Instant; @@ -22,7 +35,16 @@ import school.hei.haapi.endpoint.rest.api.EventsApi; import school.hei.haapi.endpoint.rest.client.ApiClient; import school.hei.haapi.endpoint.rest.client.ApiException; -import school.hei.haapi.endpoint.rest.model.*; +import school.hei.haapi.endpoint.rest.model.AttendanceMovementType; +import school.hei.haapi.endpoint.rest.model.AttendanceStatus; +import school.hei.haapi.endpoint.rest.model.AwardedCourse; +import school.hei.haapi.endpoint.rest.model.CourseSession; +import school.hei.haapi.endpoint.rest.model.CreateAttendanceMovement; +import school.hei.haapi.endpoint.rest.model.Event; +import school.hei.haapi.endpoint.rest.model.EventParticipant; +import school.hei.haapi.endpoint.rest.model.PlaceEnum; +import school.hei.haapi.endpoint.rest.model.StudentAttendance; +import school.hei.haapi.endpoint.rest.model.StudentAttendanceMovement; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; import school.hei.haapi.integration.conf.utils.TestUtils; import school.hei.haapi.model.User; diff --git a/src/test/java/school/hei/haapi/integration/EventIT.java b/src/test/java/school/hei/haapi/integration/EventIT.java index 3563dfffb5..f3b60bab7f 100644 --- a/src/test/java/school/hei/haapi/integration/EventIT.java +++ b/src/test/java/school/hei/haapi/integration/EventIT.java @@ -14,8 +14,8 @@ import static school.hei.haapi.endpoint.rest.model.FrequencyScopeDay.FRIDAY; import static school.hei.haapi.endpoint.rest.model.FrequencyScopeDay.MONDAY; import static school.hei.haapi.endpoint.rest.model.FrequencyScopeDay.WEDNESDAY; -import static school.hei.haapi.integration.StudentIT.student2; import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.MockObjects.student2; import static school.hei.haapi.integration.conf.utils.TestUtils.ADMIN1_TOKEN; import static school.hei.haapi.integration.conf.utils.TestUtils.EVENT1_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.EVENT2_ID; diff --git a/src/test/java/school/hei/haapi/integration/GroupFlowIT.java b/src/test/java/school/hei/haapi/integration/GroupFlowIT.java index 67a00e9466..d2ff86b955 100644 --- a/src/test/java/school/hei/haapi/integration/GroupFlowIT.java +++ b/src/test/java/school/hei/haapi/integration/GroupFlowIT.java @@ -5,8 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static school.hei.haapi.endpoint.rest.model.CreateGroupFlow.MoveTypeEnum.JOIN; import static school.hei.haapi.endpoint.rest.model.CreateGroupFlow.MoveTypeEnum.LEAVE; -import static school.hei.haapi.integration.StudentIT.student2; import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.MockObjects.student2; import static school.hei.haapi.integration.conf.utils.TestUtils.GROUP1_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.GROUP2_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; diff --git a/src/test/java/school/hei/haapi/integration/StudentIT.java b/src/test/java/school/hei/haapi/integration/StudentIT.java index 150acd5311..01fd5bee70 100644 --- a/src/test/java/school/hei/haapi/integration/StudentIT.java +++ b/src/test/java/school/hei/haapi/integration/StudentIT.java @@ -14,7 +14,6 @@ import static school.hei.haapi.endpoint.rest.model.EnableStatus.SUSPENDED; import static school.hei.haapi.endpoint.rest.model.PaymentFrequency.MONTHLY; import static school.hei.haapi.endpoint.rest.model.PaymentFrequency.YEARLY; -import static school.hei.haapi.endpoint.rest.model.ProfessionalExperienceFileTypeEnum.WORKER_STUDENT; import static school.hei.haapi.endpoint.rest.model.Sex.F; import static school.hei.haapi.endpoint.rest.model.Sex.M; import static school.hei.haapi.endpoint.rest.model.SpecializationField.COMMON_CORE; @@ -24,6 +23,8 @@ import static school.hei.haapi.integration.GroupIT.updatedGroup3; import static school.hei.haapi.integration.GroupIT.updatedGroup5; import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.MockObjects.student2; +import static school.hei.haapi.integration.conf.utils.MockObjects.student3; import static school.hei.haapi.integration.conf.utils.TestUtils.EVENT1_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.GROUP1_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; @@ -41,7 +42,6 @@ import static school.hei.haapi.integration.conf.utils.TestUtils.coordinatesWithNullValues; import static school.hei.haapi.integration.conf.utils.TestUtils.coordinatesWithValues; import static school.hei.haapi.integration.conf.utils.TestUtils.getMockedFile; -import static school.hei.haapi.integration.conf.utils.TestUtils.group1; import static school.hei.haapi.integration.conf.utils.TestUtils.group3; import static school.hei.haapi.integration.conf.utils.TestUtils.requestFile; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; @@ -104,25 +104,6 @@ private ApiClient anApiClient(String token) { return TestUtils.anApiClient(token, localPort); } - public static CrupdateStudent createStudent1() { - CrupdateStudent student = new CrupdateStudent(); - student.setId("student1_id"); - student.setFirstName("Ryan"); - student.setLastName("Andria"); - student.setEmail("test+ryan@hei.school"); - student.setRef("STD21001"); - student.setPhone("0322411123"); - student.setStatus(ENABLED); - student.setSex(M); - student.setBirthDate(LocalDate.parse("2000-01-01")); - student.setEntranceDatetime(Instant.parse("2021-11-08T08:25:24.00Z")); - student.setAddress("Adr 1"); - student.setNic(""); - student.setBirthPlace(""); - student.coordinates(coordinatesWithNullValues()); - return student; - } - public static CrupdateStudent someCreatableStudent() { CrupdateStudent student = new CrupdateStudent(); Faker faker = new Faker(); @@ -153,32 +134,6 @@ static List someCreatableStudentList(int nbOfStudent) { return studentList; } - public static Student student2() { - Student student = new Student(); - student.setId("student2_id"); - student.setFirstName("Two"); - student.setLastName("Student"); - student.setEmail("test+student2@hei.school"); - student.setRef("STD21002"); - student.setPhone("0322411124"); - student.setStatus(ENABLED); - student.setSex(F); - student.setBirthDate(LocalDate.parse("2000-01-02")); - student.setEntranceDatetime(Instant.parse("2021-11-09T08:26:24.00Z")); - student.setAddress("Adr 2"); - student.setBirthPlace(""); - student.setNic(""); - student.setSpecializationField(COMMON_CORE); - student.setCoordinates(new Coordinates().longitude(255.255).latitude(-255.255)); - student.setHighSchoolOrigin("Lycée Andohalo"); - student.setWorkStudyStatus(WORKING); - student.setProfessionalExperience(WORKER_STUDENT); - student.setCommitmentBeginDate(Instant.parse("2021-11-08T08:25:24.00Z")); - student.setGroups(List.of(group1())); - student.setIsRepeatingYear(false); - return student; - } - public static CrupdateStudent createStudent2() { CrupdateStudent student = new CrupdateStudent(); student.setId("student2_id"); @@ -199,31 +154,7 @@ public static CrupdateStudent createStudent2() { return student; } - public static Student student3() { - Student student = new Student(); - student.setId("student3_id"); - student.setFirstName("Three"); - student.setLastName("Student"); - student.setEmail("test+student3@hei.school"); - student.setRef("STD21003"); - student.setPhone("0322411124"); - student.setStatus(ENABLED); - student.setSex(F); - student.setBirthDate(LocalDate.parse("2000-01-02")); - student.setEntranceDatetime(Instant.parse("2021-11-09T08:26:24.00Z")); - student.setAddress("Adr 2"); - student.setBirthPlace("Befelatanana"); - student.setNic("0000000000"); - student.setSpecializationField(COMMON_CORE); - student.setCoordinates(coordinatesWithNullValues()); - student.setHighSchoolOrigin("Lycée Analamahitsy"); - student.setWorkStudyStatus(NOT_WORKING); - student.setGroups(List.of()); - student.setIsRepeatingYear(false); - return student; - } - - public static Student disabledStudent1() { + static Student disabledStudent1() { return new Student() .id("student4_id") .firstName("Disable") @@ -245,7 +176,7 @@ public static Student disabledStudent1() { .isRepeatingYear(false); } - public static CrupdateStudent creatableSuspendedStudent() { + static CrupdateStudent creatableSuspendedStudent() { return new CrupdateStudent() .firstName("Suspended") .lastName("Two") @@ -260,7 +191,7 @@ public static CrupdateStudent creatableSuspendedStudent() { .coordinates(coordinatesWithNullValues()); } - public static Student suspendedStudent1() { + static Student suspendedStudent1() { return new Student() .id("student6_id") .firstName("Suspended") @@ -282,7 +213,7 @@ public static Student suspendedStudent1() { .isRepeatingYear(false); } - public static Student repeatingStudent1() { + static Student repeatingStudent1() { Group copyGroup3 = new Group(); copyGroup3.setId(group3().getId()); copyGroup3.setRef(group3().getRef()); @@ -310,7 +241,7 @@ public static Student repeatingStudent1() { .isRepeatingYear(Boolean.TRUE); } - public static Student repeatingStudent2() { + static Student repeatingStudent2() { return new Student() .id("student8_id") .firstName("Repeating") @@ -450,7 +381,6 @@ void student_update_own_ko() throws ApiException { } @Test - @Disabled("TODO") void student_read_own_ok() throws ApiException { ApiClient student1Client = anApiClient(STUDENT1_TOKEN); @@ -639,7 +569,6 @@ void manager_read_by_ref_ok() throws ApiException { } @Test - @Disabled("") void manager_read_by_last_name_ok() throws ApiException { ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); UsersApi api = new UsersApi(manager1Client); diff --git a/src/test/java/school/hei/haapi/integration/conf/utils/MockObjects.java b/src/test/java/school/hei/haapi/integration/conf/utils/MockObjects.java index 54bee02b5c..1a9477dddd 100644 --- a/src/test/java/school/hei/haapi/integration/conf/utils/MockObjects.java +++ b/src/test/java/school/hei/haapi/integration/conf/utils/MockObjects.java @@ -5,7 +5,9 @@ import static school.hei.haapi.endpoint.rest.model.Sex.F; import static school.hei.haapi.endpoint.rest.model.Sex.M; import static school.hei.haapi.endpoint.rest.model.SpecializationField.COMMON_CORE; +import static school.hei.haapi.endpoint.rest.model.WorkStudyStatus.NOT_WORKING; import static school.hei.haapi.endpoint.rest.model.WorkStudyStatus.WORKING; +import static school.hei.haapi.integration.conf.utils.TestUtils.coordinatesWithNullValues; import java.time.Instant; import java.time.LocalDate; @@ -65,4 +67,28 @@ public static Student student2() { student.setIsRepeatingYear(false); return student; } + + public static Student student3() { + Student student = new Student(); + student.setId("student3_id"); + student.setFirstName("Three"); + student.setLastName("Student"); + student.setEmail("test+student3@hei.school"); + student.setRef("STD21003"); + student.setPhone("0322411124"); + student.setStatus(ENABLED); + student.setSex(F); + student.setBirthDate(LocalDate.parse("2000-01-02")); + student.setEntranceDatetime(Instant.parse("2021-11-09T08:26:24.00Z")); + student.setAddress("Adr 2"); + student.setBirthPlace("Befelatanana"); + student.setNic("0000000000"); + student.setSpecializationField(COMMON_CORE); + student.setCoordinates(coordinatesWithNullValues()); + student.setHighSchoolOrigin("Lycée Analamahitsy"); + student.setWorkStudyStatus(NOT_WORKING); + student.setGroups(List.of()); + student.setIsRepeatingYear(false); + return student; + } } diff --git a/src/test/java/school/hei/haapi/integration/conf/utils/TestUtils.java b/src/test/java/school/hei/haapi/integration/conf/utils/TestUtils.java index dc9ee72d34..8ab615fee7 100644 --- a/src/test/java/school/hei/haapi/integration/conf/utils/TestUtils.java +++ b/src/test/java/school/hei/haapi/integration/conf/utils/TestUtils.java @@ -19,9 +19,6 @@ import static school.hei.haapi.endpoint.rest.model.FeeTypeEnum.TUITION; import static school.hei.haapi.endpoint.rest.model.LetterStatus.PENDING; import static school.hei.haapi.endpoint.rest.model.LetterStatus.RECEIVED; -import static school.hei.haapi.endpoint.rest.model.MobileMoneyType.AIRTEL_MONEY; -import static school.hei.haapi.endpoint.rest.model.MobileMoneyType.MVOLA; -import static school.hei.haapi.endpoint.rest.model.MobileMoneyType.ORANGE_MONEY; import static school.hei.haapi.endpoint.rest.model.Observer.RoleEnum.MANAGER; import static school.hei.haapi.endpoint.rest.model.Observer.RoleEnum.TEACHER; import static school.hei.haapi.endpoint.rest.model.Scope.GLOBAL; @@ -30,7 +27,7 @@ import static school.hei.haapi.endpoint.rest.model.UpdatePromotionSGroup.TypeEnum.REMOVE; import static school.hei.haapi.integration.ManagerIT.manager1; import static school.hei.haapi.integration.MpbsIT.expectedMpbs1; -import static school.hei.haapi.integration.StudentIT.student3; +import static school.hei.haapi.integration.conf.utils.MockObjects.student3; import static school.hei.haapi.model.exception.ApiException.ExceptionType.SERVER_EXCEPTION; import static software.amazon.awssdk.core.internal.util.ChunkContentUtils.CRLF; @@ -106,7 +103,6 @@ import school.hei.haapi.endpoint.rest.security.cognito.CognitoComponent; import school.hei.haapi.http.model.TransactionDetails; import school.hei.haapi.service.aws.FileService; -import school.hei.haapi.service.mobileMoney.MobileMoneyApiFacade; import software.amazon.awssdk.services.eventbridge.EventBridgeClient; import software.amazon.awssdk.services.eventbridge.model.PutEventsRequest; import software.amazon.awssdk.services.eventbridge.model.PutEventsResponse; @@ -221,14 +217,6 @@ public static ApiClient anApiClient(String token, int serverPort) { return client; } - public static void setUpMobilePaymentApi(MobileMoneyApiFacade mobilePaymentApi) { - when(mobilePaymentApi.getByTransactionRef(MVOLA, "psp2_id")).thenReturn(psp2Verification()); - when(mobilePaymentApi.getByTransactionRef(ORANGE_MONEY, "psp2_id")) - .thenThrow(school.hei.haapi.model.exception.ApiException.class); - when(mobilePaymentApi.getByTransactionRef(AIRTEL_MONEY, "psp2_id")) - .thenThrow(school.hei.haapi.model.exception.ApiException.class); - } - public static void setUpCognito(CognitoComponent cognitoComponent) { when(cognitoComponent.getEmailByIdToken(BAD_TOKEN)).thenReturn(null); when(cognitoComponent.getEmailByIdToken(STUDENT1_TOKEN)).thenReturn("test+ryan@hei.school"); diff --git a/src/test/java/school/hei/haapi/service/PaymentServiceTest.java b/src/test/java/school/hei/haapi/service/PaymentServiceTest.java index fde6fe53f9..1db35de4d6 100644 --- a/src/test/java/school/hei/haapi/service/PaymentServiceTest.java +++ b/src/test/java/school/hei/haapi/service/PaymentServiceTest.java @@ -19,7 +19,6 @@ import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import static school.hei.haapi.model.User.Sex.F; -import static school.hei.haapi.model.User.Sex.M; import java.time.Instant; import java.time.LocalDate; @@ -131,21 +130,6 @@ void compute_user_status_after_paying_fee_ok() { assertEquals(User.Status.ENABLED, userPaidAllLateFees.getStatus()); } - public static Fee student1UnpaidFee1() { - Fee associatedFee = new Fee(); - associatedFee.setId("fee3_id"); - associatedFee.setStudent(student1()); - associatedFee.setType(TUITION); - associatedFee.setComment("Comment"); - associatedFee.setRemainingAmount(5000); - associatedFee.setTotalAmount(5000); - associatedFee.setStatus(LATE); - associatedFee.setCreationDatetime(Instant.parse("2022-12-08T08:25:24.00Z")); - associatedFee.setDueDatetime(Instant.parse("2023-02-08T08:30:24.00Z")); - associatedFee.setUpdatedAt(Instant.parse("2021-12-09T08:25:24.00Z")); - return associatedFee; - } - public static Fee student2UnpaidFee1() { Fee associatedFee = new Fee(); associatedFee.setId("fee4_id"); @@ -176,22 +160,6 @@ public static Fee student2UnpaidFee2() { return associatedFee; } - public static User student1() { - User student1 = new User(); - student1.setId("student1_id"); - student1.setFirstName("Ryan"); - student1.setLastName("Andria"); - student1.setEmail("test+ryan@hei.school"); - student1.setRef("STD21001"); - student1.setStatus(User.Status.ENABLED); - student1.setSex(M); - student1.setBirthDate(LocalDate.parse("2000-01-01")); - student1.setEntranceDatetime(Instant.now()); - student1.setPhone("0123456789"); - student1.setAddress("Example Address"); - return student1; - } - public static User student2() { User student2 = new User(); student2.setId("student2_id"); diff --git a/src/test/java/school/hei/haapi/service/UserServiceTest.java b/src/test/java/school/hei/haapi/service/UserServiceTest.java index a1567f39da..f6dc86428f 100644 --- a/src/test/java/school/hei/haapi/service/UserServiceTest.java +++ b/src/test/java/school/hei/haapi/service/UserServiceTest.java @@ -48,7 +48,6 @@ void monitors_is_retrieve_by_student_id_ok() { } @Test - // TODO: void dao_can_handle_null_value_in_params() { List students = subject.getByCriteria( From 6e48bbccd2d6334f58b7e262f0f6dbc07ef3280b Mon Sep 17 00:00:00 2001 From: Kirisaki_VK Date: Tue, 15 Apr 2025 15:42:50 +0300 Subject: [PATCH 4/6] chore: fixed failing tests --- .../hei/haapi/integration/DirtyGroupIT.java | 93 +++++++++++++++++++ .../school/hei/haapi/integration/GroupIT.java | 40 +------- .../hei/haapi/integration/PaginationIT.java | 3 +- .../hei/haapi/integration/PaymentIT.java | 2 +- .../hei/haapi/integration/StudentIT.java | 29 +----- .../integration/conf/utils/TestUtils.java | 55 ++++++++--- .../hei/haapi/service/PaymentServiceTest.java | 2 +- 7 files changed, 144 insertions(+), 80 deletions(-) create mode 100644 src/test/java/school/hei/haapi/integration/DirtyGroupIT.java diff --git a/src/test/java/school/hei/haapi/integration/DirtyGroupIT.java b/src/test/java/school/hei/haapi/integration/DirtyGroupIT.java new file mode 100644 index 0000000000..be121b7761 --- /dev/null +++ b/src/test/java/school/hei/haapi/integration/DirtyGroupIT.java @@ -0,0 +1,93 @@ +package school.hei.haapi.integration; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD; +import static school.hei.haapi.integration.GroupIT.createGroupToGroup; +import static school.hei.haapi.integration.GroupIT.someCreatableGroup; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.isValidUUID; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.someCreatableStudent; + +import java.util.ArrayList; +import java.util.List; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.annotation.DirtiesContext; +import org.testcontainers.junit.jupiter.Testcontainers; +import school.hei.haapi.endpoint.rest.api.TeachingApi; +import school.hei.haapi.endpoint.rest.api.UsersApi; +import school.hei.haapi.endpoint.rest.client.ApiClient; +import school.hei.haapi.endpoint.rest.client.ApiException; +import school.hei.haapi.endpoint.rest.model.CreateGroup; +import school.hei.haapi.endpoint.rest.model.Group; +import school.hei.haapi.endpoint.rest.model.Student; +import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; +import school.hei.haapi.integration.conf.utils.TestUtils; +import software.amazon.awssdk.services.eventbridge.EventBridgeClient; + +@Testcontainers +@AutoConfigureMockMvc +@DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD) +public class DirtyGroupIT extends FacadeITMockedThirdParties { + @MockBean EventBridgeClient eventBridgeClientMock; + + private ApiClient anApiClient(String token) { + return TestUtils.anApiClient(token, localPort); + } + + @BeforeEach + void setUp() { + setUpCognito(cognitoComponentMock); + setUpEventBridge(eventBridgeClientMock); + } + + @Test + void manager_write_create_ok() throws ApiException { + ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); + CreateGroup toCreate3 = someCreatableGroup(new ArrayList<>()); + CreateGroup toCreate4 = someCreatableGroup(new ArrayList<>()); + TeachingApi api = new TeachingApi(manager1Client); + + List created = api.createOrUpdateGroups(List.of(toCreate3, toCreate4)); + + assertEquals(2, created.size()); + Group created3 = created.getFirst(); + assertTrue(isValidUUID(created3.getId())); + toCreate3.setId(created3.getId()); + assertNotNull(created3.getCreationDatetime()); + toCreate3.setCreationDatetime(created3.getCreationDatetime()); + + assertEquals(created3, createGroupToGroup(toCreate3)); + Group created4 = created.getFirst(); + assertTrue(isValidUUID(created4.getId())); + toCreate4.setId(created4.getId()); + assertNotNull(created4.getCreationDatetime()); + toCreate4.setCreationDatetime(created4.getCreationDatetime()); + assertEquals(created4, createGroupToGroup(toCreate3)); + } + + @Test + void manager_write_create_with_student_ok() throws ApiException { + ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); + TeachingApi api = new TeachingApi(manager1Client); + UsersApi usersApi = new UsersApi(manager1Client); + List studentsList = + usersApi.createOrUpdateStudents( + List.of(someCreatableStudent(), someCreatableStudent()), null); + + List studentIds = studentsList.stream().map(Student::getId).toList(); + CreateGroup toCreateWithStudents = someCreatableGroup(studentIds); + List createdWithStudent = api.createOrUpdateGroups(List.of(toCreateWithStudents)); + + List students = + api.getStudentsByGroupId(createdWithStudent.getFirst().getId(), 1, 10, null); + + assertEquals(2, students.size()); + } +} diff --git a/src/test/java/school/hei/haapi/integration/GroupIT.java b/src/test/java/school/hei/haapi/integration/GroupIT.java index 850163d818..cbe74fef02 100644 --- a/src/test/java/school/hei/haapi/integration/GroupIT.java +++ b/src/test/java/school/hei/haapi/integration/GroupIT.java @@ -3,42 +3,39 @@ import static java.util.UUID.randomUUID; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static school.hei.haapi.integration.conf.utils.MockObjects.student1; import static school.hei.haapi.integration.conf.utils.TestUtils.BAD_TOKEN; import static school.hei.haapi.integration.conf.utils.TestUtils.GROUP1_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; -import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT2_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; import static school.hei.haapi.integration.conf.utils.TestUtils.group3; import static school.hei.haapi.integration.conf.utils.TestUtils.group5; -import static school.hei.haapi.integration.conf.utils.TestUtils.isValidUUID; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import java.time.Instant; -import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.mock.mockito.MockBean; import org.testcontainers.junit.jupiter.Testcontainers; import school.hei.haapi.endpoint.rest.api.TeachingApi; import school.hei.haapi.endpoint.rest.client.ApiClient; import school.hei.haapi.endpoint.rest.client.ApiException; import school.hei.haapi.endpoint.rest.model.CreateGroup; import school.hei.haapi.endpoint.rest.model.Group; -import school.hei.haapi.endpoint.rest.model.Student; import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; import school.hei.haapi.integration.conf.utils.TestUtils; +import software.amazon.awssdk.services.eventbridge.EventBridgeClient; @Testcontainers @AutoConfigureMockMvc class GroupIT extends FacadeITMockedThirdParties { + @MockBean private EventBridgeClient eventBridgeClientMock; private ApiClient anApiClient(String token) { return TestUtils.anApiClient(token, localPort); @@ -182,37 +179,6 @@ void manager_read_ok() throws ApiException { assertFalse(groupsFilteredByStudentRef.contains(group3())); } - @Test - void manager_write_create_ok() throws ApiException { - ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); - CreateGroup toCreate3 = someCreatableGroup(new ArrayList<>()); - CreateGroup toCreate4 = someCreatableGroup(new ArrayList<>()); - CreateGroup toCreate5 = someCreatableGroup(List.of(STUDENT1_ID, STUDENT2_ID)); - - TeachingApi api = new TeachingApi(manager1Client); - List created = api.createOrUpdateGroups(List.of(toCreate3, toCreate4)); - List createdWithStudent = api.createOrUpdateGroups(List.of(toCreate5)); - List students = - api.getStudentsByGroupId(createdWithStudent.getFirst().getId(), 1, 10, null); - - assertEquals(2, created.size()); - Group created3 = created.getFirst(); - assertTrue(isValidUUID(created3.getId())); - toCreate3.setId(created3.getId()); - assertNotNull(created3.getCreationDatetime()); - toCreate3.setCreationDatetime(created3.getCreationDatetime()); - - assertEquals(created3, createGroupToGroup(toCreate3)); - Group created4 = created.getFirst(); - assertTrue(isValidUUID(created4.getId())); - toCreate4.setId(created4.getId()); - assertNotNull(created4.getCreationDatetime()); - toCreate4.setCreationDatetime(created4.getCreationDatetime()); - assertEquals(created4, createGroupToGroup(toCreate3)); - - assertEquals(2, students.size()); - } - @Test void manager_write_update_ok() throws ApiException { ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); diff --git a/src/test/java/school/hei/haapi/integration/PaginationIT.java b/src/test/java/school/hei/haapi/integration/PaginationIT.java index a9171066f4..e59d3b6b69 100644 --- a/src/test/java/school/hei/haapi/integration/PaginationIT.java +++ b/src/test/java/school/hei/haapi/integration/PaginationIT.java @@ -13,6 +13,7 @@ import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.TestUtils.someCreatableStudent; import static school.hei.haapi.integration.conf.utils.TestUtils.teacher1; import java.time.Instant; @@ -56,7 +57,7 @@ public void setUp() throws ApiException { private void someCreatableStudentList(int nbOfNewStudents) throws ApiException { List newStudents = new ArrayList<>(); for (int i = 0; i < nbOfNewStudents; i++) { - newStudents.add(StudentIT.someCreatableStudent()); + newStudents.add(someCreatableStudent()); } ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); UsersApi api = new UsersApi(manager1Client); diff --git a/src/test/java/school/hei/haapi/integration/PaymentIT.java b/src/test/java/school/hei/haapi/integration/PaymentIT.java index 410049b8d8..08d242a826 100644 --- a/src/test/java/school/hei/haapi/integration/PaymentIT.java +++ b/src/test/java/school/hei/haapi/integration/PaymentIT.java @@ -8,7 +8,6 @@ import static school.hei.haapi.endpoint.rest.model.EnableStatus.ENABLED; import static school.hei.haapi.endpoint.rest.model.EnableStatus.SUSPENDED; import static school.hei.haapi.endpoint.rest.model.FeeStatusEnum.PAID; -import static school.hei.haapi.integration.StudentIT.someCreatableStudent; import static school.hei.haapi.integration.conf.utils.MockObjects.student1; import static school.hei.haapi.integration.conf.utils.TestUtils.FEE1_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.FEE3_ID; @@ -30,6 +29,7 @@ import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.TestUtils.someCreatableStudent; import static school.hei.haapi.model.exception.ApiException.ExceptionType.SERVER_EXCEPTION; import jakarta.persistence.EntityManager; diff --git a/src/test/java/school/hei/haapi/integration/StudentIT.java b/src/test/java/school/hei/haapi/integration/StudentIT.java index 01fd5bee70..4a4f57c440 100644 --- a/src/test/java/school/hei/haapi/integration/StudentIT.java +++ b/src/test/java/school/hei/haapi/integration/StudentIT.java @@ -47,10 +47,10 @@ import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.TestUtils.someCreatableStudent; import static school.hei.haapi.integration.conf.utils.TestUtils.uploadProfilePicture; import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.javafaker.Faker; import java.io.IOException; import java.io.InputStream; import java.net.URI; @@ -59,7 +59,6 @@ import java.net.http.HttpResponse; import java.time.Instant; import java.time.LocalDate; -import java.time.ZoneId; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -104,28 +103,6 @@ private ApiClient anApiClient(String token) { return TestUtils.anApiClient(token, localPort); } - public static CrupdateStudent someCreatableStudent() { - CrupdateStudent student = new CrupdateStudent(); - Faker faker = new Faker(); - student.setId(null); - student.setFirstName(faker.name().firstName()); - student.setLastName(faker.name().lastName()); - student.setEmail("test+" + randomUUID() + "@hei.school"); - student.setRef("STD21" + (int) (Math.random() * 1_000_000)); - student.setPhone("03" + (int) (Math.random() * 1_000_000_000)); - student.setStatus(ENABLED); - student.setSex(Math.random() < 0.3 ? F : M); - Instant birthday = Instant.parse("1993-11-30T18:35:24.00Z"); - int ageOfEntrance = 14 + (int) (Math.random() * 20); - student.setBirthDate(birthday.atZone(ZoneId.systemDefault()).toLocalDate()); - student.setEntranceDatetime(birthday.plusSeconds(ageOfEntrance * 365L * 24L * 60L * 60L)); - student.setAddress(faker.address().fullAddress()); - student.specializationField(COMMON_CORE); - student.setCoordinates(coordinatesWithNullValues()); - - return student; - } - static List someCreatableStudentList(int nbOfStudent) { List studentList = new ArrayList<>(); for (int i = 0; i < nbOfStudent; i++) { @@ -577,13 +554,12 @@ void manager_read_by_last_name_ok() throws ApiException { api.getStudents( 1, 20, null, null, student2().getLastName(), null, null, null, null, null, null); - assertEquals(2, actualStudents.size()); + assertEquals(4, actualStudents.size()); assertTrue(actualStudents.contains(student2())); assertTrue(actualStudents.contains(student3())); } @Test - @Disabled("TODO") void manager_read_by_ref_and_last_name_ok() throws ApiException { ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); UsersApi api = new UsersApi(manager1Client); @@ -1010,7 +986,6 @@ void student_update_self_ko() throws ApiException { } @Test - @Disabled("TODO: check group1 students") void manager_read_group_students_ok() throws ApiException { ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); TeachingApi api = new TeachingApi(manager1Client); diff --git a/src/test/java/school/hei/haapi/integration/conf/utils/TestUtils.java b/src/test/java/school/hei/haapi/integration/conf/utils/TestUtils.java index 8ab615fee7..3c9778acda 100644 --- a/src/test/java/school/hei/haapi/integration/conf/utils/TestUtils.java +++ b/src/test/java/school/hei/haapi/integration/conf/utils/TestUtils.java @@ -23,14 +23,19 @@ import static school.hei.haapi.endpoint.rest.model.Observer.RoleEnum.TEACHER; import static school.hei.haapi.endpoint.rest.model.Scope.GLOBAL; import static school.hei.haapi.endpoint.rest.model.Scope.STUDENT; +import static school.hei.haapi.endpoint.rest.model.Sex.F; +import static school.hei.haapi.endpoint.rest.model.Sex.M; +import static school.hei.haapi.endpoint.rest.model.SpecializationField.COMMON_CORE; import static school.hei.haapi.endpoint.rest.model.UpdatePromotionSGroup.TypeEnum.ADD; import static school.hei.haapi.endpoint.rest.model.UpdatePromotionSGroup.TypeEnum.REMOVE; import static school.hei.haapi.integration.ManagerIT.manager1; import static school.hei.haapi.integration.MpbsIT.expectedMpbs1; +import static school.hei.haapi.integration.conf.utils.MockObjects.student1; import static school.hei.haapi.integration.conf.utils.MockObjects.student3; import static school.hei.haapi.model.exception.ApiException.ExceptionType.SERVER_EXCEPTION; import static software.amazon.awssdk.core.internal.util.ChunkContentUtils.CRLF; +import com.github.javafaker.Faker; import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -44,6 +49,7 @@ import java.nio.file.Paths; import java.time.Instant; import java.time.LocalDate; +import java.time.ZoneId; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -74,6 +80,7 @@ import school.hei.haapi.endpoint.rest.model.CrupdateGrade; import school.hei.haapi.endpoint.rest.model.CrupdateMonitor; import school.hei.haapi.endpoint.rest.model.CrupdatePromotion; +import school.hei.haapi.endpoint.rest.model.CrupdateStudent; import school.hei.haapi.endpoint.rest.model.CrupdateStudentFee; import school.hei.haapi.endpoint.rest.model.CrupdateTeacher; import school.hei.haapi.endpoint.rest.model.Event; @@ -885,27 +892,27 @@ public static Grade grade7() { } public static StudentGrade studentExamGrade1() { - return new StudentGrade().grade(grade1()).student(MockObjects.student1()); + return new StudentGrade().grade(grade1()).student(student1()); } public static StudentGrade studentExamGrade2() { - return new StudentGrade().grade(grade2()).student(MockObjects.student1()); + return new StudentGrade().grade(grade2()).student(student1()); } public static StudentGrade studentExamGrade3() { - return new StudentGrade().grade(grade3()).student(MockObjects.student1()); + return new StudentGrade().grade(grade3()).student(student1()); } public static StudentGrade studentExamGrade4() { - return new StudentGrade().grade(grade4()).student(MockObjects.student1()); + return new StudentGrade().grade(grade4()).student(student1()); } public static StudentGrade studentExamGrade5() { - return new StudentGrade().grade(grade5()).student(MockObjects.student1()); + return new StudentGrade().grade(grade5()).student(student1()); } public static StudentGrade studentGrade1() { - return new StudentGrade().grade(grade1()).student(MockObjects.student1()); + return new StudentGrade().grade(grade1()).student(student1()); } public static StudentGrade studentGrade2() { @@ -1163,7 +1170,7 @@ public static Comment comment1() { return new Comment() .id("comment1_id") .content("Good student") - .subject(MockObjects.student1()) + .subject(student1()) .observer(observerTeacher1()) .creationDatetime(Instant.parse("2021-11-09T08:26:24.00Z")); } @@ -1172,7 +1179,7 @@ public static Comment comment2() { return new Comment() .id("comment2_id") .content("Disruptive student") - .subject(MockObjects.student1()) + .subject(student1()) .observer(observerManager1()) .creationDatetime(Instant.parse("2021-11-09T09:26:24.00Z")); } @@ -1203,7 +1210,7 @@ public static Comment commentCreatedByManager() { .id("comment4_id") .content("Comment about student 1") .observer(observerManager1()) - .subject(MockObjects.student1()); + .subject(student1()); } public static Comment commentCreatedByTeacher() { @@ -1334,7 +1341,7 @@ public static GroupIdentifier createGroupIdentifier(Group group) { } public static EventParticipant student1MissEvent1() { - return createParticipant(MockObjects.student1(), MISSING, "event_participant1_id", "GRP21001"); + return createParticipant(student1(), MISSING, "event_participant1_id", "GRP21001"); } public static EventParticipant student3AttendEvent1() { @@ -1342,7 +1349,7 @@ public static EventParticipant student3AttendEvent1() { } public static EventParticipant student1AttendEvent2() { - return createParticipant(MockObjects.student1(), PRESENT, "event_participant3_id", "GRP21001"); + return createParticipant(student1(), PRESENT, "event_participant3_id", "GRP21001"); } public static EventParticipant student2AttendEvent2() { @@ -1587,7 +1594,7 @@ public static Letter letter1() { return new Letter() .id(LETTER1_ID) .ref(LETTER1_REF) - .user(toLetterStudent(MockObjects.student1())) + .user(toLetterStudent(student1())) .status(RECEIVED) .approvalDatetime(Instant.parse("2021-12-08T08:25:24.00Z")) .creationDatetime(Instant.parse("2021-11-08T08:25:24.00Z")) @@ -1599,7 +1606,7 @@ public static Letter letter2() { return new Letter() .id(LETTER2_ID) .ref(LETTER2_REF) - .user(toLetterStudent(MockObjects.student1())) + .user(toLetterStudent(student1())) .status(PENDING) .approvalDatetime(null) .creationDatetime(Instant.parse("2021-11-08T08:25:24.00Z")) @@ -1668,4 +1675,26 @@ public static int anAvailableRandomPort() { throw new RuntimeException(e); } } + + public static CrupdateStudent someCreatableStudent() { + CrupdateStudent student = new CrupdateStudent(); + Faker faker = new Faker(); + student.setId(null); + student.setFirstName(faker.name().firstName()); + student.setLastName(faker.name().lastName()); + student.setEmail("test+" + randomUUID() + "@hei.school"); + student.setRef("STD21" + (int) (Math.random() * 1_000_000)); + student.setPhone("03" + (int) (Math.random() * 1_000_000_000)); + student.setStatus(ENABLED); + student.setSex(Math.random() < 0.3 ? F : M); + Instant birthday = Instant.parse("1993-11-30T18:35:24.00Z"); + int ageOfEntrance = 14 + (int) (Math.random() * 20); + student.setBirthDate(birthday.atZone(ZoneId.systemDefault()).toLocalDate()); + student.setEntranceDatetime(birthday.plusSeconds(ageOfEntrance * 365L * 24L * 60L * 60L)); + student.setAddress(faker.address().fullAddress()); + student.specializationField(COMMON_CORE); + student.setCoordinates(coordinatesWithNullValues()); + + return student; + } } diff --git a/src/test/java/school/hei/haapi/service/PaymentServiceTest.java b/src/test/java/school/hei/haapi/service/PaymentServiceTest.java index 1db35de4d6..1d00a89c47 100644 --- a/src/test/java/school/hei/haapi/service/PaymentServiceTest.java +++ b/src/test/java/school/hei/haapi/service/PaymentServiceTest.java @@ -8,7 +8,6 @@ import static school.hei.haapi.endpoint.rest.model.FeeTypeEnum.HARDWARE; import static school.hei.haapi.endpoint.rest.model.FeeTypeEnum.TUITION; import static school.hei.haapi.integration.MpbsIT.createableMpbsFromFeeIdWithStudent1; -import static school.hei.haapi.integration.StudentIT.someCreatableStudent; import static school.hei.haapi.integration.conf.utils.TestUtils.FEE3_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.FEE6_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; @@ -18,6 +17,7 @@ import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; +import static school.hei.haapi.integration.conf.utils.TestUtils.someCreatableStudent; import static school.hei.haapi.model.User.Sex.F; import java.time.Instant; From 76cc372f5d6f7b370ef15ee5dbd39c29f2db82df Mon Sep 17 00:00:00 2001 From: Kirisaki_VK Date: Fri, 18 Apr 2025 08:41:46 +0300 Subject: [PATCH 5/6] chore: moved update tests to DirtyStudentIT --- better-format.sh | 10 ++ .../rest/controller/GradeController.java | 16 --- .../hei/haapi/integration/DirtyStudentIT.java | 119 ++++++++++++++++++ .../school/hei/haapi/integration/ExamIT.java | 2 +- .../school/hei/haapi/integration/GradeIT.java | 32 ----- .../hei/haapi/integration/GroupFlowIT.java | 6 +- .../school/hei/haapi/integration/GroupIT.java | 4 +- .../hei/haapi/integration/LetterIT.java | 2 + .../hei/haapi/integration/PromotionIT.java | 2 +- .../hei/haapi/integration/StudentIT.java | 107 +--------------- .../integration/conf/utils/MockObjects.java | 73 ++++++++++- .../integration/conf/utils/TestUtils.java | 103 +++++---------- 12 files changed, 242 insertions(+), 234 deletions(-) create mode 100755 better-format.sh create mode 100644 src/test/java/school/hei/haapi/integration/DirtyStudentIT.java diff --git a/better-format.sh b/better-format.sh new file mode 100755 index 0000000000..0c3095cb64 --- /dev/null +++ b/better-format.sh @@ -0,0 +1,10 @@ +#!/bin/sh +format () +{ + echo "Formating: $1" + java -jar ./google-java-format-1.23.0-all-deps.jar --replace $1 + echo "Done formating: $1" +} + +export -f format +find src -name "*.java" | parallel format diff --git a/src/main/java/school/hei/haapi/endpoint/rest/controller/GradeController.java b/src/main/java/school/hei/haapi/endpoint/rest/controller/GradeController.java index 42c27524d1..cf146608eb 100644 --- a/src/main/java/school/hei/haapi/endpoint/rest/controller/GradeController.java +++ b/src/main/java/school/hei/haapi/endpoint/rest/controller/GradeController.java @@ -45,22 +45,6 @@ public List getAllGradesOfStudent( return awardedCourseMapper.toRest(awardedCourses, student); } - // @GetMapping( - // value = "/groups/{group_id}/awarded_courses/" + - // "{awarded_course_id}/exams/{exam_id}/grades") - // public ExamDetail getExamGrades( - // @PathVariable("group_id") String groupId, - // @PathVariable("awarded_course_id") String awardedCourseId, - // @PathVariable("exam_id") String examId) { - // List grades = - // examService - // .getExamsByIdAndGroupIdAndAwardedCourseId(examId, awardedCourseId, groupId) - // .getGrades(); - // Exam exam = - // examService.getExamsByIdAndGroupIdAndAwardedCourseId(examId, awardedCourseId, groupId); - // return gradeMapper.toRestExamDetail(exam, grades); - // } - @GetMapping(value = "/exams/{exam_id}/students/{student_id}/grade") public StudentGrade getGradeOfStudentInOneExam( @PathVariable("exam_id") String examId, @PathVariable("student_id") String studentId) { diff --git a/src/test/java/school/hei/haapi/integration/DirtyStudentIT.java b/src/test/java/school/hei/haapi/integration/DirtyStudentIT.java new file mode 100644 index 0000000000..b2e6cd2978 --- /dev/null +++ b/src/test/java/school/hei/haapi/integration/DirtyStudentIT.java @@ -0,0 +1,119 @@ +package school.hei.haapi.integration; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD; +import static school.hei.haapi.endpoint.rest.model.EnableStatus.SUSPENDED; +import static school.hei.haapi.endpoint.rest.model.Sex.F; +import static school.hei.haapi.endpoint.rest.model.SpecializationField.EL; +import static school.hei.haapi.integration.conf.utils.MockObjects.createStudent2; +import static school.hei.haapi.integration.conf.utils.MockObjects.student2; +import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; +import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT2_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.coordinatesWithNullValues; +import static school.hei.haapi.integration.conf.utils.TestUtils.coordinatesWithValues; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; +import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; + +import java.time.Instant; +import java.time.LocalDate; +import java.util.List; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.annotation.DirtiesContext; +import org.testcontainers.junit.jupiter.Testcontainers; +import school.hei.haapi.endpoint.rest.api.UsersApi; +import school.hei.haapi.endpoint.rest.client.ApiClient; +import school.hei.haapi.endpoint.rest.client.ApiException; +import school.hei.haapi.endpoint.rest.model.CrupdateStudent; +import school.hei.haapi.endpoint.rest.model.Student; +import school.hei.haapi.integration.conf.FacadeITMockedThirdParties; +import school.hei.haapi.integration.conf.utils.TestUtils; +import software.amazon.awssdk.services.eventbridge.EventBridgeClient; + +@Testcontainers +@AutoConfigureMockMvc +@DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD) +public class DirtyStudentIT extends FacadeITMockedThirdParties { + @MockBean private EventBridgeClient mockEventBridgeClient; + + @BeforeEach + void setUp() { + setUpCognito(cognitoComponentMock); + setUpEventBridge(mockEventBridgeClient); + } + + private ApiClient anApiClient(String token) { + return TestUtils.anApiClient(token, localPort); + } + + @Test + void manager_update_student_to_suspended() throws ApiException { + ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); + UsersApi api = new UsersApi(manager1Client); + + List actual = + api.createOrUpdateStudents(List.of(createStudent2().status(SUSPENDED)), null); + Student updated = actual.getFirst(); + List suspended = + api.getStudents(1, 10, null, null, null, null, SUSPENDED, null, null, null, null); + + assertTrue(suspended.contains(updated)); + assertEquals(1, actual.size()); + } + + @Test + void manager_update_student_ok() throws ApiException { + ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); + UsersApi api = new UsersApi(manager1Client); + + CrupdateStudent student2ToUpdate = createStudent2(); + student2ToUpdate.setAddress("updated address"); + student2ToUpdate.setNic("updated nic"); + student2ToUpdate.setBirthPlace("updated birthplace"); + student2ToUpdate.setCoordinates(coordinatesWithValues()); + student2ToUpdate.setSpecializationField(EL); + student2ToUpdate.setHighSchoolOrigin("Lycée Saint Gabriel Mahajanga"); + + Student updatedStudent2 = student2(); + updatedStudent2.setBirthPlace("updated birthplace"); + updatedStudent2.setNic("updated nic"); + updatedStudent2.setSpecializationField(EL); + updatedStudent2.setAddress("updated address"); + updatedStudent2.setCoordinates(coordinatesWithValues()); + updatedStudent2.setHighSchoolOrigin("Lycée Saint Gabriel Mahajanga"); + + Student actualUpdated = api.updateStudent(STUDENT2_ID, student2ToUpdate); + + assertEquals(updatedStudent2, actualUpdated); + } + + @Test + void manager_write_suspended_student() throws ApiException { + ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); + UsersApi api = new UsersApi(manager1Client); + CrupdateStudent creatableSuspendedStudent = + new CrupdateStudent() + .firstName("Suspended") + .lastName("Two") + .email("test+suspended2@hei.school") + .ref("STD29004") + .status(SUSPENDED) + .sex(F) + .birthDate(LocalDate.parse("2000-12-02")) + .entranceDatetime(Instant.parse("2021-11-09T08:26:24.00Z")) + .phone("0322411124") + .address("Adr 3") + .coordinates(coordinatesWithNullValues()); + + List actual = api.createOrUpdateStudents(List.of(creatableSuspendedStudent), null); + Student created = actual.get(0); + List suspended = + api.getStudents(1, 10, null, "Suspended", null, null, SUSPENDED, null, null, null, null); + + assertTrue(suspended.contains(created)); + assertEquals(1, actual.size()); + } +} diff --git a/src/test/java/school/hei/haapi/integration/ExamIT.java b/src/test/java/school/hei/haapi/integration/ExamIT.java index 1d8a794073..c71f969854 100644 --- a/src/test/java/school/hei/haapi/integration/ExamIT.java +++ b/src/test/java/school/hei/haapi/integration/ExamIT.java @@ -3,6 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import static school.hei.haapi.integration.conf.utils.MockObjects.group1; import static school.hei.haapi.integration.conf.utils.MockObjects.student1; import static school.hei.haapi.integration.conf.utils.TestUtils.AWARDED_COURSE1_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.EXAM1_ID; @@ -18,7 +19,6 @@ import static school.hei.haapi.integration.conf.utils.TestUtils.exam3; import static school.hei.haapi.integration.conf.utils.TestUtils.exam4; import static school.hei.haapi.integration.conf.utils.TestUtils.exam5; -import static school.hei.haapi.integration.conf.utils.TestUtils.group1; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import static school.hei.haapi.integration.conf.utils.TestUtils.studentGrade1; diff --git a/src/test/java/school/hei/haapi/integration/GradeIT.java b/src/test/java/school/hei/haapi/integration/GradeIT.java index 8d97231440..5b1d0b6540 100644 --- a/src/test/java/school/hei/haapi/integration/GradeIT.java +++ b/src/test/java/school/hei/haapi/integration/GradeIT.java @@ -119,38 +119,6 @@ void student_read_other_grade_ko() { assertThrowsForbiddenException(() -> api.getParticipantGrade(GROUP1_ID, EXAM1_ID)); } - // @Test - // void student_read_ko() throws ApiException { - // ApiClient student1Client = anApiClient(STUDENT1_TOKEN); - // TeachingApi api = new TeachingApi(student1Client); - // assertThrowsForbiddenException( - // () -> api.getExamGrades(GROUP1_ID, EXAM1_ID, AWARDED_COURSE1_ID)); - // } - - // void manager_create_grades_ok() throws ApiException { - // ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); - // TeachingApi api = new TeachingApi(manager1Client); - // List actual = - // api.createStudentExamGrade( - // GROUP1_ID, - // AWARDED_COURSE1_ID, - // EXAM1_ID, - // List.of(createGrade(STUDENT1_ID, EXAM1_ID, AWARDED_COURSE1_ID))); - // assertEquals(1, actual.size()); - // } - - // void teacher_create_his_exam_grades_ok() throws ApiException { - // ApiClient teacher1Client = anApiClient(TEACHER1_TOKEN); - // TeachingApi api = new TeachingApi(teacher1Client); - // List actual = - // api.createStudentExamGrade( - // GROUP1_ID, - // AWARDED_COURSE1_ID, - // EXAM1_ID, - // List.of(createGrade(STUDENT1_ID, EXAM1_ID, AWARDED_COURSE1_ID))); - // assertEquals(1, actual.size()); - // } - @Test void manager_crupdate_grade_ok() throws ApiException { ApiClient managerClient = anApiClient(MANAGER1_TOKEN); diff --git a/src/test/java/school/hei/haapi/integration/GroupFlowIT.java b/src/test/java/school/hei/haapi/integration/GroupFlowIT.java index d2ff86b955..1ca2e54d18 100644 --- a/src/test/java/school/hei/haapi/integration/GroupFlowIT.java +++ b/src/test/java/school/hei/haapi/integration/GroupFlowIT.java @@ -5,6 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static school.hei.haapi.endpoint.rest.model.CreateGroupFlow.MoveTypeEnum.JOIN; import static school.hei.haapi.endpoint.rest.model.CreateGroupFlow.MoveTypeEnum.LEAVE; +import static school.hei.haapi.integration.conf.utils.MockObjects.group1; +import static school.hei.haapi.integration.conf.utils.MockObjects.group2; import static school.hei.haapi.integration.conf.utils.MockObjects.student1; import static school.hei.haapi.integration.conf.utils.MockObjects.student2; import static school.hei.haapi.integration.conf.utils.TestUtils.GROUP1_ID; @@ -13,14 +15,13 @@ import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT2_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsApiException; -import static school.hei.haapi.integration.conf.utils.TestUtils.group1; -import static school.hei.haapi.integration.conf.utils.TestUtils.group2; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; import java.util.List; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.mock.mockito.MockBean; @@ -101,6 +102,7 @@ void insert_two_student_in_same_group_ko() throws ApiException { } @Test + @Disabled("TODO: Move to dirty") void manager_moves_student2_to_group2_ok() throws ApiException { ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); TeachingApi api = new TeachingApi(manager1Client); diff --git a/src/test/java/school/hei/haapi/integration/GroupIT.java b/src/test/java/school/hei/haapi/integration/GroupIT.java index cbe74fef02..145adbe703 100644 --- a/src/test/java/school/hei/haapi/integration/GroupIT.java +++ b/src/test/java/school/hei/haapi/integration/GroupIT.java @@ -4,6 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import static school.hei.haapi.integration.conf.utils.MockObjects.group3; +import static school.hei.haapi.integration.conf.utils.MockObjects.group5; import static school.hei.haapi.integration.conf.utils.MockObjects.student1; import static school.hei.haapi.integration.conf.utils.TestUtils.BAD_TOKEN; import static school.hei.haapi.integration.conf.utils.TestUtils.GROUP1_ID; @@ -11,8 +13,6 @@ import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN; import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; -import static school.hei.haapi.integration.conf.utils.TestUtils.group3; -import static school.hei.haapi.integration.conf.utils.TestUtils.group5; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service; diff --git a/src/test/java/school/hei/haapi/integration/LetterIT.java b/src/test/java/school/hei/haapi/integration/LetterIT.java index e1fcbced50..934848c383 100644 --- a/src/test/java/school/hei/haapi/integration/LetterIT.java +++ b/src/test/java/school/hei/haapi/integration/LetterIT.java @@ -41,6 +41,7 @@ import java.net.http.HttpResponse; import java.util.List; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; @@ -270,6 +271,7 @@ void manager_create_and_update_students_letter() } @Test + @Disabled("TODO: dirties some EventIT tests") void test_letter_linked_with_event_participant() throws IOException, InterruptedException, ApiException { ApiClient apiClient = anApiClient(MANAGER1_TOKEN); diff --git a/src/test/java/school/hei/haapi/integration/PromotionIT.java b/src/test/java/school/hei/haapi/integration/PromotionIT.java index 4788ea1cab..e3aab2c2a0 100644 --- a/src/test/java/school/hei/haapi/integration/PromotionIT.java +++ b/src/test/java/school/hei/haapi/integration/PromotionIT.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import static school.hei.haapi.integration.conf.utils.MockObjects.group5; import static school.hei.haapi.integration.conf.utils.MockObjects.student1; import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; import static school.hei.haapi.integration.conf.utils.TestUtils.PROMOTION1_ID; @@ -14,7 +15,6 @@ import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; import static school.hei.haapi.integration.conf.utils.TestUtils.createGroupIdentifier; import static school.hei.haapi.integration.conf.utils.TestUtils.createPromotion4; -import static school.hei.haapi.integration.conf.utils.TestUtils.group5; import static school.hei.haapi.integration.conf.utils.TestUtils.promotion21; import static school.hei.haapi.integration.conf.utils.TestUtils.promotion22; import static school.hei.haapi.integration.conf.utils.TestUtils.promotion23; diff --git a/src/test/java/school/hei/haapi/integration/StudentIT.java b/src/test/java/school/hei/haapi/integration/StudentIT.java index 4a4f57c440..ab4bde491d 100644 --- a/src/test/java/school/hei/haapi/integration/StudentIT.java +++ b/src/test/java/school/hei/haapi/integration/StudentIT.java @@ -17,11 +17,11 @@ import static school.hei.haapi.endpoint.rest.model.Sex.F; import static school.hei.haapi.endpoint.rest.model.Sex.M; import static school.hei.haapi.endpoint.rest.model.SpecializationField.COMMON_CORE; -import static school.hei.haapi.endpoint.rest.model.SpecializationField.EL; import static school.hei.haapi.endpoint.rest.model.WorkStudyStatus.NOT_WORKING; import static school.hei.haapi.endpoint.rest.model.WorkStudyStatus.WORKING; import static school.hei.haapi.integration.GroupIT.updatedGroup3; import static school.hei.haapi.integration.GroupIT.updatedGroup5; +import static school.hei.haapi.integration.conf.utils.MockObjects.group3; import static school.hei.haapi.integration.conf.utils.MockObjects.student1; import static school.hei.haapi.integration.conf.utils.MockObjects.student2; import static school.hei.haapi.integration.conf.utils.MockObjects.student3; @@ -32,7 +32,6 @@ import static school.hei.haapi.integration.conf.utils.TestUtils.PROMOTION1_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN; -import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT2_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT3_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT8_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT8_TOKEN; @@ -40,9 +39,7 @@ import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsApiException; import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException; import static school.hei.haapi.integration.conf.utils.TestUtils.coordinatesWithNullValues; -import static school.hei.haapi.integration.conf.utils.TestUtils.coordinatesWithValues; import static school.hei.haapi.integration.conf.utils.TestUtils.getMockedFile; -import static school.hei.haapi.integration.conf.utils.TestUtils.group3; import static school.hei.haapi.integration.conf.utils.TestUtils.requestFile; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; @@ -111,26 +108,6 @@ static List someCreatableStudentList(int nbOfStudent) { return studentList; } - public static CrupdateStudent createStudent2() { - CrupdateStudent student = new CrupdateStudent(); - student.setId("student2_id"); - student.setFirstName("Two"); - student.setLastName("Student"); - student.setEmail("test+student2@hei.school"); - student.setRef("STD21002"); - student.setPhone("0322411124"); - student.setStatus(ENABLED); - student.setSex(F); - student.setBirthDate(LocalDate.parse("2000-01-02")); - student.setEntranceDatetime(Instant.parse("2021-11-09T08:26:24.00Z")); - student.setAddress("Adr 2"); - student.setBirthPlace(""); - student.setNic(""); - student.setCoordinates(coordinatesWithNullValues()); - - return student; - } - static Student disabledStudent1() { return new Student() .id("student4_id") @@ -153,21 +130,6 @@ static Student disabledStudent1() { .isRepeatingYear(false); } - static CrupdateStudent creatableSuspendedStudent() { - return new CrupdateStudent() - .firstName("Suspended") - .lastName("Two") - .email("test+suspended2@hei.school") - .ref("STD29004") - .status(SUSPENDED) - .sex(F) - .birthDate(LocalDate.parse("2000-12-02")) - .entranceDatetime(Instant.parse("2021-11-09T08:26:24.00Z")) - .phone("0322411124") - .address("Adr 3") - .coordinates(coordinatesWithNullValues()); - } - static Student suspendedStudent1() { return new Student() .id("student6_id") @@ -379,7 +341,6 @@ void student_read_ko() { } @Test - @Disabled("TODO") void teacher_read_ok() throws ApiException { ApiClient teacher1Client = anApiClient(TEACHER1_TOKEN); UsersApi api = new UsersApi(teacher1Client); @@ -406,7 +367,6 @@ void manager_read_by_disabled_status_ok() throws ApiException { } @Test - @Disabled("TODO") void manager_read_by_suspended_status_ok() throws ApiException { ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); UsersApi api = new UsersApi(manager1Client); @@ -418,7 +378,6 @@ void manager_read_by_suspended_status_ok() throws ApiException { } @Test - @Disabled("TODO") void manager_read_by_work_status_ok() throws ApiException { ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); UsersApi api = new UsersApi(manager1Client); @@ -457,7 +416,6 @@ void teacher_write_ko() { } @Test - @Disabled("TODO") void manager_read_ok() throws ApiException { ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); UsersApi api = new UsersApi(manager1Client); @@ -495,7 +453,6 @@ void manager_read_displayed_commitment_date() throws ApiException, InterruptedEx } @Test - @Disabled("TODO") void manager_read_by_ref_and_name_ok() throws ApiException { ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); UsersApi api = new UsersApi(manager1Client); @@ -519,7 +476,6 @@ void manager_read_by_ref_and_name_ok() throws ApiException { } @Test - @Disabled("TODO") void manager_read_by_ref_ignoring_case_ok() throws ApiException { ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); UsersApi api = new UsersApi(manager1Client); @@ -533,7 +489,6 @@ void manager_read_by_ref_ignoring_case_ok() throws ApiException { } @Test - @Disabled("TODO") void manager_read_by_ref_ok() throws ApiException { ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); UsersApi api = new UsersApi(manager1Client); @@ -606,7 +561,6 @@ void manager_read_by_ref_and_bad_name_ko() throws ApiException { } @Test - @Disabled("TODO") void monitor_read_students_ok() throws ApiException { ApiClient monitorClient = anApiClient(MONITOR1_TOKEN); UsersApi api = new UsersApi(monitorClient); @@ -828,34 +782,6 @@ void manager_write_update_triggers_userUpserted() throws ApiException { } @Test - @Disabled("dirty") - void manager_update_student_ok() throws ApiException { - ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); - UsersApi api = new UsersApi(manager1Client); - - CrupdateStudent student2ToUpdate = createStudent2(); - student2ToUpdate.setAddress("updated address"); - student2ToUpdate.setNic("updated nic"); - student2ToUpdate.setBirthPlace("updated birthplace"); - student2ToUpdate.setCoordinates(coordinatesWithValues()); - student2ToUpdate.setSpecializationField(EL); - student2ToUpdate.setHighSchoolOrigin("Lycée Saint Gabriel Mahajanga"); - - Student updatedStudent2 = student2(); - updatedStudent2.setBirthPlace("updated birthplace"); - updatedStudent2.setNic("updated nic"); - updatedStudent2.setSpecializationField(EL); - updatedStudent2.setAddress("updated address"); - updatedStudent2.setCoordinates(coordinatesWithValues()); - updatedStudent2.setHighSchoolOrigin("Lycée Saint Gabriel Mahajanga"); - - Student actualUpdated = api.updateStudent(STUDENT2_ID, student2ToUpdate); - - assertEquals(updatedStudent2, actualUpdated); - } - - @Test - @Disabled("TODO") void manager_read_students_by_commitment_begin() throws ApiException { ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); UsersApi api = new UsersApi(manager1Client); @@ -878,37 +804,6 @@ void manager_read_students_by_commitment_begin() throws ApiException { assertTrue(actual.containsAll(List.of(student1(), student2()))); } - @Test - @Disabled("dirty") - void manager_write_suspended_student() throws ApiException { - ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); - UsersApi api = new UsersApi(manager1Client); - - List actual = api.createOrUpdateStudents(List.of(creatableSuspendedStudent()), null); - Student created = actual.get(0); - List suspended = - api.getStudents(1, 10, null, "Suspended", null, null, SUSPENDED, null, null, null, null); - - assertTrue(suspended.contains(created)); - assertEquals(1, actual.size()); - } - - @Test - @Disabled("dirty") - void manager_update_student_to_suspended() throws ApiException { - ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); - UsersApi api = new UsersApi(manager1Client); - - List actual = - api.createOrUpdateStudents(List.of(createStudent2().status(SUSPENDED)), null); - Student updated = actual.getFirst(); - List suspended = - api.getStudents(1, 10, null, null, null, null, SUSPENDED, null, null, null, null); - - assertTrue(suspended.contains(updated)); - assertEquals(1, actual.size()); - } - @Test void stats_are_exact() throws ApiException { ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); diff --git a/src/test/java/school/hei/haapi/integration/conf/utils/MockObjects.java b/src/test/java/school/hei/haapi/integration/conf/utils/MockObjects.java index 1a9477dddd..a141871529 100644 --- a/src/test/java/school/hei/haapi/integration/conf/utils/MockObjects.java +++ b/src/test/java/school/hei/haapi/integration/conf/utils/MockObjects.java @@ -7,12 +7,16 @@ import static school.hei.haapi.endpoint.rest.model.SpecializationField.COMMON_CORE; import static school.hei.haapi.endpoint.rest.model.WorkStudyStatus.NOT_WORKING; import static school.hei.haapi.endpoint.rest.model.WorkStudyStatus.WORKING; +import static school.hei.haapi.integration.conf.utils.TestUtils.GROUP1_ID; +import static school.hei.haapi.integration.conf.utils.TestUtils.GROUP2_ID; import static school.hei.haapi.integration.conf.utils.TestUtils.coordinatesWithNullValues; import java.time.Instant; import java.time.LocalDate; import java.util.List; import school.hei.haapi.endpoint.rest.model.Coordinates; +import school.hei.haapi.endpoint.rest.model.CrupdateStudent; +import school.hei.haapi.endpoint.rest.model.Group; import school.hei.haapi.endpoint.rest.model.Student; public class MockObjects { @@ -37,7 +41,7 @@ public static Student student1() { student.setWorkStudyStatus(WORKING); student.setProfessionalExperience(WORKER_STUDENT); student.setCommitmentBeginDate(Instant.parse("2021-11-08T08:25:24Z")); - student.setGroups(List.of(TestUtils.group1(), TestUtils.group2())); + student.setGroups(List.of(group1(), group2())); student.setIsRepeatingYear(false); return student; } @@ -63,7 +67,7 @@ public static Student student2() { student.setWorkStudyStatus(WORKING); student.setProfessionalExperience(WORKER_STUDENT); student.setCommitmentBeginDate(Instant.parse("2021-11-08T08:25:24.00Z")); - student.setGroups(List.of(TestUtils.group1())); + student.setGroups(List.of(group1())); student.setIsRepeatingYear(false); return student; } @@ -91,4 +95,69 @@ public static Student student3() { student.setIsRepeatingYear(false); return student; } + + public static CrupdateStudent createStudent2() { + CrupdateStudent student = new CrupdateStudent(); + student.setId("student2_id"); + student.setFirstName("Two"); + student.setLastName("Student"); + student.setEmail("test+student2@hei.school"); + student.setRef("STD21002"); + student.setPhone("0322411124"); + student.setStatus(ENABLED); + student.setSex(F); + student.setBirthDate(LocalDate.parse("2000-01-02")); + student.setEntranceDatetime(Instant.parse("2021-11-09T08:26:24.00Z")); + student.setAddress("Adr 2"); + student.setBirthPlace(""); + student.setNic(""); + student.setCoordinates(coordinatesWithNullValues()); + + return student; + } + + public static Group group1() { + return new Group() + .id(GROUP1_ID) + .ref("G1") + .name("GRP21001") + .creationDatetime(Instant.parse("2021-11-08T08:25:24.00Z")) + .size(2); + } + + public static Group group2() { + return new Group() + .id(GROUP2_ID) + .ref("G2") + .name("GRP21002") + .creationDatetime(Instant.parse("2021-11-08T08:30:24.00Z")) + .size(1); + } + + public static Group group3() { + return new Group() + .id("group3_id") + .ref("H1") + .name("GRP22001") + .creationDatetime(Instant.parse("2021-11-08T08:30:24.00Z")) + .size(0); + } + + public static Group group4() { + return new Group() + .id("group4_id") + .ref("H2") + .name("GRP22002") + .creationDatetime(Instant.parse("2021-11-08T08:30:24.00Z")) + .size(0); + } + + public static Group group5() { + return new Group() + .id("group5_id") + .ref("J1") + .name("GRP23001") + .creationDatetime(Instant.parse("2021-11-08T08:30:24.00Z")) + .size(0); + } } diff --git a/src/test/java/school/hei/haapi/integration/conf/utils/TestUtils.java b/src/test/java/school/hei/haapi/integration/conf/utils/TestUtils.java index 3c9778acda..dcc294939e 100644 --- a/src/test/java/school/hei/haapi/integration/conf/utils/TestUtils.java +++ b/src/test/java/school/hei/haapi/integration/conf/utils/TestUtils.java @@ -31,6 +31,7 @@ import static school.hei.haapi.integration.ManagerIT.manager1; import static school.hei.haapi.integration.MpbsIT.expectedMpbs1; import static school.hei.haapi.integration.conf.utils.MockObjects.student1; +import static school.hei.haapi.integration.conf.utils.MockObjects.student2; import static school.hei.haapi.integration.conf.utils.MockObjects.student3; import static school.hei.haapi.model.exception.ApiException.ExceptionType.SERVER_EXCEPTION; import static software.amazon.awssdk.core.internal.util.ChunkContentUtils.CRLF; @@ -387,7 +388,7 @@ public static AwardedCourse updatedAwardedCourse2() { return new AwardedCourse() .id(AWARDED_COURSE2_ID) .course(course2()) - .group(group2()) + .group(MockObjects.group2()) .mainTeacher(teacher2()); } @@ -457,51 +458,6 @@ public static List someCreatableExamInfoList(int nbOfExamInfo) { return examInfoList; } - public static Group group1() { - return new Group() - .id(GROUP1_ID) - .ref("G1") - .name("GRP21001") - .creationDatetime(Instant.parse("2021-11-08T08:25:24.00Z")) - .size(2); - } - - public static Group group2() { - return new Group() - .id(GROUP2_ID) - .ref("G2") - .name("GRP21002") - .creationDatetime(Instant.parse("2021-11-08T08:30:24.00Z")) - .size(1); - } - - public static Group group3() { - return new Group() - .id("group3_id") - .ref("H1") - .name("GRP22001") - .creationDatetime(Instant.parse("2021-11-08T08:30:24.00Z")) - .size(0); - } - - public static Group group4() { - return new Group() - .id("group4_id") - .ref("H2") - .name("GRP22002") - .creationDatetime(Instant.parse("2021-11-08T08:30:24.00Z")) - .size(0); - } - - public static Group group5() { - return new Group() - .id("group5_id") - .ref("J1") - .name("GRP23001") - .creationDatetime(Instant.parse("2021-11-08T08:30:24.00Z")) - .size(0); - } - public static Teacher teacher1() { return new Teacher() .id("teacher1_id") @@ -754,7 +710,7 @@ public static AwardedCourse awardedCourse1() { return new AwardedCourse() .id(AWARDED_COURSE1_ID) .course(course1()) - .group(group1()) + .group(MockObjects.group1()) .mainTeacher(teacher1()); } @@ -762,7 +718,7 @@ public static AwardedCourse awardedCourse2() { return new AwardedCourse() .id(AWARDED_COURSE2_ID) .course(course1()) - .group(group1()) + .group(MockObjects.group1()) .mainTeacher(teacher2()); } @@ -770,7 +726,7 @@ public static AwardedCourse awardedCourse3() { return new AwardedCourse() .id(AWARDED_COURSE3_ID) .course(course1()) - .group(group2()) + .group(MockObjects.group2()) .mainTeacher(teacher2()); } @@ -778,7 +734,7 @@ public static AwardedCourse awardedCourse4() { return new AwardedCourse() .id(AWARDED_COURSE4_ID) .course(course2()) - .group(group1()) + .group(MockObjects.group1()) .mainTeacher(teacher4()); } @@ -994,15 +950,6 @@ public static FeeTemplate feeTemplate2() { .type(TUITION); } - // public static ExamDetail examDetail1() { - // return new ExamDetail() - // .id(exam1().getId()) - // .title(exam1().getTitle()) - // .examinationDate(exam1().getExaminationDate()) - // .coefficient(exam1().getCoefficient()) - // .participants(List.of(studentGrade1(), studentGrade7())); - // } - public static AwardedCourseExam awardedCourseExam1() { return new AwardedCourseExam() .id(AWARDED_COURSE1_ID) @@ -1188,7 +1135,7 @@ public static Comment comment3() { return new Comment() .id("comment3_id") .content("Nothing to say here") - .subject(MockObjects.student2()) + .subject(student2()) .observer(observerTeacher1()) .creationDatetime(Instant.parse("2021-11-09T10:26:24.00Z")); } @@ -1267,7 +1214,7 @@ public static Event event1() { .title("PROG1") .planner(planner1()) .count(new EventStats().late(0).missing(1).present(1).total(2)) - .groups(List.of(createGroupIdentifier(group1()))); + .groups(List.of(createGroupIdentifier(MockObjects.group1()))); } public static CreateEvent creatableEvent1() { @@ -1296,7 +1243,10 @@ public static Event event2() { .title("Integration Day") .count(new EventStats().total(3).missing(1).present(2).late(0)) .description("HEI students integration day") - .groups(List.of(createGroupIdentifier(group1()), createGroupIdentifier(group2()))); + .groups( + List.of( + createGroupIdentifier(MockObjects.group1()), + createGroupIdentifier(MockObjects.group2()))); } public static Event event3() { @@ -1353,7 +1303,7 @@ public static EventParticipant student1AttendEvent2() { } public static EventParticipant student2AttendEvent2() { - return createParticipant(MockObjects.student2(), PRESENT, "event_participant4_id", "GRP21002"); + return createParticipant(student2(), PRESENT, "event_participant4_id", "GRP21002"); } public static EventParticipant student3MissEvent2() { @@ -1369,7 +1319,7 @@ public static CreateEvent createEventCourse1() { .description("Another Prog1 course") .eventType(COURSE) .plannerId(MANAGER_ID) - .groups(List.of(createGroupIdentifier(group1()))); + .groups(List.of(createGroupIdentifier(MockObjects.group1()))); } public static CreateEvent someCreatableEventByManager1(EventType eventType) { @@ -1390,7 +1340,7 @@ public static CreateEvent someCreatableEvent( .description("Another event") .eventType(eventType) .plannerId(planerId) - .groups(List.of(createGroupIdentifier(group1()))); + .groups(List.of(createGroupIdentifier(MockObjects.group1()))); } public static CreateFee createFeeForTest() { @@ -1413,7 +1363,10 @@ public static CreateEvent createIntegrationEvent() { .description("Another Prog1 course") .eventType(INTEGRATION) .plannerId(MANAGER_ID) - .groups(List.of(createGroupIdentifier(group1()), createGroupIdentifier(group2()))); + .groups( + List.of( + createGroupIdentifier(MockObjects.group1()), + createGroupIdentifier(MockObjects.group2()))); } public static Event expectedCourseEventCreated() { @@ -1502,7 +1455,7 @@ public static CreateAnnouncement createAnnouncementWithGroupTarget() { .title("Cours de PROG1") .authorId(MANAGER_ID) .content("Cours prévu pour la semaine prochaine") - .targetGroupList(List.of(createGroupIdentifier(group1()))); + .targetGroupList(List.of(createGroupIdentifier(MockObjects.group1()))); } public static CreateAnnouncement teacherCreateAnnouncementForManager() { @@ -1536,7 +1489,10 @@ public static Promotion promotion21() { .ref("PROM21") .name("Promotion 2021-2022") .creationDatetime(Instant.parse("2021-11-08T08:30:24.00Z")) - .groups(List.of(createGroupIdentifier(group1()), createGroupIdentifier(group2()))); + .groups( + List.of( + createGroupIdentifier(MockObjects.group1()), + createGroupIdentifier(MockObjects.group2()))); } public static Promotion promotion22() { @@ -1545,7 +1501,10 @@ public static Promotion promotion22() { .ref("PROM22") .name("Promotion 2022-2023") .creationDatetime(Instant.parse("2021-11-08T08:30:24.00Z")) - .groups(List.of(createGroupIdentifier(group3()), createGroupIdentifier(group4()))); + .groups( + List.of( + createGroupIdentifier(MockObjects.group3()), + createGroupIdentifier(MockObjects.group4()))); } public static Promotion promotion23() { @@ -1618,7 +1577,7 @@ public static Letter letter3() { return new Letter() .id(LETTER3_ID) .ref(LETTER3_REF) - .user(toLetterStudent(MockObjects.student2())) + .user(toLetterStudent(student2())) .status(PENDING) .approvalDatetime(null) .creationDatetime(Instant.parse("2021-11-08T08:25:24.00Z")) @@ -1627,11 +1586,11 @@ public static Letter letter3() { } public static UpdatePromotionSGroup addGroupToPromotion3() { - return new UpdatePromotionSGroup().type(ADD).groupIds(List.of(group5().getId())); + return new UpdatePromotionSGroup().type(ADD).groupIds(List.of(MockObjects.group5().getId())); } public static UpdatePromotionSGroup removeGroupToPromotion3() { - return new UpdatePromotionSGroup().type(REMOVE).groupIds(List.of(group5().getId())); + return new UpdatePromotionSGroup().type(REMOVE).groupIds(List.of(MockObjects.group5().getId())); } public static CrupdatePromotion createPromotion4() { From 8cb4467206d7b7fdf9143b31388033921fad7438 Mon Sep 17 00:00:00 2001 From: Kirisaki_VK Date: Fri, 18 Apr 2025 16:46:05 +0300 Subject: [PATCH 6/6] chore: moved update tests to DirtyStudentIT --- better-format.sh | 10 -- .../hei/haapi/integration/DirtyStudentIT.java | 98 +++++++++++++++++++ .../hei/haapi/integration/StudentIT.java | 96 ------------------ 3 files changed, 98 insertions(+), 106 deletions(-) delete mode 100755 better-format.sh diff --git a/better-format.sh b/better-format.sh deleted file mode 100755 index 0c3095cb64..0000000000 --- a/better-format.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -format () -{ - echo "Formating: $1" - java -jar ./google-java-format-1.23.0-all-deps.jar --replace $1 - echo "Done formating: $1" -} - -export -f format -find src -name "*.java" | parallel format diff --git a/src/test/java/school/hei/haapi/integration/DirtyStudentIT.java b/src/test/java/school/hei/haapi/integration/DirtyStudentIT.java index b2e6cd2978..c87ffe0725 100644 --- a/src/test/java/school/hei/haapi/integration/DirtyStudentIT.java +++ b/src/test/java/school/hei/haapi/integration/DirtyStudentIT.java @@ -6,6 +6,7 @@ import static school.hei.haapi.endpoint.rest.model.EnableStatus.SUSPENDED; import static school.hei.haapi.endpoint.rest.model.Sex.F; import static school.hei.haapi.endpoint.rest.model.SpecializationField.EL; +import static school.hei.haapi.endpoint.rest.model.WorkStudyStatus.NOT_WORKING; import static school.hei.haapi.integration.conf.utils.MockObjects.createStudent2; import static school.hei.haapi.integration.conf.utils.MockObjects.student2; import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN; @@ -14,6 +15,7 @@ import static school.hei.haapi.integration.conf.utils.TestUtils.coordinatesWithValues; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito; import static school.hei.haapi.integration.conf.utils.TestUtils.setUpEventBridge; +import static school.hei.haapi.integration.conf.utils.TestUtils.someCreatableStudent; import java.time.Instant; import java.time.LocalDate; @@ -116,4 +118,100 @@ void manager_write_suspended_student() throws ApiException { assertTrue(suspended.contains(created)); assertEquals(1, actual.size()); } + + @Test + void manager_write_update_ok() throws ApiException { + ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); + UsersApi api = new UsersApi(manager1Client); + List toCreate = + api.createOrUpdateStudents(List.of(someCreatableStudent(), someCreatableStudent()), null); + + Student created0 = toCreate.getFirst(); + CrupdateStudent toUpdate0 = + new CrupdateStudent() + .birthDate(created0.getBirthDate()) + .id(created0.getId()) + .entranceDatetime(created0.getEntranceDatetime()) + .phone(created0.getPhone()) + .nic(created0.getNic()) + .birthPlace(created0.getBirthPlace()) + .email(created0.getEmail()) + .address(created0.getAddress()) + .firstName(created0.getFirstName()) + .lastName(created0.getLastName()) + .sex(created0.getSex()) + .ref(created0.getRef()) + .coordinates(coordinatesWithNullValues()) + .specializationField(created0.getSpecializationField()) + .status(created0.getStatus()); + toUpdate0.setLastName("A new name zero"); + + Student created1 = toCreate.get(1); + CrupdateStudent toUpdate1 = + new CrupdateStudent() + .birthDate(created1.getBirthDate()) + .id(created1.getId()) + .entranceDatetime(created1.getEntranceDatetime()) + .phone(created1.getPhone()) + .nic(created1.getNic()) + .birthPlace(created1.getBirthPlace()) + .email(created1.getEmail()) + .address(created1.getAddress()) + .firstName(created1.getFirstName()) + .lastName(created1.getLastName()) + .sex(created1.getSex()) + .ref(created1.getRef()) + .coordinates(coordinatesWithNullValues()) + .specializationField(created1.getSpecializationField()) + .status(created1.getStatus()); + toUpdate1.setLastName("A new name one"); + + Student updated0 = + new Student() + .birthDate(toUpdate0.getBirthDate()) + .id(toUpdate0.getId()) + .entranceDatetime(toUpdate0.getEntranceDatetime()) + .phone(toUpdate0.getPhone()) + .nic(toUpdate0.getNic()) + .birthPlace(toUpdate0.getBirthPlace()) + .email(toUpdate0.getEmail()) + .address(toUpdate0.getAddress()) + .firstName(toUpdate0.getFirstName()) + .lastName("A new name zero") + .sex(toUpdate0.getSex()) + .ref(toUpdate0.getRef()) + .coordinates(coordinatesWithNullValues()) + .specializationField(toUpdate0.getSpecializationField()) + .workStudyStatus(NOT_WORKING) + .status(toUpdate0.getStatus()) + .groups(List.of()) + .isRepeatingYear(false); + + Student updated1 = + new Student() + .birthDate(toUpdate1.getBirthDate()) + .id(toUpdate1.getId()) + .entranceDatetime(toUpdate1.getEntranceDatetime()) + .phone(toUpdate1.getPhone()) + .nic(toUpdate1.getNic()) + .birthPlace(toUpdate1.getBirthPlace()) + .email(toUpdate1.getEmail()) + .address(toUpdate1.getAddress()) + .firstName(toUpdate1.getFirstName()) + .lastName("A new name one") + .sex(toUpdate1.getSex()) + .ref(toUpdate1.getRef()) + .specializationField(toUpdate1.getSpecializationField()) + .coordinates(coordinatesWithNullValues()) + .workStudyStatus(NOT_WORKING) + .status(toUpdate1.getStatus()) + .groups(List.of()) + .isRepeatingYear(false); + + List updated = api.createOrUpdateStudents(List.of(toUpdate0, toUpdate1), null); + + assertEquals(2, updated.size()); + assertTrue(updated.contains(updated0)); + assertTrue(updated.contains(updated1)); + } } diff --git a/src/test/java/school/hei/haapi/integration/StudentIT.java b/src/test/java/school/hei/haapi/integration/StudentIT.java index ab4bde491d..4b94a8d407 100644 --- a/src/test/java/school/hei/haapi/integration/StudentIT.java +++ b/src/test/java/school/hei/haapi/integration/StudentIT.java @@ -571,102 +571,6 @@ void monitor_read_students_ok() throws ApiException { assertTrue(actual.contains(student2())); } - @Test - void manager_write_update_ok() throws ApiException { - ApiClient manager1Client = anApiClient(MANAGER1_TOKEN); - UsersApi api = new UsersApi(manager1Client); - List toCreate = - api.createOrUpdateStudents(List.of(someCreatableStudent(), someCreatableStudent()), null); - - Student created0 = toCreate.getFirst(); - CrupdateStudent toUpdate0 = - new CrupdateStudent() - .birthDate(created0.getBirthDate()) - .id(created0.getId()) - .entranceDatetime(created0.getEntranceDatetime()) - .phone(created0.getPhone()) - .nic(created0.getNic()) - .birthPlace(created0.getBirthPlace()) - .email(created0.getEmail()) - .address(created0.getAddress()) - .firstName(created0.getFirstName()) - .lastName(created0.getLastName()) - .sex(created0.getSex()) - .ref(created0.getRef()) - .coordinates(coordinatesWithNullValues()) - .specializationField(created0.getSpecializationField()) - .status(created0.getStatus()); - toUpdate0.setLastName("A new name zero"); - - Student created1 = toCreate.get(1); - CrupdateStudent toUpdate1 = - new CrupdateStudent() - .birthDate(created1.getBirthDate()) - .id(created1.getId()) - .entranceDatetime(created1.getEntranceDatetime()) - .phone(created1.getPhone()) - .nic(created1.getNic()) - .birthPlace(created1.getBirthPlace()) - .email(created1.getEmail()) - .address(created1.getAddress()) - .firstName(created1.getFirstName()) - .lastName(created1.getLastName()) - .sex(created1.getSex()) - .ref(created1.getRef()) - .coordinates(coordinatesWithNullValues()) - .specializationField(created1.getSpecializationField()) - .status(created1.getStatus()); - toUpdate1.setLastName("A new name one"); - - Student updated0 = - new Student() - .birthDate(toUpdate0.getBirthDate()) - .id(toUpdate0.getId()) - .entranceDatetime(toUpdate0.getEntranceDatetime()) - .phone(toUpdate0.getPhone()) - .nic(toUpdate0.getNic()) - .birthPlace(toUpdate0.getBirthPlace()) - .email(toUpdate0.getEmail()) - .address(toUpdate0.getAddress()) - .firstName(toUpdate0.getFirstName()) - .lastName("A new name zero") - .sex(toUpdate0.getSex()) - .ref(toUpdate0.getRef()) - .coordinates(coordinatesWithNullValues()) - .specializationField(toUpdate0.getSpecializationField()) - .workStudyStatus(NOT_WORKING) - .status(toUpdate0.getStatus()) - .groups(List.of()) - .isRepeatingYear(false); - - Student updated1 = - new Student() - .birthDate(toUpdate1.getBirthDate()) - .id(toUpdate1.getId()) - .entranceDatetime(toUpdate1.getEntranceDatetime()) - .phone(toUpdate1.getPhone()) - .nic(toUpdate1.getNic()) - .birthPlace(toUpdate1.getBirthPlace()) - .email(toUpdate1.getEmail()) - .address(toUpdate1.getAddress()) - .firstName(toUpdate1.getFirstName()) - .lastName("A new name one") - .sex(toUpdate1.getSex()) - .ref(toUpdate1.getRef()) - .specializationField(toUpdate1.getSpecializationField()) - .coordinates(coordinatesWithNullValues()) - .workStudyStatus(NOT_WORKING) - .status(toUpdate1.getStatus()) - .groups(List.of()) - .isRepeatingYear(false); - - List updated = api.createOrUpdateStudents(List.of(toUpdate0, toUpdate1), null); - - assertEquals(2, updated.size()); - assertTrue(updated.contains(updated0)); - assertTrue(updated.contains(updated1)); - } - @Test void manager_read_student_by_exclude_group_id() throws ApiException { ApiClient manager1Client = anApiClient(MANAGER1_TOKEN);