fix tests (really)

ls1intum · May 10, 2024 · 1490ce8 · 1490ce8
1 parent 26c6785
commit 1490ce8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/test/java/de/tum/in/www1/artemis/iris/AbstractIrisIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/iris/AbstractIrisIntegrationTest.java
@@ -6,6 +6,9 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import java.util.Set;
+import java.util.TreeSet;
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.mockito.ArgumentMatcher;
@@ -87,6 +90,7 @@ protected void activateIrisGlobally() {
     private void activateSubSettings(IrisSubSettings settings) {
         settings.setEnabled(true);
         settings.setPreferredModel(null);
+        settings.setAllowedModels(new TreeSet<>(Set.of("dummy")));
     }
 
     protected void activateIrisFor(Course course) {

diff --git a/src/test/java/de/tum/in/www1/artemis/iris/IrisChatWebsocketTest.java b/src/test/java/de/tum/in/www1/artemis/iris/IrisChatWebsocketTest.java
@@ -17,6 +17,7 @@
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.iris.message.IrisTextMessageContent;
 import de.tum.in.www1.artemis.service.WebsocketMessagingService;
+import de.tum.in.www1.artemis.service.iris.IrisRateLimitService;
 import de.tum.in.www1.artemis.service.iris.session.IrisChatSessionService;
 import de.tum.in.www1.artemis.service.iris.websocket.IrisChatWebsocketService;
 import de.tum.in.www1.artemis.service.iris.websocket.IrisWebsocketDTO;
@@ -54,7 +55,7 @@ void sendMessage() {
         message.setMessageDifferentiator(101010);
         irisChatWebsocketService.sendMessage(message, List.of());
         verify(websocketMessagingService, times(1)).sendMessageToUser(eq(TEST_PREFIX + "student1"), eq("/topic/iris/sessions/" + irisSession.getId()),
-                eq(new IrisWebsocketDTO(message, null, null, List.of())));
+                eq(new IrisWebsocketDTO(message, null, new IrisRateLimitService.IrisRateLimitInformation(0, -1, 0), List.of())));
     }
 
     private IrisTextMessageContent createMockContent() {

diff --git a/src/test/java/de/tum/in/www1/artemis/iris/settings/IrisSettingsIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/iris/settings/IrisSettingsIntegrationTest.java
@@ -87,7 +87,9 @@ void getCourseSettingsAsUser() throws Exception {
         request.get("/api/courses/" + course.getId() + "/raw-iris-settings", HttpStatus.FORBIDDEN, IrisSettings.class);
         var loadedSettings = request.get("/api/courses/" + course.getId() + "/iris-settings", HttpStatus.OK, IrisCombinedSettingsDTO.class);
 
-        assertThat(loadedSettings).isNotNull().usingRecursiveComparison().ignoringFields("id").isEqualTo(irisSettingsService.getCombinedIrisSettingsFor(course, true));
+        assertThat(loadedSettings).isNotNull().usingRecursiveComparison()
+                .ignoringCollectionOrderInFields("irisChatSettings.allowedModels", "irisCompetencyGenerationSettings.allowedModels", "irisHestiaSettings.allowedModels")
+                .ignoringFields("id").isEqualTo(irisSettingsService.getCombinedIrisSettingsFor(course, true));
     }
 
     @Test
@@ -218,7 +220,9 @@ void getProgrammingExerciseSettingsAsUser() throws Exception {
         request.get("/api/programming-exercises/" + programmingExercise.getId() + "/raw-iris-settings", HttpStatus.FORBIDDEN, IrisSettings.class);
         var loadedSettings = request.get("/api/programming-exercises/" + programmingExercise.getId() + "/iris-settings", HttpStatus.OK, IrisCombinedSettingsDTO.class);
 
-        assertThat(loadedSettings).isNotNull().usingRecursiveComparison().ignoringFields("id").isEqualTo(irisSettingsService.getCombinedIrisSettingsFor(programmingExercise, true));
+        assertThat(loadedSettings).isNotNull().usingRecursiveComparison().ignoringFields("id")
+                .ignoringCollectionOrderInFields("irisChatSettings.allowedModels", "irisCompetencyGenerationSettings.allowedModels", "irisHestiaSettings.allowedModels")
+                .isEqualTo(irisSettingsService.getCombinedIrisSettingsFor(programmingExercise, true));
     }
 
     @Test