diff --git a/pom.xml b/pom.xml index 9e613bac..1a25626d 100644 --- a/pom.xml +++ b/pom.xml @@ -206,12 +206,15 @@ under the License. commons-lang3 3.19.0 - - junit - junit - 4.13.2 + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.vintage + junit-vintage-engine test diff --git a/src/it/MCHECKSTYLE-129/pom.xml b/src/it/MCHECKSTYLE-129/pom.xml index 7d3f51b3..6331d2e0 100644 --- a/src/it/MCHECKSTYLE-129/pom.xml +++ b/src/it/MCHECKSTYLE-129/pom.xml @@ -25,14 +25,6 @@ under the License. 1.0-SNAPSHOT checkstyle-new http://maven.apache.org - - - junit - junit - 3.8.1 - test - - diff --git a/src/it/MCHECKSTYLE-129/src/test/java/com/example/AppTest.java b/src/it/MCHECKSTYLE-129/src/test/java/com/example/AppTest.java index 0d6c5abc..4096826f 100644 --- a/src/it/MCHECKSTYLE-129/src/test/java/com/example/AppTest.java +++ b/src/it/MCHECKSTYLE-129/src/test/java/com/example/AppTest.java @@ -19,39 +19,8 @@ * under the License. */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; -/** - * Unit test for simple App. - */ + public class AppTest - extends TestCase { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( true ); - } } diff --git a/src/it/MCHECKSTYLE-131/pom.xml b/src/it/MCHECKSTYLE-131/pom.xml index 54209626..4645b031 100644 --- a/src/it/MCHECKSTYLE-131/pom.xml +++ b/src/it/MCHECKSTYLE-131/pom.xml @@ -26,14 +26,6 @@ under the License. 1.0-SNAPSHOT Example http://maven.apache.org - - - junit - junit - 3.8.1 - test - - module diff --git a/src/it/MCHECKSTYLE-99-custom-xref-test-location/pom.xml b/src/it/MCHECKSTYLE-99-custom-xref-test-location/pom.xml index f5f86646..e0b09bd7 100644 --- a/src/it/MCHECKSTYLE-99-custom-xref-test-location/pom.xml +++ b/src/it/MCHECKSTYLE-99-custom-xref-test-location/pom.xml @@ -25,14 +25,6 @@ under the License. 1.0-SNAPSHOT checkstyle-new http://maven.apache.org - - - junit - junit - 3.8.1 - test - - diff --git a/src/it/MCHECKSTYLE-99-custom-xref-test-location/src/test/java/com/example/AppTest.java b/src/it/MCHECKSTYLE-99-custom-xref-test-location/src/test/java/com/example/AppTest.java index 0d6c5abc..cbdd3d54 100644 --- a/src/it/MCHECKSTYLE-99-custom-xref-test-location/src/test/java/com/example/AppTest.java +++ b/src/it/MCHECKSTYLE-99-custom-xref-test-location/src/test/java/com/example/AppTest.java @@ -19,39 +19,6 @@ * under the License. */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest - extends TestCase +public class AppTest { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( true ); - } -} +} \ No newline at end of file diff --git a/src/it/MCHECKSTYLE-99-custom-xref-test-location/verify.groovy b/src/it/MCHECKSTYLE-99-custom-xref-test-location/verify.groovy index e15f882e..7245ce7a 100644 --- a/src/it/MCHECKSTYLE-99-custom-xref-test-location/verify.groovy +++ b/src/it/MCHECKSTYLE-99-custom-xref-test-location/verify.groovy @@ -21,6 +21,6 @@ report = new File( basedir, 'target/reports/checkstyle.html' ) assert report.exists(); assert report.text.contains( '' ) -assert report.text.contains( '' ) +assert report.text.contains( '' ) return true; diff --git a/src/it/MCHECKSTYLE-99/pom.xml b/src/it/MCHECKSTYLE-99/pom.xml index bf629fd6..4baf6cc9 100644 --- a/src/it/MCHECKSTYLE-99/pom.xml +++ b/src/it/MCHECKSTYLE-99/pom.xml @@ -25,14 +25,6 @@ under the License. 1.0-SNAPSHOT checkstyle-new http://maven.apache.org - - - junit - junit - 3.8.1 - test - - diff --git a/src/it/MCHECKSTYLE-99/src/test/java/com/example/AppTest.java b/src/it/MCHECKSTYLE-99/src/test/java/com/example/AppTest.java index 0d6c5abc..4f645610 100644 --- a/src/it/MCHECKSTYLE-99/src/test/java/com/example/AppTest.java +++ b/src/it/MCHECKSTYLE-99/src/test/java/com/example/AppTest.java @@ -19,39 +19,6 @@ * under the License. */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest - extends TestCase +public class AppTest { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( true ); - } } diff --git a/src/it/MCHECKSTYLE-99/verify.groovy b/src/it/MCHECKSTYLE-99/verify.groovy index fc04c778..80bc0d70 100644 --- a/src/it/MCHECKSTYLE-99/verify.groovy +++ b/src/it/MCHECKSTYLE-99/verify.groovy @@ -21,6 +21,6 @@ report = new File( basedir, 'target/reports/checkstyle.html' ) assert report.exists(); assert report.text.contains( '' ) -assert report.text.contains( '' ) +assert report.text.contains( '' ) return true; diff --git a/src/it/multi-modules-aggregate/child-b/pom.xml b/src/it/multi-modules-aggregate/child-b/pom.xml index c60904c2..777bdc37 100644 --- a/src/it/multi-modules-aggregate/child-b/pom.xml +++ b/src/it/multi-modules-aggregate/child-b/pom.xml @@ -29,12 +29,13 @@ under the License. 1.0-SNAPSHOT multi-modules-child-nosource http://maven.apache.org + - - junit - junit - 3.8.1 - test - + + org.junit.jupiter + junit-jupiter-api + 5.13.4 + test + diff --git a/src/it/multi-modules-aggregate/child-b/src/test/java/org/apache/maven/plugins/checkstyle/its/AppTest.java b/src/it/multi-modules-aggregate/child-b/src/test/java/org/apache/maven/plugins/checkstyle/its/AppTest.java index 42f84223..e6ed4557 100644 --- a/src/it/multi-modules-aggregate/child-b/src/test/java/org/apache/maven/plugins/checkstyle/its/AppTest.java +++ b/src/it/multi-modules-aggregate/child-b/src/test/java/org/apache/maven/plugins/checkstyle/its/AppTest.java @@ -1,36 +1,10 @@ package org.apache.maven.plugins.checkstyle.its; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; -/** - * Unit test for simple App. - */ -public class AppTest - extends TestCase +public class AppTest { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /* missing javadoc */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigourous Test :-) - */ + @Test public void testApp() - { - assertTrue( true ); - } + {} } diff --git a/src/it/multi-modules/multi-modules-child-nosource/pom.xml b/src/it/multi-modules/multi-modules-child-nosource/pom.xml index 3717b96d..0ad56e74 100644 --- a/src/it/multi-modules/multi-modules-child-nosource/pom.xml +++ b/src/it/multi-modules/multi-modules-child-nosource/pom.xml @@ -29,12 +29,4 @@ under the License. 1.0-SNAPSHOT multi-modules-child-nosource http://maven.apache.org - - - junit - junit - 3.8.1 - test - - diff --git a/src/it/multi-modules/multi-modules-child-nosource/src/test/java/org/apache/maven/plugins/checkstyle/its/AppTest.java b/src/it/multi-modules/multi-modules-child-nosource/src/test/java/org/apache/maven/plugins/checkstyle/its/AppTest.java index 9bca4418..dd30d6c0 100644 --- a/src/it/multi-modules/multi-modules-child-nosource/src/test/java/org/apache/maven/plugins/checkstyle/its/AppTest.java +++ b/src/it/multi-modules/multi-modules-child-nosource/src/test/java/org/apache/maven/plugins/checkstyle/its/AppTest.java @@ -19,34 +19,6 @@ * under the License. */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest extends TestCase { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest(String testName) { - super(testName); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() { - return new TestSuite(AppTest.class); - } - - /** - * Rigourous Test :-) - */ - public void testApp() { - assertTrue(true); - } -} +public class AppTest +{ +} \ No newline at end of file diff --git a/src/it/multi-modules/multi-modules-child/pom.xml b/src/it/multi-modules/multi-modules-child/pom.xml index 00fdde84..6f830d45 100644 --- a/src/it/multi-modules/multi-modules-child/pom.xml +++ b/src/it/multi-modules/multi-modules-child/pom.xml @@ -29,14 +29,6 @@ under the License. 1.0-SNAPSHOT multi-modules-child http://maven.apache.org - - - junit - junit - 3.8.1 - test - - diff --git a/src/it/multi-modules/multi-modules-child/src/test/java/org/apache/maven/plugins/checkstyle/its/AppTest.java b/src/it/multi-modules/multi-modules-child/src/test/java/org/apache/maven/plugins/checkstyle/its/AppTest.java index 9bca4418..dd30d6c0 100644 --- a/src/it/multi-modules/multi-modules-child/src/test/java/org/apache/maven/plugins/checkstyle/its/AppTest.java +++ b/src/it/multi-modules/multi-modules-child/src/test/java/org/apache/maven/plugins/checkstyle/its/AppTest.java @@ -19,34 +19,6 @@ * under the License. */ -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest extends TestCase { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest(String testName) { - super(testName); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() { - return new TestSuite(AppTest.class); - } - - /** - * Rigourous Test :-) - */ - public void testApp() { - assertTrue(true); - } -} +public class AppTest +{ +} \ No newline at end of file diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleTestCase.java b/src/test/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleTestCase.java index d9d72381..a0b2380e 100644 --- a/src/test/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleTestCase.java +++ b/src/test/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleTestCase.java @@ -39,6 +39,7 @@ import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory; import org.eclipse.aether.repository.LocalRepository; +import org.junit.jupiter.api.Assertions; /** * Abstract class to test reports generation. @@ -51,8 +52,7 @@ public abstract class AbstractCheckstyleTestCase extends AbstractMojoTestCase { */ private MavenProject testMavenProject; - @Override - protected void setUp() throws Exception { + public void setUp() throws Exception { // required for mojo lookups to work super.setUp(); @@ -104,7 +104,7 @@ protected File generateReport(String goal, String pluginXml) throws Exception { protected CheckstyleReport createReportMojo(String goal, File pluginXmlFile) throws Exception { CheckstyleReport mojo = (CheckstyleReport) lookupMojo(goal, pluginXmlFile); - assertNotNull("Mojo not found.", mojo); + Assertions.assertNotNull(mojo, "Mojo not found."); LegacySupport legacySupport = lookup(LegacySupport.class); legacySupport.setSession(newMavenSession(new MavenProjectStub())); diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleReportTest.java b/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleReportTest.java index a82bcc1d..5f371f01 100644 --- a/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleReportTest.java +++ b/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleReportTest.java @@ -26,40 +26,57 @@ import org.apache.maven.artifact.DependencyResolutionRequiredException; import org.apache.maven.doxia.tools.SiteTool; import org.apache.maven.plugin.descriptor.PluginDescriptor; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Edwin Punzalan */ public class CheckstyleReportTest extends AbstractCheckstyleTestCase { + + @BeforeEach + public void setUp() throws Exception { + super.setUp(); + } + + @Test public void testNoSource() throws Exception { File generatedReport = generateReport(getGoal(), "no-source-plugin-config.xml"); assertFalse(new File(generatedReport.getAbsolutePath()).exists()); } + @Test public void testMinConfiguration() throws Exception { generateReport("min-plugin-config.xml"); } + @Test public void testCustomConfiguration() throws Exception { generateReport("custom-plugin-config.xml"); } + @Test public void testUseFile() throws Exception { generateReport("useFile-plugin-config.xml"); } + @Test public void testNoRulesSummary() throws Exception { generateReport("no-rules-plugin-config.xml"); } + @Test public void testNoSeveritySummary() throws Exception { generateReport("no-severity-plugin-config.xml"); } + @Test public void testNoFilesSummary() throws Exception { generateReport("no-files-plugin-config.xml"); } + @Test public void testFailOnError() { try { generateReport("fail-on-error-plugin-config.xml"); @@ -70,6 +87,7 @@ public void testFailOnError() { } } + @Test public void testDependencyResolutionException() { try { generateReport("dep-resolution-exception-plugin-config.xml"); @@ -84,6 +102,7 @@ public void testDependencyResolutionException() { } } + @Test public void testTestSourceDirectory() throws Exception { generateReport("test-source-directory-plugin-config.xml"); } @@ -104,17 +123,17 @@ private void generateReport(String pluginXml) throws Exception { assertTrue(new File(generatedReport.getAbsolutePath()).exists()); File outputFile = (File) getVariableValueFromObject(mojo, "outputFile"); - assertNotNull("Test output file", outputFile); - assertTrue("Test output file exists", outputFile.exists()); + Assertions.assertNotNull(outputFile, "Test output file"); + Assertions.assertTrue(outputFile.exists(), "Test output file exists"); String cacheFile = (String) getVariableValueFromObject(mojo, "cacheFile"); if (cacheFile != null) { - assertTrue("Test cache file exists", new File(cacheFile).exists()); + Assertions.assertTrue(new File(cacheFile).exists(), "Test cache file exists"); } File useFile = (File) getVariableValueFromObject(mojo, "useFile"); if (useFile != null) { - assertTrue("Test useFile exists", useFile.exists()); + Assertions.assertTrue(useFile.exists(), "Test useFile exists"); } String str = new String(Files.readAllBytes(generatedReport.toPath()), StandardCharsets.UTF_8); @@ -122,25 +141,25 @@ private void generateReport(String pluginXml) throws Exception { boolean searchHeaderFound = str.contains(getHtmlHeader(bundle.getString("report.checkstyle.rules"))); Boolean rules = (Boolean) getVariableValueFromObject(mojo, "enableRulesSummary"); if (rules) { - assertTrue("Test for Rules Summary", searchHeaderFound); + Assertions.assertTrue(searchHeaderFound, "Test for Rules Summary"); } else { - assertFalse("Test for Rules Summary", searchHeaderFound); + Assertions.assertFalse(searchHeaderFound, "Test for Rules Summary"); } searchHeaderFound = str.contains(getHtmlHeader(bundle.getString("report.checkstyle.summary"))); Boolean severity = (Boolean) getVariableValueFromObject(mojo, "enableSeveritySummary"); if (severity) { - assertTrue("Test for Severity Summary", searchHeaderFound); + Assertions.assertTrue(searchHeaderFound, "Test for Severity Summary"); } else { - assertFalse("Test for Severity Summary", searchHeaderFound); + Assertions.assertFalse(searchHeaderFound, "Test for Severity Summary"); } searchHeaderFound = str.contains(getHtmlHeader(bundle.getString("report.checkstyle.files"))); Boolean files = (Boolean) getVariableValueFromObject(mojo, "enableFilesSummary"); if (files) { - assertTrue("Test for Files Summary", searchHeaderFound); + Assertions.assertTrue(searchHeaderFound, "Test for Files Summary"); } else { - assertFalse("Test for Files Summary", searchHeaderFound); + Assertions.assertFalse(searchHeaderFound, "Test for Files Summary"); } } diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.java b/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.java index 8ab86449..a5bfec2f 100644 --- a/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.java +++ b/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.java @@ -28,12 +28,24 @@ import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.plugin.testing.AbstractMojoTestCase; import org.apache.maven.plugin.testing.stubs.MavenProjectStub; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.fail; /** * @author Edwin Punzalan * */ public class CheckstyleViolationCheckMojoTest extends AbstractMojoTestCase { + + @BeforeEach + public void setUp() throws Exception { + super.setUp(); + } + + @Test public void testDefaultConfig() throws Exception { File pluginXmlFile = new File(getBasedir(), "src/test/resources/plugin-configs/check-plugin-config.xml"); @@ -41,9 +53,9 @@ public void testDefaultConfig() throws Exception { mojoSetup(mojo); - assertNotNull("Mojo not found.", mojo); + Assertions.assertNotNull(mojo, "Mojo not found."); - assertNotNull("project null.", mojo.project); + Assertions.assertNotNull(mojo.project, "project null."); try { mojo.execute(); @@ -54,12 +66,13 @@ public void testDefaultConfig() throws Exception { } } + @Test public void testInvalidFormatWithSkipExec() throws Exception { File pluginXmlFile = new File(getBasedir(), "src/test/resources/plugin-configs/check-plugin-config.xml"); Mojo mojo = lookupMojo("check", pluginXmlFile); - assertNotNull("Mojo not found.", mojo); + Assertions.assertNotNull(mojo, "Mojo not found."); mojoSetup(mojo); @@ -74,12 +87,13 @@ public void testInvalidFormatWithSkipExec() throws Exception { } } + @Test public void testNoOutputFile() throws Exception { File pluginXmlFile = new File(getBasedir(), "src/test/resources/plugin-configs/check-plugin-config.xml"); Mojo mojo = lookupMojo("check", pluginXmlFile); - assertNotNull("Mojo not found.", mojo); + Assertions.assertNotNull(mojo, "Mojo not found."); mojoSetup(mojo); @@ -93,7 +107,7 @@ private void doTestPlainOutputFile(boolean failsOnError) throws Exception { Mojo mojo = lookupMojo("check", pluginXmlFile); - assertNotNull("Mojo not found.", mojo); + Assertions.assertNotNull(mojo, "Mojo not found."); PluginDescriptor descriptorStub = new PluginDescriptor(); descriptorStub.setGroupId("org.apache.maven.plugins"); @@ -105,6 +119,7 @@ private void doTestPlainOutputFile(boolean failsOnError) throws Exception { mojo.execute(); } + @Test public void testPlainOutputFileFailOnError() throws Exception { try { doTestPlainOutputFile(true); @@ -115,16 +130,18 @@ public void testPlainOutputFileFailOnError() throws Exception { } } + @Test public void testPlainOutputFile() throws Exception { doTestPlainOutputFile(false); } + @Test public void testNoFail() throws Exception { File pluginXmlFile = new File(getBasedir(), "src/test/resources/plugin-configs/check-plugin-config.xml"); Mojo mojo = lookupMojo("check", pluginXmlFile); - assertNotNull("Mojo not found.", mojo); + Assertions.assertNotNull(mojo, "Mojo not found."); mojoSetup(mojo); diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/RuleUtilTest.java b/src/test/java/org/apache/maven/plugins/checkstyle/RuleUtilTest.java index f2a68ead..27538831 100644 --- a/src/test/java/org/apache/maven/plugins/checkstyle/RuleUtilTest.java +++ b/src/test/java/org/apache/maven/plugins/checkstyle/RuleUtilTest.java @@ -20,17 +20,23 @@ import java.util.List; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; -public class RuleUtilTest extends TestCase { +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class RuleUtilTest { private static final String CHECKSTYLE_PACKAGE = "com.puppycrawl.tools.checkstyle.checks"; + @Test public void testGetName() { assertEquals("FinalParameters", RuleUtil.getName(CHECKSTYLE_PACKAGE + ".FinalParameters")); assertEquals("FinalParameters", RuleUtil.getName(CHECKSTYLE_PACKAGE + ".FinalParametersCheck")); assertNull(RuleUtil.getName((String) null)); } + @Test public void testGetCategory() { assertEquals("misc", RuleUtil.getCategory(CHECKSTYLE_PACKAGE + ".FinalParametersCheck")); assertEquals("test", RuleUtil.getCategory(CHECKSTYLE_PACKAGE + ".test.FinalParametersCheck")); @@ -39,6 +45,7 @@ public void testGetCategory() { assertNull(RuleUtil.getCategory((String) null)); } + @Test public void testMatcher() { String[] specs = ("misc, test, extension, Header, " + CHECKSTYLE_PACKAGE + ".test2").split(","); String[] eventSrcNames = new String[] { @@ -57,13 +64,14 @@ public void testMatcher() { for (int j = 0; j < matchers.size(); j++) { String eventSrcName = eventSrcNames[j]; assertEquals( - spec + " should" + ((i == j) ? " " : " not ") + "match " + eventSrcName, i == j, - matcher.match(eventSrcName)); + matcher.match(eventSrcName), + spec + " should" + ((i == j) ? " " : " not ") + "match " + eventSrcName); } } } + @Test public void testMatcherWithBlankStrings() { String[] specs = (" ,,foo, ").split(","); diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/ViolationTest.java b/src/test/java/org/apache/maven/plugins/checkstyle/ViolationTest.java index f13eff9d..0b3dc6d8 100644 --- a/src/test/java/org/apache/maven/plugins/checkstyle/ViolationTest.java +++ b/src/test/java/org/apache/maven/plugins/checkstyle/ViolationTest.java @@ -18,9 +18,12 @@ */ package org.apache.maven.plugins.checkstyle; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; -public class ViolationTest extends TestCase { +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class ViolationTest { + @Test public void testEquals() { Violation v1 = new Violation("", null, null, "", "", "", ""); Violation v2 = new Violation("", null, null, "", "", "", ""); diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorTest.java b/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorTest.java index b2923097..c4cb2315 100644 --- a/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorTest.java +++ b/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorTest.java @@ -19,10 +19,13 @@ package org.apache.maven.plugins.checkstyle.exec; import org.apache.maven.plugin.testing.AbstractMojoTestCase; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class CheckstyleExecutorTest extends AbstractMojoTestCase { + @Test public void testDefaultConfig() throws Exception { CheckstyleExecutor executor = (CheckstyleExecutor) lookup(CheckstyleExecutor.class); - assertNotNull("project null.", executor); + Assertions.assertNotNull(executor, "project null."); } } diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerMultiSourceTest.java b/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerMultiSourceTest.java index cc3606ee..bc473b14 100644 --- a/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerMultiSourceTest.java +++ b/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerMultiSourceTest.java @@ -25,16 +25,19 @@ import com.puppycrawl.tools.checkstyle.api.AuditEvent; import com.puppycrawl.tools.checkstyle.api.SeverityLevel; import com.puppycrawl.tools.checkstyle.api.Violation; -import junit.framework.TestCase; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -public class CheckstyleReportListenerMultiSourceTest extends TestCase { +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class CheckstyleReportListenerMultiSourceTest { private Map listenerMap = new HashMap<>(); /** * {@inheritDoc} */ - @Override - protected void setUp() throws Exception { + @BeforeEach + public void setUp() throws Exception { CheckstyleCheckerListener listener = new CheckstyleCheckerListener(new File("/source/path")); listener.addSourceDirectory(new File("/source/path2")); listener.setSeverityLevelFilter(SeverityLevel.INFO); @@ -56,6 +59,7 @@ protected void setUp() throws Exception { listenerMap.put(listener.getSeverityLevelFilter(), listener); } + @Test public void testListeners() { fireAuditStarted(null); @@ -93,47 +97,43 @@ public void testListeners() { CheckstyleCheckerListener listener = listenerMap.get(SeverityLevel.INFO); CheckstyleResults results = listener.getResults(); - assertEquals("Test total files", 4, results.getFiles().size()); - assertEquals("Test file count", 4, results.getFileCount()); - assertEquals( - "test file violations", 1, results.getFileViolations("file1").size()); - assertEquals("test file severities", 1, results.getSeverityCount("file1", SeverityLevel.INFO)); - assertEquals("test file severities", 0, results.getSeverityCount("file1", SeverityLevel.WARNING)); - assertEquals("test file severities", 0, results.getSeverityCount("file1", SeverityLevel.ERROR)); - assertEquals("test file severities", 0, results.getSeverityCount("file1", SeverityLevel.IGNORE)); + assertEquals(4, results.getFiles().size(), "Test total files"); + assertEquals(4, results.getFileCount(), "Test file count"); + assertEquals(1, results.getFileViolations("file1").size(), "test file violations"); + assertEquals(1, results.getSeverityCount("file1", SeverityLevel.INFO), "test file severities"); + assertEquals(0, results.getSeverityCount("file1", SeverityLevel.WARNING), "test file severities"); + assertEquals(0, results.getSeverityCount("file1", SeverityLevel.ERROR), "test file severities"); + assertEquals(0, results.getSeverityCount("file1", SeverityLevel.IGNORE), "test file severities"); listener = listenerMap.get(SeverityLevel.WARNING); results = listener.getResults(); - assertEquals("Test total files", 4, results.getFiles().size()); - assertEquals("Test file count", 4, results.getFileCount()); - assertEquals( - "test file violations", 2, results.getFileViolations("file2").size()); - assertEquals("test file severities", 0, results.getSeverityCount("file2", SeverityLevel.INFO)); - assertEquals("test file severities", 2, results.getSeverityCount("file2", SeverityLevel.WARNING)); - assertEquals("test file severities", 0, results.getSeverityCount("file2", SeverityLevel.ERROR)); - assertEquals("test file severities", 0, results.getSeverityCount("file2", SeverityLevel.IGNORE)); + assertEquals(4, results.getFiles().size(), "Test total files"); + assertEquals(4, results.getFileCount(), "Test file count"); + assertEquals(2, results.getFileViolations("file2").size(), "test file violations"); + assertEquals(0, results.getSeverityCount("file2", SeverityLevel.INFO), "test file severities"); + assertEquals(2, results.getSeverityCount("file2", SeverityLevel.WARNING), "test file severities"); + assertEquals(0, results.getSeverityCount("file2", SeverityLevel.ERROR), "test file severities"); + assertEquals(0, results.getSeverityCount("file2", SeverityLevel.IGNORE), "test file severities"); listener = listenerMap.get(SeverityLevel.ERROR); results = listener.getResults(); - assertEquals("Test total files", 4, results.getFiles().size()); - assertEquals("Test file count", 4, results.getFileCount()); - assertEquals( - "test file violations", 3, results.getFileViolations("file3").size()); - assertEquals("test file severities", 0, results.getSeverityCount("file3", SeverityLevel.INFO)); - assertEquals("test file severities", 0, results.getSeverityCount("file3", SeverityLevel.WARNING)); - assertEquals("test file severities", 3, results.getSeverityCount("file3", SeverityLevel.ERROR)); - assertEquals("test file severities", 0, results.getSeverityCount("file3", SeverityLevel.IGNORE)); + assertEquals(4, results.getFiles().size(), "Test total files"); + assertEquals(4, results.getFileCount(), "Test file count"); + assertEquals(3, results.getFileViolations("file3").size(), "test file violations"); + assertEquals(0, results.getSeverityCount("file3", SeverityLevel.INFO), "test file severities"); + assertEquals(0, results.getSeverityCount("file3", SeverityLevel.WARNING), "test file severities"); + assertEquals(3, results.getSeverityCount("file3", SeverityLevel.ERROR), "test file severities"); + assertEquals(0, results.getSeverityCount("file3", SeverityLevel.IGNORE), "test file severities"); listener = listenerMap.get(SeverityLevel.IGNORE); results = listener.getResults(); - assertEquals("Test total files", 4, results.getFiles().size()); - assertEquals("Test file count", 4, results.getFileCount()); - assertEquals( - "test file violations", 0, results.getFileViolations("file4").size()); - assertEquals("test file severities", 0, results.getSeverityCount("file4", SeverityLevel.INFO)); - assertEquals("test file severities", 0, results.getSeverityCount("file4", SeverityLevel.WARNING)); - assertEquals("test file severities", 0, results.getSeverityCount("file4", SeverityLevel.ERROR)); - assertEquals("test file severities", 0, results.getSeverityCount("file4", SeverityLevel.IGNORE)); + assertEquals(4, results.getFiles().size(), "Test total files"); + assertEquals(4, results.getFileCount(), "Test file count"); + assertEquals(0, results.getFileViolations("file4").size(), "test file violations"); + assertEquals(0, results.getSeverityCount("file4", SeverityLevel.INFO), "test file severities"); + assertEquals(0, results.getSeverityCount("file4", SeverityLevel.WARNING), "test file severities"); + assertEquals(0, results.getSeverityCount("file4", SeverityLevel.ERROR), "test file severities"); + assertEquals(0, results.getSeverityCount("file4", SeverityLevel.IGNORE), "test file severities"); } private void fireAuditStarted(AuditEvent event) { diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerTest.java b/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerTest.java index 36a352bd..f49fa02d 100644 --- a/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerTest.java +++ b/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerTest.java @@ -25,18 +25,21 @@ import com.puppycrawl.tools.checkstyle.api.AuditEvent; import com.puppycrawl.tools.checkstyle.api.SeverityLevel; import com.puppycrawl.tools.checkstyle.api.Violation; -import junit.framework.TestCase; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Edwin Punzalan * */ -public class CheckstyleReportListenerTest extends TestCase { +public class CheckstyleReportListenerTest { private Map listenerMap = new HashMap<>(); /** {@inheritDoc} */ - @Override - protected void setUp() throws Exception { + @BeforeEach + public void setUp() throws Exception { CheckstyleCheckerListener listener = new CheckstyleCheckerListener(new File("/source/path")); listener.setSeverityLevelFilter(SeverityLevel.INFO); listenerMap.put(listener.getSeverityLevelFilter(), listener); @@ -54,6 +57,7 @@ protected void setUp() throws Exception { listenerMap.put(listener.getSeverityLevelFilter(), listener); } + @Test public void testListeners() { fireAuditStarted(null); @@ -91,47 +95,43 @@ public void testListeners() { CheckstyleCheckerListener listener = listenerMap.get(SeverityLevel.INFO); CheckstyleResults results = listener.getResults(); - assertEquals("Test total files", 4, results.getFiles().size()); - assertEquals("Test file count", 4, results.getFileCount()); - assertEquals( - "test file violations", 1, results.getFileViolations("file1").size()); - assertEquals("test file severities", 1, results.getSeverityCount("file1", SeverityLevel.INFO)); - assertEquals("test file severities", 0, results.getSeverityCount("file1", SeverityLevel.WARNING)); - assertEquals("test file severities", 0, results.getSeverityCount("file1", SeverityLevel.ERROR)); - assertEquals("test file severities", 0, results.getSeverityCount("file1", SeverityLevel.IGNORE)); + assertEquals(4, results.getFiles().size(), "Test total files"); + assertEquals(4, results.getFileCount(), "Test file count"); + assertEquals(1, results.getFileViolations("file1").size(), "test file violations"); + assertEquals(1, results.getSeverityCount("file1", SeverityLevel.INFO), "test file severities"); + assertEquals(0, results.getSeverityCount("file1", SeverityLevel.WARNING), "test file severities"); + assertEquals(0, results.getSeverityCount("file1", SeverityLevel.ERROR), "test file severities"); + assertEquals(0, results.getSeverityCount("file1", SeverityLevel.IGNORE), "test file severities"); listener = listenerMap.get(SeverityLevel.WARNING); results = listener.getResults(); - assertEquals("Test total files", 4, results.getFiles().size()); - assertEquals("Test file count", 4, results.getFileCount()); - assertEquals( - "test file violations", 2, results.getFileViolations("file2").size()); - assertEquals("test file severities", 0, results.getSeverityCount("file2", SeverityLevel.INFO)); - assertEquals("test file severities", 2, results.getSeverityCount("file2", SeverityLevel.WARNING)); - assertEquals("test file severities", 0, results.getSeverityCount("file2", SeverityLevel.ERROR)); - assertEquals("test file severities", 0, results.getSeverityCount("file2", SeverityLevel.IGNORE)); + assertEquals(4, results.getFiles().size(), "Test total files"); + assertEquals(4, results.getFileCount(), "Test file count"); + assertEquals(2, results.getFileViolations("file2").size(), "test file violations"); + assertEquals(0, results.getSeverityCount("file2", SeverityLevel.INFO), "test file severities"); + assertEquals(2, results.getSeverityCount("file2", SeverityLevel.WARNING), "test file severities"); + assertEquals(0, results.getSeverityCount("file2", SeverityLevel.ERROR), "test file severities"); + assertEquals(0, results.getSeverityCount("file2", SeverityLevel.IGNORE), "test file severities"); listener = listenerMap.get(SeverityLevel.ERROR); results = listener.getResults(); - assertEquals("Test total files", 4, results.getFiles().size()); - assertEquals("Test file count", 4, results.getFileCount()); - assertEquals( - "test file violations", 3, results.getFileViolations("file3").size()); - assertEquals("test file severities", 0, results.getSeverityCount("file3", SeverityLevel.INFO)); - assertEquals("test file severities", 0, results.getSeverityCount("file3", SeverityLevel.WARNING)); - assertEquals("test file severities", 3, results.getSeverityCount("file3", SeverityLevel.ERROR)); - assertEquals("test file severities", 0, results.getSeverityCount("file3", SeverityLevel.IGNORE)); + assertEquals(4, results.getFiles().size(), "Test total files"); + assertEquals(4, results.getFileCount(), "Test file count"); + assertEquals(3, results.getFileViolations("file3").size(), "test file violations"); + assertEquals(0, results.getSeverityCount("file3", SeverityLevel.INFO), "test file severities"); + assertEquals(0, results.getSeverityCount("file3", SeverityLevel.WARNING), "test file severities"); + assertEquals(3, results.getSeverityCount("file3", SeverityLevel.ERROR), "test file severities"); + assertEquals(0, results.getSeverityCount("file3", SeverityLevel.IGNORE), "test file severities"); listener = listenerMap.get(SeverityLevel.IGNORE); results = listener.getResults(); - assertEquals("Test total files", 4, results.getFiles().size()); - assertEquals("Test file count", 4, results.getFileCount()); - assertEquals( - "test file violations", 0, results.getFileViolations("file4").size()); - assertEquals("test file severities", 0, results.getSeverityCount("file4", SeverityLevel.INFO)); - assertEquals("test file severities", 0, results.getSeverityCount("file4", SeverityLevel.WARNING)); - assertEquals("test file severities", 0, results.getSeverityCount("file4", SeverityLevel.ERROR)); - assertEquals("test file severities", 0, results.getSeverityCount("file4", SeverityLevel.IGNORE)); + assertEquals(4, results.getFiles().size(), "Test total files"); + assertEquals(4, results.getFileCount(), "Test file count"); + assertEquals(0, results.getFileViolations("file4").size(), "test file violations"); + assertEquals(0, results.getSeverityCount("file4", SeverityLevel.INFO), "test file severities"); + assertEquals(0, results.getSeverityCount("file4", SeverityLevel.WARNING), "test file severities"); + assertEquals(0, results.getSeverityCount("file4", SeverityLevel.ERROR), "test file severities"); + assertEquals(0, results.getSeverityCount("file4", SeverityLevel.IGNORE), "test file severities"); } private void fireAuditStarted(AuditEvent event) { diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResultsTest.java b/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResultsTest.java index cdcbbc9a..30d19455 100644 --- a/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResultsTest.java +++ b/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResultsTest.java @@ -27,34 +27,35 @@ import com.puppycrawl.tools.checkstyle.api.AuditEvent; import com.puppycrawl.tools.checkstyle.api.SeverityLevel; import com.puppycrawl.tools.checkstyle.api.Violation; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Edwin Punzalan * */ -public class CheckstyleResultsTest extends TestCase { +public class CheckstyleResultsTest { private CheckstyleResults results = new CheckstyleResults(); + @Test public void testEmptyResults() { - assertEquals("test total files", 0, results.getFiles().size()); + assertEquals(0, results.getFiles().size(), "test total files"); - assertEquals("test file count", 0, results.getFileCount()); + assertEquals(0, results.getFileCount(), "test file count"); - assertEquals( - "test zero file violations", - 0, - results.getFileViolations("filename").size()); + assertEquals(0, results.getFileViolations("filename").size(), "test zero file violations"); - assertEquals("test INFO severity count", 0, results.getSeverityCount(SeverityLevel.INFO)); + assertEquals(0, results.getSeverityCount(SeverityLevel.INFO), "test INFO severity count"); - assertEquals("test WARNING severity count", 0, results.getSeverityCount(SeverityLevel.WARNING)); + assertEquals(0, results.getSeverityCount(SeverityLevel.WARNING), "test WARNING severity count"); - assertEquals("test ERROR severity count", 0, results.getSeverityCount(SeverityLevel.ERROR)); + assertEquals(0, results.getSeverityCount(SeverityLevel.ERROR), "test ERROR severity count"); - assertEquals("test IGNORE severity count", 0, results.getSeverityCount(SeverityLevel.IGNORE)); + assertEquals(0, results.getSeverityCount(SeverityLevel.IGNORE), "test IGNORE severity count"); } + @Test public void testResults() { Map> files = new HashMap<>(); @@ -85,49 +86,44 @@ public void testResults() { results.setFiles(files); - assertEquals("test total files", 4, results.getFiles().size()); - assertEquals("test file count", 4, results.getFileCount()); - - assertEquals("test file severities", 0, results.getSeverityCount("file0", SeverityLevel.INFO)); - assertEquals("test file severities", 0, results.getSeverityCount("file0", SeverityLevel.WARNING)); - assertEquals("test file severities", 0, results.getSeverityCount("file0", SeverityLevel.ERROR)); - assertEquals("test file severities", 0, results.getSeverityCount("file0", SeverityLevel.IGNORE)); - - assertEquals( - "test file violations", 1, results.getFileViolations("file1").size()); - assertEquals("test file severities", 1, results.getSeverityCount("file1", SeverityLevel.INFO)); - assertEquals("test file severities", 0, results.getSeverityCount("file1", SeverityLevel.WARNING)); - assertEquals("test file severities", 0, results.getSeverityCount("file1", SeverityLevel.ERROR)); - assertEquals("test file severities", 0, results.getSeverityCount("file1", SeverityLevel.IGNORE)); - - assertEquals( - "test file violations", 2, results.getFileViolations("file2").size()); - assertEquals("test file severities", 0, results.getSeverityCount("file2", SeverityLevel.INFO)); - assertEquals("test file severities", 2, results.getSeverityCount("file2", SeverityLevel.WARNING)); - assertEquals("test file severities", 0, results.getSeverityCount("file2", SeverityLevel.ERROR)); - assertEquals("test file severities", 0, results.getSeverityCount("file2", SeverityLevel.IGNORE)); - - assertEquals( - "test file violations", 3, results.getFileViolations("file3").size()); - assertEquals("test file severities", 0, results.getSeverityCount("file3", SeverityLevel.INFO)); - assertEquals("test file severities", 0, results.getSeverityCount("file3", SeverityLevel.WARNING)); - assertEquals("test file severities", 3, results.getSeverityCount("file3", SeverityLevel.ERROR)); - assertEquals("test file severities", 0, results.getSeverityCount("file3", SeverityLevel.IGNORE)); - - assertEquals( - "test file violations", 4, results.getFileViolations("file4").size()); - assertEquals("test file severities", 0, results.getSeverityCount("file4", SeverityLevel.INFO)); - assertEquals("test file severities", 0, results.getSeverityCount("file4", SeverityLevel.WARNING)); - assertEquals("test file severities", 0, results.getSeverityCount("file4", SeverityLevel.ERROR)); - assertEquals("test file severities", 4, results.getSeverityCount("file4", SeverityLevel.IGNORE)); - - assertEquals("test INFO severity count", 1, results.getSeverityCount(SeverityLevel.INFO)); - assertEquals("test WARNING severity count", 2, results.getSeverityCount(SeverityLevel.WARNING)); - assertEquals("test ERROR severity count", 3, results.getSeverityCount(SeverityLevel.ERROR)); - assertEquals("test IGNORE severity count", 4, results.getSeverityCount(SeverityLevel.IGNORE)); + assertEquals(4, results.getFiles().size(), "test total files"); + assertEquals(4, results.getFileCount(), "test file count"); + + assertEquals(0, results.getSeverityCount("file0", SeverityLevel.INFO), "test file severities"); + assertEquals(0, results.getSeverityCount("file0", SeverityLevel.WARNING), "test file severities"); + assertEquals(0, results.getSeverityCount("file0", SeverityLevel.ERROR), "test file severities"); + assertEquals(0, results.getSeverityCount("file0", SeverityLevel.IGNORE), "test file severities"); + + assertEquals(1, results.getFileViolations("file1").size(), "test file violations"); + assertEquals(1, results.getSeverityCount("file1", SeverityLevel.INFO), "test file severities"); + assertEquals(0, results.getSeverityCount("file1", SeverityLevel.WARNING), "test file severities"); + assertEquals(0, results.getSeverityCount("file1", SeverityLevel.ERROR), "test file severities"); + assertEquals(0, results.getSeverityCount("file1", SeverityLevel.IGNORE), "test file severities"); + + assertEquals(2, results.getFileViolations("file2").size(), "test file violations"); + assertEquals(0, results.getSeverityCount("file2", SeverityLevel.INFO), "test file severities"); + assertEquals(2, results.getSeverityCount("file2", SeverityLevel.WARNING), "test file severities"); + assertEquals(0, results.getSeverityCount("file2", SeverityLevel.ERROR), "test file severities"); + assertEquals(0, results.getSeverityCount("file2", SeverityLevel.IGNORE), "test file severities"); + + assertEquals(3, results.getFileViolations("file3").size(), "test file violations"); + assertEquals(0, results.getSeverityCount("file3", SeverityLevel.INFO), "test file severities"); + assertEquals(0, results.getSeverityCount("file3", SeverityLevel.WARNING), "test file severities"); + assertEquals(3, results.getSeverityCount("file3", SeverityLevel.ERROR), "test file severities"); + assertEquals(0, results.getSeverityCount("file3", SeverityLevel.IGNORE), "test file severities"); + + assertEquals(4, results.getFileViolations("file4").size(), "test file violations"); + assertEquals(0, results.getSeverityCount("file4", SeverityLevel.INFO), "test file severities"); + assertEquals(0, results.getSeverityCount("file4", SeverityLevel.WARNING), "test file severities"); + assertEquals(0, results.getSeverityCount("file4", SeverityLevel.ERROR), "test file severities"); + assertEquals(4, results.getSeverityCount("file4", SeverityLevel.IGNORE), "test file severities"); + + assertEquals(1, results.getSeverityCount(SeverityLevel.INFO), "test INFO severity count"); + assertEquals(2, results.getSeverityCount(SeverityLevel.WARNING), "test WARNING severity count"); + assertEquals(3, results.getSeverityCount(SeverityLevel.ERROR), "test ERROR severity count"); + assertEquals(4, results.getSeverityCount(SeverityLevel.IGNORE), "test IGNORE severity count"); results.setFileViolations("file", Collections.emptyList()); - assertEquals( - "test file violations", 0, results.getFileViolations("file").size()); + assertEquals(0, results.getFileViolations("file").size(), "test file violations"); } }