Expand unit tests for services

server/src/main/java/de/uftos/services/TagService.java

@@ -21,6 +21,7 @@
 import de.uftos.repositories.database.TimeslotRepository;
 import de.uftos.utils.ConstraintInstanceDeleter;
 import de.uftos.utils.SpecificationBuilder;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;

server/src/test/java/de/uftos/e2e/CurriculumTest.java

@@ -1,6 +1,5 @@
 package de.uftos.e2e;
 
-import static de.uftos.utils.JsonGenerator.generateCurriculumJson;
 import static de.uftos.utils.JsonGenerator.generateGradeJson;
 import static de.uftos.utils.JsonGenerator.generateIdListJson;
 import static de.uftos.utils.JsonGenerator.generatePageJson;
@@ -9,11 +8,9 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.notNullValue;
 
-import de.uftos.dto.requestdtos.LessonsCountRequestDto;
 import io.restassured.filter.log.LogDetail;
 import io.restassured.http.ContentType;
 import java.util.Collections;
-import java.util.List;
 import org.json.JSONException;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -38,7 +35,7 @@ class CurriculumTest {
   static void createTestCurricula() throws JSONException {
 
     subjectId = given().contentType(ContentType.JSON)
-        .body(generateSubjectJson(SUBJECT_NAME))
+        .body(generateSubjectJson(SUBJECT_NAME, "ffffff"))
         .when()
         .post("/subjects")
         .then()

server/src/test/java/de/uftos/e2e/StudentGroupsTest.java

@@ -80,7 +80,7 @@ static void createTestStudentGroups() throws JSONException {
         .body().jsonPath().getString("id");
 
     subjectId = given().contentType(ContentType.JSON)
-        .body(generateSubjectJson(SUBJECT_NAME))
+        .body(generateSubjectJson(SUBJECT_NAME, "ffffff"))
         .when()
         .post("/subjects")
         .then()

server/src/test/java/de/uftos/e2e/SubjectsTest.java

@@ -24,7 +24,7 @@ class SubjectsTest {
   @BeforeAll
   static void createTestStudents() throws JSONException {
     subject1Id = given().contentType(ContentType.JSON)
-        .body(generateSubjectJson(SUBJECT1_NAME))
+        .body(generateSubjectJson(SUBJECT1_NAME, "ffffff"))
         .when()
         .post("/subjects")
         .then()
@@ -36,7 +36,7 @@ static void createTestStudents() throws JSONException {
         .body().jsonPath().getString("id");
 
     subject2Id = given().contentType(ContentType.JSON)
-        .body(generateSubjectJson(SUBJECT2_NAME))
+        .body(generateSubjectJson(SUBJECT2_NAME, "ffffff"))
         .when()
         .post("/subjects")
         .then()

server/src/test/java/de/uftos/e2e/TeachersTest.java

@@ -48,7 +48,7 @@ static void createTestTeachers() throws JSONException {
         .body().jsonPath().getString("id");
 
     subjectId = given().contentType(ContentType.JSON)
-        .body(generateSubjectJson(SUBJECT_NAME))
+        .body(generateSubjectJson(SUBJECT_NAME, "ffffff"))
         .when()
         .post("/subjects")
         .then()

server/src/test/java/de/uftos/services/ConstraintInstanceServiceTest.java

@@ -5,6 +5,8 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -51,6 +53,10 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.web.server.ResponseStatusException;
 
 @SuppressWarnings("checkstyle:MissingJavadocType")
@@ -260,11 +266,19 @@ void setUp() {
         Optional.of(constraintInstanceInvalidArgs));
     when(constraintSignatureRepository.findById(constraintSignature.getName())).thenReturn(
         Optional.of(constraintSignature));
+
+    Page<ConstraintInstance> instancePage = new PageImpl<>(List.of(constraintInstance));
+    when(constraintInstanceRepository.findByArguments(eq("teacherArgId"),
+        any(Pageable.class))).thenReturn(instancePage);
+
     when(
         constraintSignatureRepository.findById(constraintSignatureManyParams.getName())).thenReturn(
         Optional.of(constraintSignatureManyParams));
     when(constraintSignatureRepository.findById(constraintSignatureInvalid.getName())).thenReturn(
         Optional.of(constraintSignatureInvalid));
+    when(constraintSignatureRepository.findInstancesBySignatureId(eq("test constraint"),
+        any(Pageable.class))).thenReturn(instancePage);
+
 
     Timeslot timeslot = new Timeslot("timeslotId1");
     timeslot.setDay(Weekday.TUESDAY);
@@ -331,6 +345,35 @@ void nonExistentParameter() {
         () -> constraintInstanceService.create("test constraint", constraintInstanceRequestDto));
   }
 
+  @Test
+  void getConstraintInstancesNoArgs() {
+    ConstraintInstancesResponseDto result =
+        constraintInstanceService.get("test constraint", PageRequest.of(0, 10), Optional.empty());
+    assertEquals(1, result.totalElements());
+    List<ConstraintInstancesResponseDto.SlimInstance> instances = result.constraintInstances();
+    assertEquals("123", instances.getFirst().id());
+  }
+
+  @Test
+  void getConstraintInstancesWithArgs() {
+    ConstraintInstancesResponseDto result =
+        constraintInstanceService.get("test constraint", PageRequest.of(0, 10),
+            Optional.of("teacherArgId"));
+    assertEquals(1, result.totalElements());
+    List<ConstraintInstancesResponseDto.SlimInstance> instances = result.constraintInstances();
+    assertEquals("123", instances.getFirst().id());
+  }
+
+  @Test
+  void getConstraintInstancesWithEmptyArg() {
+    ConstraintInstancesResponseDto result =
+        constraintInstanceService.get("test constraint", PageRequest.of(0, 10),
+            Optional.of(""));
+    assertEquals(1, result.totalElements());
+    List<ConstraintInstancesResponseDto.SlimInstance> instances = result.constraintInstances();
+    assertEquals("123", instances.getFirst().id());
+  }
+
   @Test
   void tooManyParameter() {
     ConstraintArgumentRequestDto arg1 =
@@ -355,6 +398,17 @@ void createConstraintInstance() {
         () -> constraintInstanceService.create("test constraint", constraintInstanceRequestDto));
   }
 
+  @Test
+  void createConstraintInstanceInvalidSignatureId() {
+    ConstraintArgumentRequestDto arg =
+        new ConstraintArgumentRequestDto("teacher123", "teacherId1");
+    ConstraintInstanceRequestDto constraintInstanceRequestDto =
+        new ConstraintInstanceRequestDto(List.of(arg), RewardPenalize.HARD_PENALIZE);
+
+    assertThrows(ResponseStatusException.class,
+        () -> constraintInstanceService.create("nonExistentId", constraintInstanceRequestDto));
+  }
+
   @Test
   void createConstraintInstanceWrongParamName() {
     ConstraintArgumentRequestDto arg =

server/src/test/java/de/uftos/services/CurriculumServiceTests.java

@@ -78,13 +78,17 @@ void setUp() {
     newGrade.setId("newGrade");
 
     LessonsCountRequestDto lessonsCount = new LessonsCountRequestDto("Mathe", 4);
+    LessonsCountRequestDto otherLessonCount = new LessonsCountRequestDto("OtherSubject", 4);
 
     Curriculum curriculum1 = new Curriculum(testGrade, "EmptyCurriculum", List.of());
     curriculum1.setId("123");
     Curriculum curriculum2 = new Curriculum(grade2, "TestCurriculum", List.of(lessonsCount));
     curriculum2.setId("456");
     Curriculum curriculum3 = new Curriculum(newGrade, "UpdateCurriculum", List.of(lessonsCount));
     curriculum3.setId("234");
+    Curriculum curriculumMultipleLessonsCounts =
+        new Curriculum(newGrade, "UpdateCurriculum", List.of(lessonsCount, otherLessonCount));
+    curriculumMultipleLessonsCounts.setId("multipleCounts");
 
     Curriculum testCurriculum =
         new Curriculum(testGrade, "testName", List.of(lessonsCount));
@@ -100,6 +104,8 @@ void setUp() {
     when(curriculumRepository.findById("123")).thenReturn(Optional.of(curriculum1));
     when(curriculumRepository.findById("456")).thenReturn(Optional.of(curriculum2));
     when(curriculumRepository.findById("234")).thenReturn(Optional.of(curriculum3));
+    when(curriculumRepository.findById("multipleCounts")).thenReturn(
+        Optional.of(curriculumMultipleLessonsCounts));
     when(curriculumRepository.save(any(Curriculum.class))).thenReturn(testCurriculum);
   }
 
@@ -142,6 +148,22 @@ void createCurriculum() {
     assertEquals(1, curriculum.getLessonsCounts().size());
   }
 
+  @Test
+  void createEmptyName() {
+    LessonsCountRequestDto lessonsCount = new LessonsCountRequestDto("Englisch", 4);
+    CurriculumRequestDto requestDto =
+        new CurriculumRequestDto("testGrade", "", List.of(lessonsCount));
+    assertThrows(ResponseStatusException.class, () -> curriculumService.create(requestDto));
+  }
+
+  @Test
+  void createNonExistentGrade() {
+    LessonsCountRequestDto lessonsCount = new LessonsCountRequestDto("Englisch", 4);
+    CurriculumRequestDto requestDto =
+        new CurriculumRequestDto("nonExistentGrade", "testName", List.of(lessonsCount));
+    assertThrows(ResponseStatusException.class, () -> curriculumService.create(requestDto));
+  }
+
   @Test
   void updateCurriculum() {
     LessonsCountRequestDto lessonsCount = new LessonsCountRequestDto("Mathe", 5);
@@ -157,6 +179,56 @@ void updateCurriculum() {
     assertEquals(1, curriculum.getLessonsCounts().size());
   }
 
+  @Test
+  void updateCurriculumMultipleLessonsCounts() {
+    LessonsCountRequestDto lessonsCount = new LessonsCountRequestDto("Mathe", 5);
+    LessonsCountRequestDto otherCount = new LessonsCountRequestDto("OtherSubject", 5);
+    CurriculumRequestDto requestDto =
+        new CurriculumRequestDto("newGrade", "newName", List.of(lessonsCount, otherCount));
+    curriculumService.update("multipleCounts", requestDto);
+
+    Curriculum curriculum = curriculumRepository.findById("multipleCounts").get();
+    assertNotNull(curriculum);
+
+    assertEquals(newGrade, curriculum.getGrade());
+
+    assertEquals(2, curriculum.getLessonsCounts().size());
+  }
+
+  @Test
+  void updateCurriculumInconsistentLessonCountAmounts() {
+    LessonsCountRequestDto lessonsCount = new LessonsCountRequestDto("Mathe", 5);
+    CurriculumRequestDto requestDto =
+        new CurriculumRequestDto("newGrade", "newName", List.of(lessonsCount));
+    assertThrows(ResponseStatusException.class, () -> curriculumService.update("123", requestDto));
+  }
+
+  @Test
+  void updateCurriculumInconsistentLessonCountSubjects() {
+    LessonsCountRequestDto lessonsCount = new LessonsCountRequestDto("OtherSubject", 5);
+    CurriculumRequestDto requestDto =
+        new CurriculumRequestDto("newGrade", "newName", List.of(lessonsCount));
+    assertThrows(ResponseStatusException.class, () -> curriculumService.update("234", requestDto));
+  }
+
+  @Test
+  void updateCurriculumNonExistent() {
+    LessonsCountRequestDto lessonsCount = new LessonsCountRequestDto("Physik", 4);
+    CurriculumRequestDto requestDto =
+        new CurriculumRequestDto("newGrade", "newName", List.of(lessonsCount));
+    assertThrows(ResponseStatusException.class,
+        () -> curriculumService.update("nonExistentId", requestDto));
+  }
+
+  @Test
+  void updateCurriculumNonExistentGrade() {
+    LessonsCountRequestDto lessonsCount = new LessonsCountRequestDto("Physik", 4);
+    CurriculumRequestDto requestDto =
+        new CurriculumRequestDto("nonExistentGrade", "newName", List.of(lessonsCount));
+    assertThrows(ResponseStatusException.class,
+        () -> curriculumService.update("234", requestDto));
+  }
+
   @Test
   void deleteExistentCurriculum() {
     assertDoesNotThrow(() -> curriculumService.delete("123"));