Development: Improve server test cleanup to reduce flakiness

laxerhd · Dec 7, 2024 · 8504af9 · 8504af9
1 parent eb3b2a3
commit 8504af9
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 19 deletions.
diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/AbstractConversationTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/AbstractConversationTest.java
@@ -32,7 +32,6 @@
 import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService;
 import de.tum.cit.aet.artemis.communication.test_repository.ConversationParticipantTestRepository;
 import de.tum.cit.aet.artemis.communication.test_repository.ConversationTestRepository;
-import de.tum.cit.aet.artemis.communication.test_repository.OneToOneChatTestRepository;
 import de.tum.cit.aet.artemis.core.domain.Course;
 import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration;
 import de.tum.cit.aet.artemis.core.domain.User;
@@ -65,9 +64,6 @@ abstract class AbstractConversationTest extends AbstractSpringIntegrationIndepen
     @Autowired
     GroupChatRepository groupChatRepository;
 
-    @Autowired
-    OneToOneChatTestRepository oneToOneChatRepository;
-
     @Autowired
     ConversationMessageRepository conversationMessageRepository;
 

diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/ChannelIntegrationTest.java
@@ -10,6 +10,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -47,10 +48,10 @@ class ChannelIntegrationTest extends AbstractConversationTest {
     private static final String TEST_PREFIX = "chtest";
 
     @Autowired
-    TutorialGroupTestRepository tutorialGroupRepository;
+    private TutorialGroupTestRepository tutorialGroupRepository;
 
     @Autowired
-    TutorialGroupChannelManagementService tutorialGroupChannelManagementService;
+    private TutorialGroupChannelManagementService tutorialGroupChannelManagementService;
 
     @Autowired
     private TutorialGroupUtilService tutorialGroupUtilService;
@@ -89,6 +90,13 @@ void setupTestScenario() throws Exception {
         }
     }
 
+    @AfterEach
+    void tearDown() {
+        tutorialGroupRepository.deleteAll();
+        conversationMessageRepository.deleteAll();
+        conversationRepository.deleteAllByCourseId(exampleCourseId);
+    }
+
     @Override
     String getTestPrefix() {
         return TEST_PREFIX;

diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/OneToOneChatIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/OneToOneChatIntegrationTest.java
@@ -39,7 +39,7 @@ void setupTestScenario() throws Exception {
     @AfterEach
     void tearDown() {
         conversationMessageRepository.deleteAll();
-        conversationRepository.deleteAll();
+        conversationRepository.deleteAllByCourseId(exampleCourseId);
     }
 
     @Override

diff --git a/.../artemis/connectors/Lti13ServiceTest.java → ...cit/aet/artemis/lti/Lti13ServiceTest.java b/.../artemis/connectors/Lti13ServiceTest.java → ...cit/aet/artemis/lti/Lti13ServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.connectors;
+package de.tum.cit.aet.artemis.lti;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

diff --git a/...rs/LtiDynamicRegistrationServiceTest.java → ...ti/LtiDynamicRegistrationServiceTest.java b/...rs/LtiDynamicRegistrationServiceTest.java → ...ti/LtiDynamicRegistrationServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.connectors;
+package de.tum.cit.aet.artemis.lti;
 
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.Mockito.any;

diff --git a/...s/connectors/LtiNewResultServiceTest.java → .../artemis/lti/LtiNewResultServiceTest.java b/...s/connectors/LtiNewResultServiceTest.java → .../artemis/lti/LtiNewResultServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.connectors;
+package de.tum.cit.aet.artemis.lti;
 
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;

diff --git a/...et/artemis/connectors/LtiServiceTest.java → ...m/cit/aet/artemis/lti/LtiServiceTest.java b/...et/artemis/connectors/LtiServiceTest.java → ...m/cit/aet/artemis/lti/LtiServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.connectors;
+package de.tum.cit.aet.artemis.lti;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

diff --git a/...ing/ApollonConversionIntegrationTest.java → ...lon/ApollonConversionIntegrationTest.java b/...ing/ApollonConversionIntegrationTest.java → ...lon/ApollonConversionIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.modeling;
+package de.tum.cit.aet.artemis.modeling.apollon;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...nectors/ApollonConversionServiceTest.java → ...apollon/ApollonConversionServiceTest.java b/...nectors/ApollonConversionServiceTest.java → ...apollon/ApollonConversionServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.connectors;
+package de.tum.cit.aet.artemis.modeling.apollon;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...pollonDiagramResourceIntegrationTest.java → ...pollonDiagramResourceIntegrationTest.java b/...pollonDiagramResourceIntegrationTest.java → ...pollonDiagramResourceIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.modeling;
+package de.tum.cit.aet.artemis.modeling.apollon;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...onnectors/ApollonHealthIndicatorTest.java → ...g/apollon/ApollonHealthIndicatorTest.java b/...onnectors/ApollonHealthIndicatorTest.java → ...g/apollon/ApollonHealthIndicatorTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.connectors;
+package de.tum.cit.aet.artemis.modeling.apollon;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...olusBuildScriptGenerationServiceTest.java → ...olusBuildScriptGenerationServiceTest.java b/...olusBuildScriptGenerationServiceTest.java → ...olusBuildScriptGenerationServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.connectors;
+package de.tum.cit.aet.artemis.programming.aelous;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...artemis/connectors/AeolusServiceTest.java → ...programming/aelous/AeolusServiceTest.java b/...artemis/connectors/AeolusServiceTest.java → ...programming/aelous/AeolusServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.connectors;
+package de.tum.cit.aet.artemis.programming.aelous;
 
 import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME;
 import static de.tum.cit.aet.artemis.core.config.Constants.SOLUTION_REPO_NAME;

diff --git a/...onnectors/AeolusTemplateResourceTest.java → ...ng/aelous/AeolusTemplateResourceTest.java b/...onnectors/AeolusTemplateResourceTest.java → ...ng/aelous/AeolusTemplateResourceTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.connectors;
+package de.tum.cit.aet.artemis.programming.aelous;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;

diff --git a/...it/aet/artemis/connectors/AeolusTest.java → ...rtemis/programming/aelous/AeolusTest.java b/...it/aet/artemis/connectors/AeolusTest.java → ...rtemis/programming/aelous/AeolusTest.java
@@ -1,4 +1,4 @@
-package de.tum.cit.aet.artemis.connectors;
+package de.tum.cit.aet.artemis.programming.aelous;
 
 import static org.assertj.core.api.Assertions.assertThat;