Merge pull request #36927 from jbytheway/rename_test_files

Rename test files for consistency
CleverRaven · Jan 11, 2020 · b1e259d · b1e259d
2 parents 40fa342 + e312278
commit b1e259d
Show file tree

Hide file tree

Showing 20 changed files with 91 additions and 1 deletion.
diff --git a/tests/active_item_cache.cpp → tests/active_item_cache_test.cpp b/tests/active_item_cache.cpp → tests/active_item_cache_test.cpp
@@ -42,4 +42,3 @@ TEST_CASE( "place_active_item_at_various_coordinates", "[item]" )
         }
     }
 }
-
diff --git a/tests/comestible_tests.cpp → tests/comestible_test.cpp b/tests/comestible_tests.cpp → tests/comestible_test.cpp
diff --git a/tests/explosion_balance.cpp → tests/explosion_balance_test.cpp b/tests/explosion_balance.cpp → tests/explosion_balance_test.cpp
diff --git a/tests/map_memory.cpp → tests/map_memory_test.cpp b/tests/map_memory.cpp → tests/map_memory_test.cpp
diff --git a/tests/math_functions.cpp → tests/math_functions_test.cpp b/tests/math_functions.cpp → tests/math_functions_test.cpp
diff --git a/tests/ranged_balance.cpp → tests/ranged_balance_test.cpp b/tests/ranged_balance.cpp → tests/ranged_balance_test.cpp
diff --git a/tests/reload_magazine.cpp → tests/reload_magazine_test.cpp b/tests/reload_magazine.cpp → tests/reload_magazine_test.cpp
diff --git a/tests/reload_option.cpp → tests/reload_option_test.cpp b/tests/reload_option.cpp → tests/reload_option_test.cpp
diff --git a/tests/stomach_contents_tests.cpp → tests/stomach_contents_test.cpp b/tests/stomach_contents_tests.cpp → tests/stomach_contents_test.cpp
diff --git a/tests/value_ptr.cpp → tests/value_ptr_test.cpp b/tests/value_ptr.cpp → tests/value_ptr_test.cpp
diff --git a/tests/vehicle_drag.cpp → tests/vehicle_drag_test.cpp b/tests/vehicle_drag.cpp → tests/vehicle_drag_test.cpp
diff --git a/tests/vehicle_efficiency.cpp → tests/vehicle_efficiency_test.cpp b/tests/vehicle_efficiency.cpp → tests/vehicle_efficiency_test.cpp
diff --git a/tests/vehicle_turrets.cpp → tests/vehicle_turrets_test.cpp b/tests/vehicle_turrets.cpp → tests/vehicle_turrets_test.cpp
diff --git a/tests/visitable_remove.cpp → tests/visitable_remove_test.cpp b/tests/visitable_remove.cpp → tests/visitable_remove_test.cpp
diff --git a/tests/visitable.cpp → tests/visitable_test.cpp b/tests/visitable.cpp → tests/visitable_test.cpp
diff --git a/tools/clang-tidy-plugin/CMakeLists.txt b/tools/clang-tidy-plugin/CMakeLists.txt
@@ -12,6 +12,7 @@ add_library(
     PointInitializationCheck.cpp
     SimplifyPointConstructorsCheck.cpp
     StringLiteralIterator.cpp
+    TestFilenameCheck.cpp
     TextStyleCheck.cpp
     TranslatorCommentsCheck.cpp
     UseNamedPointConstantsCheck.cpp

diff --git a/tools/clang-tidy-plugin/CataTidyModule.cpp b/tools/clang-tidy-plugin/CataTidyModule.cpp
@@ -7,6 +7,7 @@
 #include "NoStaticGettextCheck.h"
 #include "PointInitializationCheck.h"
 #include "SimplifyPointConstructorsCheck.h"
+#include "TestFilenameCheck.h"
 #include "TextStyleCheck.h"
 #include "TranslatorCommentsCheck.h"
 #include "UseNamedPointConstantsCheck.h"
@@ -31,6 +32,7 @@ class CataModule : public ClangTidyModule
             CheckFactories.registerCheck<PointInitializationCheck>( "cata-point-initialization" );
             CheckFactories.registerCheck<SimplifyPointConstructorsCheck>(
                 "cata-simplify-point-constructors" );
+            CheckFactories.registerCheck<TestFilenameCheck>( "cata-test-filename" );
             CheckFactories.registerCheck<TextStyleCheck>( "cata-text-style" );
             CheckFactories.registerCheck<TranslatorCommentsCheck>( "cata-translator-comments" );
             CheckFactories.registerCheck<UseNamedPointConstantsCheck>(

diff --git a/tools/clang-tidy-plugin/TestFilenameCheck.cpp b/tools/clang-tidy-plugin/TestFilenameCheck.cpp
@@ -0,0 +1,56 @@
+#include "TestFilenameCheck.h"
+
+#include <clang/Lex/PPCallbacks.h>
+#include <clang/Lex/Preprocessor.h>
+#include <clang/Lex/Token.h>
+#include <string>
+
+#include "clang/Frontend/CompilerInstance.h"
+
+using namespace clang::ast_matchers;
+
+namespace clang
+{
+namespace tidy
+{
+namespace cata
+{
+
+class TestFilenameCallbacks : public PPCallbacks
+{
+    public:
+        TestFilenameCallbacks( TestFilenameCheck *Check, CompilerInstance *Compiler ) :
+            Check( Check ), Compiler( Compiler ) {}
+
+        void MacroExpands( const Token &MacroNameTok,
+                           const MacroDefinition &,
+                           SourceRange Range,
+                           const MacroArgs * ) override {
+            StringRef MacroName = MacroNameTok.getIdentifierInfo()->getName();
+
+            if( MacroName == "TEST_CASE" ) {
+                SourceManager &SM = Compiler->getSourceManager();
+                StringRef Filename = SM.getBufferName( Range.getBegin() );
+                bool IsTestFilename = Filename.endswith( "_test.cpp" );
+
+                if( !IsTestFilename ) {
+                    Check->diag( Range.getBegin(),
+                                 "Files containing a test definition should have a filename "
+                                 "ending in '_test.cpp'." );
+                }
+            }
+        }
+    private:
+        TestFilenameCheck *Check;
+        CompilerInstance *Compiler;
+};
+
+void TestFilenameCheck::registerPPCallbacks( CompilerInstance &Compiler )
+{
+    Compiler.getPreprocessor().addPPCallbacks(
+        llvm::make_unique<TestFilenameCallbacks>( this, &Compiler ) );
+}
+
+} // namespace cata
+} // namespace tidy
+} // namespace clang
diff --git a/tools/clang-tidy-plugin/TestFilenameCheck.h b/tools/clang-tidy-plugin/TestFilenameCheck.h
@@ -0,0 +1,26 @@
+#ifndef CATA_TOOLS_CLANG_TIDY_TESTFILENAMECHECK_H
+#define CATA_TOOLS_CLANG_TIDY_TESTFILENAMECHECK_H
+
+#include "ClangTidy.h"
+
+namespace clang
+{
+namespace tidy
+{
+namespace cata
+{
+
+class TestFilenameCheck : public ClangTidyCheck
+{
+    public:
+        TestFilenameCheck( StringRef Name, ClangTidyContext *Context )
+            : ClangTidyCheck( Name, Context ) {}
+
+        void registerPPCallbacks( CompilerInstance &Compiler ) override;
+};
+
+} // namespace cata
+} // namespace tidy
+} // namespace clang
+
+#endif // CATA_TOOLS_CLANG_TIDY_TESTFILENAMECHECK_H
diff --git a/tools/clang-tidy-plugin/test/test-filename.cpp b/tools/clang-tidy-plugin/test/test-filename.cpp
@@ -0,0 +1,6 @@
+// RUN: %check_clang_tidy %s cata-test-filename %t -- -plugins=%cata_plugin -- -isystem %cata_include
+
+#define TEST_CASE(name)
+
+TEST_CASE( "test_name" )
+// CHECK-MESSAGES: warning: Files containing a test definition should have a filename ending in '_test.cpp'. [cata-test-filename]