From 63cbe6fce51eb33d0619cbe52931771f2acf7d2e Mon Sep 17 00:00:00 2001 From: Dominika Zemanovicova <xzemanov@fi.muni.cz> Date: Sun, 16 Apr 2023 19:03:10 +0200 Subject: [PATCH] Fix ExerciseRepositoryTest --- .../exercise/ExerciseRepositoryTest.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/application/module-exercise/src/test/java/org/fuseri/moduleexercise/exercise/ExerciseRepositoryTest.java b/application/module-exercise/src/test/java/org/fuseri/moduleexercise/exercise/ExerciseRepositoryTest.java index 6d9187ed..8eb27c57 100644 --- a/application/module-exercise/src/test/java/org/fuseri/moduleexercise/exercise/ExerciseRepositoryTest.java +++ b/application/module-exercise/src/test/java/org/fuseri/moduleexercise/exercise/ExerciseRepositoryTest.java @@ -18,19 +18,18 @@ import java.util.Set; class ExerciseRepositoryTest { @Autowired - ExerciseRepository repository; + ExerciseRepository exerciseRepository; @Autowired TestEntityManager entityManager; - Exercise exercise = new Exercise("name", "desc", 2, 1L, new HashSet<>()); Question question = new Question("text", new HashSet<>(), exercise); @Test void saveExercise() { - Exercise saved = repository.save(exercise); + Exercise saved = exerciseRepository.save(exercise); Assertions.assertNotNull(saved); Assertions.assertEquals(exercise, saved); @@ -41,7 +40,7 @@ class ExerciseRepositoryTest { entityManager.persist(exercise); entityManager.flush(); - Exercise found = repository.findById(exercise.getId()).orElse(null); + Exercise found = exerciseRepository.findById(exercise.getId()).orElse(null); Assertions.assertNotNull(found); Assertions.assertEquals(found, exercise); @@ -49,11 +48,11 @@ class ExerciseRepositoryTest { @Test - void filterPerDiffPerCourse() { + void findByCourseIdAndDifficulty() { entityManager.persist(exercise); entityManager.flush(); - Page<Exercise> found = repository.filterPerDifficultyPerCourse(PageRequest.of(0, 10), 1L, 2); + Page<Exercise> found = exerciseRepository.findByCourseIdAndDifficulty(1L, 2, PageRequest.of(0, 10)); Assertions.assertEquals(1, found.getTotalElements()); Assertions.assertEquals(found.getContent().get(0), exercise); @@ -66,7 +65,7 @@ class ExerciseRepositoryTest { entityManager.persist(exercise); entityManager.persist(exercise1); - Page<Exercise> coursePage = repository.findAll(PageRequest.of(0, 42)); + Page<Exercise> coursePage = exerciseRepository.findAll(PageRequest.of(0, 42)); Assertions.assertEquals(2, coursePage.getTotalElements()); Assertions.assertEquals(coursePage.getContent(), Arrays.asList(exercise, exercise1)); @@ -76,7 +75,7 @@ class ExerciseRepositoryTest { void getQuestionsEmptyQuestions() { entityManager.persist(exercise); - var result = repository.getQuestions(PageRequest.of(0, 10), 1L); + var result = exerciseRepository.getQuestions(PageRequest.of(0, 10), 1L); Assertions.assertEquals(0, result.getTotalElements()); } @@ -86,7 +85,7 @@ class ExerciseRepositoryTest { exercise.setQuestions(Set.of(question)); entityManager.persist(exercise); - var result = repository.getQuestions(PageRequest.of(0, 10), 1L); + var result = exerciseRepository.getQuestions(PageRequest.of(0, 10), 1L); Assertions.assertEquals(1, result.getTotalElements()); Assertions.assertEquals(result.getContent().get(0), question); @@ -97,9 +96,9 @@ class ExerciseRepositoryTest { Long id = entityManager.persist(exercise).getId(); entityManager.flush(); - repository.deleteById(id); + exerciseRepository.deleteById(id); - Assertions.assertTrue(repository.findById(id).isEmpty()); + Assertions.assertTrue(exerciseRepository.findById(id).isEmpty()); } -- GitLab