Merge branch 'develop' into fix-delete-feedback

ls1intum · Dec 4, 2023 · 7530b35 · 7530b35
2 parents e103769 + b16f5c1
commit 7530b35
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseTaskService.java b/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseTaskService.java
@@ -432,16 +432,15 @@ private String replaceTaskTests(String problemStatement, Set<ProgrammingExercise
         Matcher matcher = TASK_PATTERN.matcher(problemStatement);
 
         return matcher.replaceAll(matchResult -> {
-            // matchResult is fa full task, e.g., [task][Bubble Sort](testBubbleSort,testClass[BubbleSort])
-            String fullMatch = matchResult.group();
             // group 1: task name, group 2: test names, e.g, testBubbleSort,testClass[BubbleSort]
+            String taskName = matchResult.group(1);
             String testNames = matchResult.group(2);
 
             // converted testids, e.g., <testid>10</testid>,<testid>12</testid>
             String testIds = replacer.apply(testNames, testCases);
 
-            // replace the names with their ids
-            return fullMatch.replace(testNames, testIds);
+            // construct a new task using the testids
+            return "[task][%s](%s)".formatted(taskName, testIds);
         });
     }
 

diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseTaskServiceTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseTaskServiceTest.java
@@ -381,10 +381,30 @@ void testNameReplacementOnlyWithinTasks() {
         programmingExerciseTaskService.replaceTestNamesWithIds(programmingExercise);
         String problemStatement = programmingExercise.getProblemStatement();
 
-        assertThat(problemStatement).contains("[task][Taskname](<testid>%s</testid>,<testid>%s</testid>".formatted(test1.getId(), test2.getId()))
+        assertThat(problemStatement).contains("[task][Taskname](<testid>%s</testid>,<testid>%s</testid>)".formatted(test1.getId(), test2.getId()))
                 .contains("This description contains the words test and taskTest, which should not be replaced.");
     }
 
+    @Test
+    void testNameReplacementTaskNameSameAsTestName() {
+        var sort = programmingExerciseUtilService.addTestCaseToProgrammingExercise(programmingExercise, "sort");
+
+        updateProblemStatement("""
+                [task][sort](sort)
+                Sort using the method sort.
+                @startuml
+                class LinkedList<T> {
+                    <color:testsColor(sort)>+ sort()</color>
+                }
+                @enduml""");
+
+        programmingExerciseTaskService.replaceTestNamesWithIds(programmingExercise);
+        String problemStatement = programmingExercise.getProblemStatement();
+
+        assertThat(problemStatement).contains("[task][sort](<testid>%s</testid>)".formatted(sort.getId())).contains("Sort using the method sort.")
+                .contains("<color:testsColor(<testid>%s</testid>)>+ sort()</color>".formatted(sort.getId()));
+    }
+
     @Test
     void testIdReplacementWithNames() {
         var bubbleSort = programmingExerciseTestCaseRepository.findByExerciseIdAndTestName(programmingExercise.getId(), "testClass[BubbleSort]").orElseThrow();