diff --git a/junit-tests/src/test/java/org/junit/gen5/commons/util/ClasspathScannerTest.java b/junit-tests/src/test/java/org/junit/gen5/commons/util/ClasspathScannerTests.java similarity index 90% rename from junit-tests/src/test/java/org/junit/gen5/commons/util/ClasspathScannerTest.java rename to junit-tests/src/test/java/org/junit/gen5/commons/util/ClasspathScannerTests.java index d230be33a10..8ce831f0f4e 100644 --- a/junit-tests/src/test/java/org/junit/gen5/commons/util/ClasspathScannerTest.java +++ b/junit-tests/src/test/java/org/junit/gen5/commons/util/ClasspathScannerTests.java @@ -21,7 +21,7 @@ import org.junit.Before; import org.junit.Test; -public class ClasspathScannerTest { +public class ClasspathScannerTests { private ClasspathScanner classpathScanner; @@ -40,9 +40,9 @@ public void findAllClassesInThisPackage() throws Exception { @Test public void findAllClassesInThisPackageWithFilter() throws Exception { - Predicate> thisClassOnly = clazz -> clazz == ClasspathScannerTest.class; + Predicate> thisClassOnly = clazz -> clazz == ClasspathScannerTests.class; List> classes = classpathScanner.scanForClassesInPackage("org.junit.gen5.commons", thisClassOnly); - Assert.assertSame(ClasspathScannerTest.class, classes.get(0)); + Assert.assertSame(ClasspathScannerTests.class, classes.get(0)); } @Test @@ -53,10 +53,10 @@ public void isPackage() throws Exception { @Test public void findAllClassesInClasspathRoot() throws Exception { - Predicate> thisClassOnly = clazz -> clazz == ClasspathScannerTest.class; + Predicate> thisClassOnly = clazz -> clazz == ClasspathScannerTests.class; File root = getTestClasspathRoot(); List> classes = classpathScanner.scanForClassesInClasspathRoot(root, thisClassOnly); - Assert.assertSame(ClasspathScannerTest.class, classes.get(0)); + Assert.assertSame(ClasspathScannerTests.class, classes.get(0)); } @Test @@ -65,7 +65,7 @@ public void findAllClassesInClasspathRootWithFilter() throws Exception { List> classes = classpathScanner.scanForClassesInClasspathRoot(root, clazz -> true); Assert.assertTrue("Should be at least 20 classes", classes.size() >= 20); - Assert.assertTrue(classes.contains(ClasspathScannerTest.class)); + Assert.assertTrue(classes.contains(ClasspathScannerTests.class)); } private File getTestClasspathRoot() { diff --git a/junit-tests/src/test/java/org/junit/gen5/console/ConsoleRunnerTest.java b/junit-tests/src/test/java/org/junit/gen5/console/ConsoleRunnerTests.java similarity index 98% rename from junit-tests/src/test/java/org/junit/gen5/console/ConsoleRunnerTest.java rename to junit-tests/src/test/java/org/junit/gen5/console/ConsoleRunnerTests.java index 809ac0946fd..40a1fea337d 100644 --- a/junit-tests/src/test/java/org/junit/gen5/console/ConsoleRunnerTest.java +++ b/junit-tests/src/test/java/org/junit/gen5/console/ConsoleRunnerTests.java @@ -25,7 +25,7 @@ import org.junit.gen5.console.tasks.DisplayHelpTask; import org.junit.gen5.console.tasks.ExecuteTestsTask; -public class ConsoleRunnerTest { +public class ConsoleRunnerTests { @Test public void executeDisplayHelpTask() { diff --git a/junit-tests/src/test/java/org/junit/gen5/console/options/JOptSimpleCommandLineOptionsParserTest.java b/junit-tests/src/test/java/org/junit/gen5/console/options/JOptSimpleCommandLineOptionsParserTests.java similarity index 99% rename from junit-tests/src/test/java/org/junit/gen5/console/options/JOptSimpleCommandLineOptionsParserTest.java rename to junit-tests/src/test/java/org/junit/gen5/console/options/JOptSimpleCommandLineOptionsParserTests.java index fb716e3bc3c..4d71905c981 100644 --- a/junit-tests/src/test/java/org/junit/gen5/console/options/JOptSimpleCommandLineOptionsParserTest.java +++ b/junit-tests/src/test/java/org/junit/gen5/console/options/JOptSimpleCommandLineOptionsParserTests.java @@ -24,7 +24,7 @@ import org.junit.Test; -public class JOptSimpleCommandLineOptionsParserTest { +public class JOptSimpleCommandLineOptionsParserTests { @Test public void parseNoArguments() { diff --git a/junit-tests/src/test/java/org/junit/gen5/console/tasks/ClasspathEntriesParserTest.java b/junit-tests/src/test/java/org/junit/gen5/console/tasks/ClasspathEntriesParserTests.java similarity index 98% rename from junit-tests/src/test/java/org/junit/gen5/console/tasks/ClasspathEntriesParserTest.java rename to junit-tests/src/test/java/org/junit/gen5/console/tasks/ClasspathEntriesParserTests.java index 4856b7672fe..676e2827487 100644 --- a/junit-tests/src/test/java/org/junit/gen5/console/tasks/ClasspathEntriesParserTest.java +++ b/junit-tests/src/test/java/org/junit/gen5/console/tasks/ClasspathEntriesParserTests.java @@ -23,7 +23,7 @@ import org.junit.Test; -public class ClasspathEntriesParserTest { +public class ClasspathEntriesParserTests { @Test public void toURLsWithoutEntries() { diff --git a/junit-tests/src/test/java/org/junit/gen5/console/tasks/ConsoleTaskExecutorTest.java b/junit-tests/src/test/java/org/junit/gen5/console/tasks/ConsoleTaskExecutorTests.java similarity index 98% rename from junit-tests/src/test/java/org/junit/gen5/console/tasks/ConsoleTaskExecutorTest.java rename to junit-tests/src/test/java/org/junit/gen5/console/tasks/ConsoleTaskExecutorTests.java index f05d7e1d99c..ab9e85fd55f 100644 --- a/junit-tests/src/test/java/org/junit/gen5/console/tasks/ConsoleTaskExecutorTest.java +++ b/junit-tests/src/test/java/org/junit/gen5/console/tasks/ConsoleTaskExecutorTests.java @@ -18,7 +18,7 @@ import org.junit.Test; -public class ConsoleTaskExecutorTest { +public class ConsoleTaskExecutorTests { private ByteArrayOutputStream out = new ByteArrayOutputStream(); private ByteArrayOutputStream err = new ByteArrayOutputStream(); diff --git a/junit-tests/src/test/java/org/junit/gen5/console/tasks/CustomContextClassLoaderExecutorTest.java b/junit-tests/src/test/java/org/junit/gen5/console/tasks/CustomContextClassLoaderExecutorTests.java similarity index 96% rename from junit-tests/src/test/java/org/junit/gen5/console/tasks/CustomContextClassLoaderExecutorTest.java rename to junit-tests/src/test/java/org/junit/gen5/console/tasks/CustomContextClassLoaderExecutorTests.java index e1b747001d5..13096648ad2 100644 --- a/junit-tests/src/test/java/org/junit/gen5/console/tasks/CustomContextClassLoaderExecutorTest.java +++ b/junit-tests/src/test/java/org/junit/gen5/console/tasks/CustomContextClassLoaderExecutorTests.java @@ -18,7 +18,7 @@ import org.junit.Test; -public class CustomContextClassLoaderExecutorTest { +public class CustomContextClassLoaderExecutorTests { @Test public void invokeWithoutCustomClassLoaderDoesNotSetClassLoader() throws Exception { diff --git a/junit-tests/src/test/java/org/junit/gen5/console/tasks/ExecuteTestsTaskTest.java b/junit-tests/src/test/java/org/junit/gen5/console/tasks/ExecuteTestsTaskTests.java similarity index 98% rename from junit-tests/src/test/java/org/junit/gen5/console/tasks/ExecuteTestsTaskTest.java rename to junit-tests/src/test/java/org/junit/gen5/console/tasks/ExecuteTestsTaskTests.java index f6efaa74958..41cdb9d2668 100644 --- a/junit-tests/src/test/java/org/junit/gen5/console/tasks/ExecuteTestsTaskTest.java +++ b/junit-tests/src/test/java/org/junit/gen5/console/tasks/ExecuteTestsTaskTests.java @@ -23,7 +23,7 @@ import org.junit.gen5.console.options.CommandLineOptions; import org.junit.gen5.engine.DummyTestEngine; -public class ExecuteTestsTaskTest { +public class ExecuteTestsTaskTests { @Test public void executeWithoutExitCode() throws Exception { diff --git a/junit-tests/src/test/java/org/junit/gen5/console/tasks/TestPlanSpecificationCreatorTest.java b/junit-tests/src/test/java/org/junit/gen5/console/tasks/TestPlanSpecificationCreatorTests.java similarity index 98% rename from junit-tests/src/test/java/org/junit/gen5/console/tasks/TestPlanSpecificationCreatorTest.java rename to junit-tests/src/test/java/org/junit/gen5/console/tasks/TestPlanSpecificationCreatorTests.java index a185ca285a6..d7d7d5b1ea3 100644 --- a/junit-tests/src/test/java/org/junit/gen5/console/tasks/TestPlanSpecificationCreatorTest.java +++ b/junit-tests/src/test/java/org/junit/gen5/console/tasks/TestPlanSpecificationCreatorTests.java @@ -27,7 +27,7 @@ import org.junit.gen5.engine.TestPlanSpecificationElementVisitor; import org.junit.gen5.engine.TestTag; -public class TestPlanSpecificationCreatorTest { +public class TestPlanSpecificationCreatorTests { private CommandLineOptions options = new CommandLineOptions(); private TestPlanSpecificationElementVisitor visitor = mock(TestPlanSpecificationElementVisitor.class); diff --git a/junit-tests/src/test/java/org/junit/gen5/launcher/LauncherTest.java b/junit-tests/src/test/java/org/junit/gen5/launcher/LauncherTests.java similarity index 99% rename from junit-tests/src/test/java/org/junit/gen5/launcher/LauncherTest.java rename to junit-tests/src/test/java/org/junit/gen5/launcher/LauncherTests.java index a72ca97a778..2ffe68e9dc8 100644 --- a/junit-tests/src/test/java/org/junit/gen5/launcher/LauncherTest.java +++ b/junit-tests/src/test/java/org/junit/gen5/launcher/LauncherTests.java @@ -19,7 +19,7 @@ import org.junit.gen5.engine.TestDescriptor; import org.junit.gen5.engine.TestPlanSpecification; -public class LauncherTest { +public class LauncherTests { @Test public void discoverEmptyTestPlanWithoutAnyEngines() {