Use displayname as default for tabs

rien · rien · commit e01073de42a7 · 2026-02-05T12:50:41.000+01:00
diff --git a/integration-tests/combined/simple/evaluation/TestSuite.java b/integration-tests/combined/simple/evaluation/TestSuite.java
@@ -1,12 +1,12 @@
 
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
-import org.junit.runner.RunWith;
 
 @Suite
 @SelectClasses({
-    // List of tests to run.
-    SimpleTest.class,
-    GeneratedTest.class,
+        // List of tests to run.
+        SimpleTest.class,
+        GeneratedTest.class,
 })
-public class TestSuite {}
+public class TestSuite {
+}
diff --git a/integration-tests/combined/simple/result.json b/integration-tests/combined/simple/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "SimpleTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit4/diffing-testwriter-correct/result.json b/integration-tests/junit4/diffing-testwriter-correct/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "TestWriterTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit4/diffing-testwriter-package/result.json b/integration-tests/junit4/diffing-testwriter-package/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "TestWriterTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit4/diffing-testwriter-wrong/result.json b/integration-tests/junit4/diffing-testwriter-wrong/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "TestWriterTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit4/messagewriter-output/result.json b/integration-tests/junit4/messagewriter-output/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "SubmissionTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit4/output-cutoff/result.json b/integration-tests/junit4/output-cutoff/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "SpamTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit4/packaged-class/result.json b/integration-tests/junit4/packaged-class/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "DodonaTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit4/stubber-construction/result.json b/integration-tests/junit4/stubber-construction/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "StubberTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit4/stubber-package/result.json b/integration-tests/junit4/stubber-package/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "StubberTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit4/stubber-public/result.json b/integration-tests/junit4/stubber-public/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "StubberTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit4/stubber-wrong-type/result.json b/integration-tests/junit4/stubber-wrong-type/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "StubberTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit4/tab-permission/result.json b/integration-tests/junit4/tab-permission/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "staff",
-  "title": "Test"
+  "title": "TabPermissionTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit4/timeout/result.json b/integration-tests/junit4/timeout/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "SleepyTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit6/diffing-testwriter-correct/result.json b/integration-tests/junit6/diffing-testwriter-correct/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "TestWriterTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit6/diffing-testwriter-package/result.json b/integration-tests/junit6/diffing-testwriter-package/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "TestWriterTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit6/diffing-testwriter-wrong/result.json b/integration-tests/junit6/diffing-testwriter-wrong/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "TestWriterTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit6/messagewriter-output/result.json b/integration-tests/junit6/messagewriter-output/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "SubmissionTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit6/output-cutoff/result.json b/integration-tests/junit6/output-cutoff/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "SpamTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit6/packaged-class/result.json b/integration-tests/junit6/packaged-class/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "DodonaTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit6/stubber-construction/result.json b/integration-tests/junit6/stubber-construction/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "StubberTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit6/stubber-package/result.json b/integration-tests/junit6/stubber-package/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "StubberTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit6/stubber-public/result.json b/integration-tests/junit6/stubber-public/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "StubberTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit6/stubber-wrong-type/result.json b/integration-tests/junit6/stubber-wrong-type/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "StubberTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit6/tab-permission/result.json b/integration-tests/junit6/tab-permission/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "staff",
-  "title": "Test"
+  "title": "TabPermissionTest"
 }
 {
   "command": "start-context",
diff --git a/integration-tests/junit6/timeout/result.json b/integration-tests/junit6/timeout/result.json
@@ -13,7 +13,7 @@
   "command": "start-tab",
   "hidden": false,
   "permission": "student",
-  "title": "Test"
+  "title": "SleepyTest"
 }
 {
   "command": "start-context",
diff --git a/src/dodona/junit/JSONListener.java b/src/dodona/junit/JSONListener.java
@@ -82,8 +82,7 @@ public void executionSkipped(TestIdentifier testIdentifier, String reason) {
     }
 
     public void beforeTab(TestIdentifier testIdentifier) {
-        final String title = getTabTitle(testIdentifier)
-                .orElse(TabTitle.DEFAULT);
+        final String title = getTabTitle(testIdentifier);
         final Permission permission = getTabPermission(testIdentifier)
                 .orElse(TabPermission.DEFAULT);
         write(new StartTab(title, permission));
@@ -205,8 +204,10 @@ private String getDescription(TestIdentifier testIdentifier) {
                 .orElse(testIdentifier.getDisplayName());
     }
 
-    private Optional<String> getTabTitle(TestIdentifier testIdentifier) {
-        return getAnnotation(testIdentifier, TabTitle.class).map(TabTitle::value);
+    private String getTabTitle(TestIdentifier testIdentifier) {
+        return getAnnotation(testIdentifier, TabTitle.class)
+                .map(TabTitle::value)
+                .orElse(testIdentifier.getDisplayName());
     }
 
     private Optional<Permission> getTabPermission(TestIdentifier testIdentifier) {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`"command": "start-tab",`
`14`	`14`	`"hidden": false,`
`15`	`15`	`"permission": "student",`
`16`		`- "title": "Test"`
	`16`	`+ "title": "SimpleTest"`
`17`	`17`	`}`
`18`	`18`	`{`
`19`	`19`	`"command": "start-context",`