Skip to content

feat: Migrate cat.ddk.check.test.runtime.test to Junit5 #1209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markdomeng merged 1 commit into from
Oct 28, 2025
Merged

feat: Migrate cat.ddk.check.test.runtime.test to Junit5 #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion com.avaloq.tools.ddk.check.runtime.core.test/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.ui,
com.google.guava,
junit-jupiter-api,
junit-jupiter-engine,
junit-vintage-engine,
junit-platform-suite-api
Export-Package: com.avaloq.tools.ddk.check.runtime.test.core
Import-Package: org.mockito,
Expand Down
9 changes: 2 additions & 7 deletions com.avaloq.tools.ddk.check.test.runtime.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,14 @@ Require-Bundle: com.avaloq.tools.ddk.check.runtime.core,
org.eclipse.xtext,
org.eclipse.xtext.testing,
org.eclipse.xtext.ui.testing,
org.junit,
org.eclipse.ui.workbench;resolution:=optional,
org.eclipse.xtend.lib,
org.eclipse.xtext.xbase.lib,
junit-jupiter-api,
junit-jupiter-engine,
junit-platform-suite-api,
junit-vintage-engine
Import-Package: org.junit.runner;version="4.5.0",
org.junit.runner.manipulation;version="4.5.0",
org.junit.runner.notification;version="4.5.0",
org.junit.runners;version="4.5.0",
org.junit.runners.model;version="4.5.0",
org.hamcrest.core
Import-Package: org.hamcrest.core
Bundle-RequiredExecutionEnvironment: JavaSE-21
Export-Package: com.avaloq.tools.ddk.check.test.runtime,
com.avaloq.tools.ddk.check.test.runtime.tests,
Expand Down
11 changes: 5 additions & 6 deletions ...test.runtime.tests/src/com/avaloq/tools/ddk/check/test/runtime/label/IssueLabelTest.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ import com.avaloq.tools.ddk.check.runtime.label.ICheckRuleLabelProvider
import com.avaloq.tools.ddk.check.validation.LibraryChecksIssueCodes
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 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.
Expand Down Expand Up @@ -50,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);
}
}
}
17 changes: 9 additions & 8 deletions ...src/com/avaloq/tools/ddk/check/test/runtime/tests/CheckExecutionEnvironmentTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,19 @@
*******************************************************************************/
package com.avaloq.tools.ddk.check.test.runtime.tests;

import org.junit.runner.RunWith;
import org.junit.runners.Suite;

import com.avaloq.tools.ddk.check.test.runtime.CheckConfigurationIsAppliedTest;
import com.avaloq.tools.ddk.check.test.runtime.CheckExecutionEnvironmentProjectTest;
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({CheckExecutionEnvironmentProjectTest.class, CheckConfigurationIsAppliedTest.class})
@Suite
@SelectPackages({
// @Format-Off
"com.avaloq.tools.ddk.check.test.runtime"
// @Format-On
})
public class CheckExecutionEnvironmentTestSuite {

}
16 changes: 7 additions & 9 deletions ....tests/src/com/avaloq/tools/ddk/check/test/runtime/tests/CheckLibraryChecksTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,18 @@

package com.avaloq.tools.ddk.check.test.runtime.tests;

import org.junit.runner.RunWith;
import org.junit.runners.Suite;

import com.avaloq.tools.ddk.check.test.runtime.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
// @Format-On
"com.avaloq.tools.ddk.check.test.runtime.label"
// @Format-On
})
public class CheckLibraryChecksTestSuite {

Expand Down
1 change: 0 additions & 1 deletion com.avaloq.tools.ddk.typesystem.test/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Require-Bundle: com.google.inject,
com.google.guava,
junit-jupiter-api,
junit-jupiter-engine,
junit-vintage-engine,
junit-platform-suite-api
Export-Package: com.avaloq.tools.ddk.typesystem.test
Automatic-Module-Name: com.avaloq.tools.ddk.typesystem.test