From 948e37d2833b9b6a4faeaedbca8fd8fc38c456e7 Mon Sep 17 00:00:00 2001
From: U004458 <markangelo.domingo@avaloq.com>
Date: Tue, 28 Oct 2025 23:02:50 +0800
Subject: [PATCH] feat: Migrate cat.ddk.sample.helloworld.ui.test to Junit5

removed junit4 dependencies
removed dependency to DiscerningSuite
---
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../helloworld/label/IssueLabelTest.xtend     | 10 ++++-----
 .../test/HelloWorldSampleTestSuite.java       | 22 ++++++++-----------
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/com.avaloq.tools.ddk.sample.helloworld.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.sample.helloworld.ui.test/META-INF/MANIFEST.MF
index 6905750b8c..8831a16731 100644
--- a/com.avaloq.tools.ddk.sample.helloworld.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.sample.helloworld.ui.test/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Bundle-SymbolicName: com.avaloq.tools.ddk.sample.helloworld.ui.test;singleton:=t
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.avaloq.tools.ddk.sample.helloworld,
  com.avaloq.tools.ddk.sample.helloworld.ui,
- org.junit,
  org.eclipse.xtext.ui.testing,
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
@@ -21,6 +20,7 @@ Require-Bundle: com.avaloq.tools.ddk.sample.helloworld,
  org.eclipse.xtext.xbase.ui.testing,
  junit-jupiter-api,
  junit-jupiter-engine,
+ junit-platform-suite-api,
  junit-vintage-engine
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Export-Package: com.avaloq.tools.ddk.sample.helloworld.test,
diff --git a/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/label/IssueLabelTest.xtend b/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/label/IssueLabelTest.xtend
index 91555b6446..3cf4767ff0 100644
--- a/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/label/IssueLabelTest.xtend
+++ b/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/label/IssueLabelTest.xtend
@@ -12,12 +12,12 @@ package com.avaloq.tools.ddk.sample.helloworld.label
 
 import com.google.inject.AbstractModule
 import com.google.inject.Guice
-import org.junit.Test 
 
-import static org.junit.Assert.assertEquals
-import static org.junit.Assert.assertNotNull
 import com.avaloq.tools.ddk.sample.helloworld.validation.LibraryChecksIssueCodes
 import com.avaloq.tools.ddk.check.runtime.label.ICheckRuleLabelProvider
+import org.junit.jupiter.api.Test
+import static org.junit.jupiter.api.Assertions.assertNotNull
+import static org.junit.jupiter.api.Assertions.assertEquals
 
 /**
  * End-to-end test for getting Check labels.
@@ -49,8 +49,8 @@ class IssueLabelTest {
       val label = checkRuleLabelProvider.getLabel(entry.key);
 
       // ASSERT
-      assertNotNull("Label should be returned for key " + entry.key, label);
-      assertEquals("Correct label should be returned for key " + entry.key, entry.value, label);
+      assertNotNull(label,"Label should be returned for key " + entry.key);
+      assertEquals(entry.value, label,  "Correct label should be returned for key " + entry.key);
     }
   }
 }
diff --git a/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/test/HelloWorldSampleTestSuite.java b/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/test/HelloWorldSampleTestSuite.java
index abd1896adc..5a876deb9c 100644
--- a/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/test/HelloWorldSampleTestSuite.java
+++ b/com.avaloq.tools.ddk.sample.helloworld.ui.test/src/com/avaloq/tools/ddk/sample/helloworld/test/HelloWorldSampleTestSuite.java
@@ -11,25 +11,21 @@
 
 package com.avaloq.tools.ddk.sample.helloworld.test;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-import com.avaloq.tools.ddk.sample.helloworld.check.CheckConfigurationIsAppliedTest;
-import com.avaloq.tools.ddk.sample.helloworld.check.CheckExecutionEnvironmentProjectTest;
-import com.avaloq.tools.ddk.sample.helloworld.label.IssueLabelTest;
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.Suite;
 
 
 /**
- * Empty class serving only as holder for JUnit4 annotations.
+ * Junit5 version of test suites. does not implement the logic in our DiscerningSuite.
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectPackages({
 // @Format-Off
-  IssueLabelTest.class,
-  CheckConfigurationIsAppliedTest.class,
-  CheckExecutionEnvironmentProjectTest.class
-// @Format-On
+  "com.avaloq.tools.ddk.sample.helloworld.check",
+  "com.avaloq.tools.ddk.sample.helloworld.label"
+  // @Format-On
 })
+
 public class HelloWorldSampleTestSuite {
 
 }