Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

}