t Fixing test class names

Author: ScottBob

approvaltests-tests/src/test/java/org/approvaltests/TestFilesTest.java

@@ -0,0 +1,70 @@
+package org.approvaltests;
+
+import com.spun.util.ObjectUtils;
+import com.spun.util.io.FileUtils;
+import com.spun.util.logger.SimpleLogger;
+import org.approvaltests.core.Options;
+import org.junit.jupiter.api.Test;
+import org.lambda.functions.Functions;
+import org.lambda.query.Query;
+import org.lambda.query.Queryable;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.List;
+
+public class TestFilesTest
+{
+  @Test
+  void testTestFileNamesEndInTest()
+  {
+    // Get all of the classes for all the packages
+    Queryable<Class<?>> classes = getAllClasses();
+    // Filter for methods in the classes that have a checked exception
+    Queryable<String> methods = classes.selectMany(s -> getTestMethods(s))
+        .select(m -> String.format("%s.%s", m.getDeclaringClass().getName(), m.getName()))
+        .orderBy(m -> m.toString());
+    // Verify the methods
+    Options options = new Options();
+    Approvals.verifyAll(
+        "Test Methods in files that do not contain the word 'Test' (these will not be run in our CI build)",
+        methods, c -> c.toString(), options);
+  }
+  private List<Method> getTestMethods(Class<?> aClass)
+  {
+    Method[] declaredMethods = aClass.getDeclaredMethods();
+    return Query.where(declaredMethods,
+        m -> Queryable.as(m.getAnnotations()).any(a -> a.toString().contains("Test")));
+  }
+  private Queryable<Class<?>> getAllClasses()
+  {
+    File[] files = FileUtils.getRecursiveFileList(new File("."), f -> f.getName().endsWith(".java"));
+    Queryable<String> paths = Query.select(files,
+        Functions.unchecked(f -> f.getCanonicalPath().replace(File.separatorChar, '.')));
+    paths = paths.where(p -> p.contains(".test.")).where(p -> !p.contains("Test.java"));
+    return paths.select(f -> getJavaClass(f));
+  }
+  private Class<?> getJavaClass(String path)
+  {
+    String className = path.substring(0, path.length() - ".java".length());
+    if (className.contains(".com."))
+    {
+      className = className.substring(className.indexOf(".com.") + 1);
+    }
+    if (className.contains(".org."))
+    {
+      className = className.substring(className.indexOf(".org.") + 1);
+    }
+    try
+    {
+      Class<?> aClass = Class.forName(className);
+      return aClass;
+    }
+    catch (Throwable e)
+    {
+      SimpleLogger.variable("Path", path);
+      throw ObjectUtils.throwAsError(e);
+    }
+  }
+}

approvaltests-tests/src/test/java/org/approvaltests/TestFilesTest.testTestFileNamesEndInTest.approved.txt

@@ -0,0 +1,13 @@
+Test Methods in files that do not contain the word 'Test' (these will not be run in our CI build)
+
+
+org.approvaltests.DocumentHelpers.listAllVerifyFunctions
+org.approvaltests.DocumentHelpers.testLineNumberOfThisMethod
+org.approvaltests.DocumentHelpers.testLineNumbers
+org.approvaltests.Samples.sampleParameterizedTest
+org.approvaltests.Samples.testArray
+org.approvaltests.Samples.testObject
+org.approvaltests.Samples.testString
+org.approvaltests.namer.NamerSamples.useAlternativeSourceFileFinder
+org.approvaltests.packagesettings.basedirectory.TestApprovalDirectoryConfig.testApprovalBaseDirectory
+org.approvaltests.packagesettings.subdirectory.TestApprovalDirectoryConfig.testApprovalSubdirectory

approvaltests-tests/src/test/java/org/approvaltests/packagesettings/basedirectory/TestApprovalDirectoryConfig.java

@@ -6,6 +6,7 @@
 import java.io.File;
 import java.text.MessageFormat;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestApprovalDirectoryConfig

approvaltests-tests/src/test/java/org/approvaltests/scrubbers/DateScrubberTests.exampleForDocumentation.approved.txt renamed to approvaltests-tests/src/test/java/org/approvaltests/scrubbers/DateScrubberTest.exampleForDocumentation.approved.txt

@@ -12,8 +12,9 @@
 import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
-public class DateScrubberTests
+public class DateScrubberTest
 {
   @Test
   void testSupportedFormatWorksForExamples()

approvaltests-tests/src/test/java/org/approvaltests/scrubbers/DateScrubberTests.java renamed to approvaltests-tests/src/test/java/org/approvaltests/scrubbers/DateScrubberTest.java

@@ -96,22 +96,22 @@ The easiest way to scrub a date is by calling
 ```java
 Approvals.verify("created at 03:14:15", new Options().withScrubber(DateScrubber.getScrubberFor("00:00:00")));
 ```
-<sup><a href='/approvaltests-tests/src/test/java/org/approvaltests/scrubbers/DateScrubberTests.java#L48-L50' title='Snippet source file'>snippet source</a> | <a href='#snippet-scrub-date-example' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/approvaltests-tests/src/test/java/org/approvaltests/scrubbers/DateScrubberTest.java#L48-L50' title='Snippet source file'>snippet source</a> | <a href='#snippet-scrub-date-example' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 which will produce
 
-<!-- snippet: DateScrubberTests.exampleForDocumentation.approved.txt -->
-<a id='snippet-DateScrubberTests.exampleForDocumentation.approved.txt'></a>
+<!-- snippet: DateScrubberTest.exampleForDocumentation.approved.txt -->
+<a id='snippet-DateScrubberTest.exampleForDocumentation.approved.txt'></a>
 ```txt
 created at [Date1]
 ```
-<sup><a href='/approvaltests-tests/src/test/java/org/approvaltests/scrubbers/DateScrubberTests.exampleForDocumentation.approved.txt#L1-L1' title='Snippet source file'>snippet source</a> | <a href='#snippet-DateScrubberTests.exampleForDocumentation.approved.txt' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/approvaltests-tests/src/test/java/org/approvaltests/scrubbers/DateScrubberTest.exampleForDocumentation.approved.txt#L1-L1' title='Snippet source file'>snippet source</a> | <a href='#snippet-DateScrubberTest.exampleForDocumentation.approved.txt' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 ### Supported formats
 
-<!-- include: DateScrubberTests.supportedFormats.approved.md -->
+<!-- include: DateScrubberTest.supportedFormats.approved.md -->
 | Example Date | RegEx Pattern |
 | :-------------------- | :----------------------- | 
 | Tue May 13 16:30:00 | [a-zA-Z]{3} [a-zA-Z]{3} \d{2} \d{2}:\d{2}:\d{2} |