Skip to content

Commit 4a6198a

Browse files
authored
Migrate tests to JUnit 5 (#403)
* Migrates all tests to the JUnit 5 Jupiter API * Updates JUnit to 5.7.0 * Updates Mockito to 3.7.0 * Updates maven-surefire-plugin to 3.0.0-M5 * Updates Hamcrest to 2.2 Signed-off-by: Wouter Born <github@maindrain.net>
1 parent 9be1585 commit 4a6198a

47 files changed

Lines changed: 173 additions & 163 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

custom-checks/checkstyle/src/test/java/org/openhab/tools/analysis/checkstyle/test/AnnotationDependencyCheckTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
package org.openhab.tools.analysis.checkstyle.test;
1414

15-
import org.junit.Test;
15+
import org.junit.jupiter.api.Test;
1616
import org.openhab.tools.analysis.checkstyle.AnnotationDependencyCheck;
1717
import org.openhab.tools.analysis.checkstyle.api.AbstractStaticCheckTest;
1818

custom-checks/checkstyle/src/test/java/org/openhab/tools/analysis/checkstyle/test/AuthorContributionDescriptionCheckTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import java.util.Map;
1616
import java.util.TreeMap;
1717

18-
import org.junit.Before;
19-
import org.junit.Test;
18+
import org.junit.jupiter.api.BeforeEach;
19+
import org.junit.jupiter.api.Test;
2020
import org.openhab.tools.analysis.checkstyle.AuthorContributionDescriptionCheck;
2121
import org.openhab.tools.analysis.checkstyle.api.AbstractStaticCheckTest;
2222

@@ -50,7 +50,7 @@ protected String getPackageLocation() {
5050
return "checkstyle/authorContributionDescriptionCheckTest";
5151
}
5252

53-
@Before
53+
@BeforeEach
5454
public void setUp() {
5555
lineNumberToWarningMessageExpected = new TreeMap<>();
5656
configuration = createModuleConfig(AuthorContributionDescriptionCheck.class);

custom-checks/checkstyle/src/test/java/org/openhab/tools/analysis/checkstyle/test/AuthorTagCheckTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
package org.openhab.tools.analysis.checkstyle.test;
1414

15-
import org.junit.Test;
15+
import org.junit.jupiter.api.Test;
1616
import org.openhab.tools.analysis.checkstyle.AuthorTagCheck;
1717
import org.openhab.tools.analysis.checkstyle.api.AbstractStaticCheckTest;
1818

custom-checks/checkstyle/src/test/java/org/openhab/tools/analysis/checkstyle/test/AvoidScheduleAtFixedRateCheckTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
package org.openhab.tools.analysis.checkstyle.test;
1414

15-
import org.junit.Test;
15+
import org.junit.jupiter.api.Test;
1616
import org.openhab.tools.analysis.checkstyle.AvoidScheduleAtFixedRateCheck;
1717
import org.openhab.tools.analysis.checkstyle.api.AbstractStaticCheckTest;
1818

custom-checks/checkstyle/src/test/java/org/openhab/tools/analysis/checkstyle/test/BuildPropertiesCheckTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import java.io.File;
1818

1919
import org.apache.commons.io.FileUtils;
20-
import org.junit.BeforeClass;
21-
import org.junit.Test;
20+
import org.junit.jupiter.api.BeforeAll;
21+
import org.junit.jupiter.api.Test;
2222
import org.openhab.tools.analysis.checkstyle.BuildPropertiesCheck;
2323
import org.openhab.tools.analysis.checkstyle.api.AbstractStaticCheckTest;
2424

@@ -48,7 +48,7 @@ public class BuildPropertiesCheckTest extends AbstractStaticCheckTest {
4848

4949
private static DefaultConfiguration config = createModuleConfig(BuildPropertiesCheck.class);
5050

51-
@BeforeClass
51+
@BeforeAll
5252
public static void setUpTest() {
5353
config.addAttribute("expectedBinIncludesValues", "META-INF/");
5454
config.addAttribute("possibleOutputValues", "target/classes,target/test-classes");

custom-checks/checkstyle/src/test/java/org/openhab/tools/analysis/checkstyle/test/BuildPropertiesExternalLibrariesCheckTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import java.io.File;
1616
import java.io.IOException;
1717

18-
import org.junit.Test;
18+
import org.junit.jupiter.api.Test;
1919
import org.openhab.tools.analysis.checkstyle.BuildPropertiesExternalLibrariesCheck;
2020
import org.openhab.tools.analysis.checkstyle.api.AbstractStaticCheckTest;
2121

custom-checks/checkstyle/src/test/java/org/openhab/tools/analysis/checkstyle/test/BundleVendorCheckTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
*/
1313
package org.openhab.tools.analysis.checkstyle.test;
1414

15-
import org.junit.BeforeClass;
16-
import org.junit.Test;
15+
import org.junit.jupiter.api.BeforeAll;
16+
import org.junit.jupiter.api.Test;
1717
import org.openhab.tools.analysis.checkstyle.BundleVendorCheck;
1818
import org.openhab.tools.analysis.checkstyle.api.AbstractStaticCheckTest;
1919

@@ -27,7 +27,7 @@
2727
public class BundleVendorCheckTest extends AbstractStaticCheckTest {
2828
private static final DefaultConfiguration CHECK_CONFIG = createModuleConfig(BundleVendorCheck.class);
2929

30-
@BeforeClass
30+
@BeforeAll
3131
public static void setUpClass() {
3232
CHECK_CONFIG.addAttribute("allowedValues", "openHAB");
3333
}

custom-checks/checkstyle/src/test/java/org/openhab/tools/analysis/checkstyle/test/DeclarativeServicesDependencyInjectionCheckTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
package org.openhab.tools.analysis.checkstyle.test;
1414

15-
import org.junit.Test;
15+
import org.junit.jupiter.api.Test;
1616
import org.openhab.tools.analysis.checkstyle.DeclarativeServicesDependencyInjectionCheck;
1717
import org.openhab.tools.analysis.checkstyle.api.AbstractStaticCheckTest;
1818

custom-checks/checkstyle/src/test/java/org/openhab/tools/analysis/checkstyle/test/ExportInternalPackageCheckTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
*/
1313
package org.openhab.tools.analysis.checkstyle.test;
1414

15-
import org.junit.BeforeClass;
16-
import org.junit.Test;
15+
import org.junit.jupiter.api.BeforeAll;
16+
import org.junit.jupiter.api.Test;
1717
import org.openhab.tools.analysis.checkstyle.ExportInternalPackageCheck;
1818
import org.openhab.tools.analysis.checkstyle.api.AbstractStaticCheckTest;
1919

@@ -29,7 +29,7 @@
2929
public class ExportInternalPackageCheckTest extends AbstractStaticCheckTest {
3030
private static DefaultConfiguration config;
3131

32-
@BeforeClass
32+
@BeforeAll
3333
public static void setUpClass() {
3434
config = createModuleConfig(ExportInternalPackageCheck.class);
3535
}

custom-checks/checkstyle/src/test/java/org/openhab/tools/analysis/checkstyle/test/ForbiddenPackageUsageCheckTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
*/
1313
package org.openhab.tools.analysis.checkstyle.test;
1414

15-
import org.junit.Before;
16-
import org.junit.Test;
15+
import org.junit.jupiter.api.BeforeEach;
16+
import org.junit.jupiter.api.Test;
1717
import org.openhab.tools.analysis.checkstyle.ForbiddenPackageUsageCheck;
1818
import org.openhab.tools.analysis.checkstyle.api.AbstractStaticCheckTest;
1919

@@ -29,7 +29,7 @@ public class ForbiddenPackageUsageCheckTest extends AbstractStaticCheckTest {
2929
private static final String MESSAGE = "The package %s should not be used.";
3030
DefaultConfiguration config = createModuleConfig(ForbiddenPackageUsageCheck.class);
3131

32-
@Before
32+
@BeforeEach
3333
public void setUp() {
3434
config.addAttribute("forbiddenPackages", "com.google.common,com.something.something,org.something.asd");
3535
config.addAttribute("exceptions", "com.google.common.utils");

0 commit comments

Comments
 (0)