Merge pull request #395 from srz-zumix/feature/cpplint

fix cpplint
srz-zumix · Mar 26, 2020 · a39153f · a39153f
2 parents b72f6a0 + f48d202
commit a39153f
Show file tree

Hide file tree

Showing 25 changed files with 277 additions and 102 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -10,7 +10,7 @@ block_comment = *
 block_comment_end = */
 line_comment = //
 
-[*.{cpp,hpp,ipp}]
+[*.{cpp,hpp,ipp,inl}]
 charset = utf-8-bom
 trim_trailing_whitespace = true
 insert_final_newline = true

diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml
@@ -12,9 +12,14 @@ jobs:
         github_token: ${{ secrets.github_token }}
         reporter: github-pr-review
         flags: --extensions=h,hpp,c,cpp,cc,cu,ipp --linelength=150
-        filter: "-readability/braces\
+        filter: "-build/c++11\
+          ,-build/c++tr1\
+          ,-build/header_guard\
+          ,-readability/braces\
           ,-readability/todo\
           ,-runtime/int\
+          ,-runtime/references\
+          ,-runtime/string\
           ,-whitespace/braces\
           ,-whitespace/comments\
           ,-whitespace/indent\

diff --git a/CPPLINT.cfg b/CPPLINT.cfg
@@ -0,0 +1,4 @@
+set noparent
+exclude_files=fused-src
+exclude_files=\..*
+exclude_files=docs
diff --git a/projects/cmake/CPPLINT.cfg b/projects/cmake/CPPLINT.cfg
@@ -0,0 +1 @@
+exclude_files=tmp
diff --git a/projects/vs2013/CPPLINT.cfg b/projects/vs2013/CPPLINT.cfg
@@ -0,0 +1,3 @@
+exclude_files=mfc
+exclude_files=android
+exclude_files=unittest
diff --git a/projects/vs2015/CPPLINT.cfg b/projects/vs2015/CPPLINT.cfg
@@ -0,0 +1,3 @@
+exclude_files=mfc
+exclude_files=android
+exclude_files=unittest
diff --git a/projects/vs2017/CPPLINT.cfg b/projects/vs2017/CPPLINT.cfg
@@ -0,0 +1,3 @@
+exclude_files=mfc
+exclude_files=android
+exclude_files=unittest
diff --git a/projects/vs2019/CPPLINT.cfg b/projects/vs2019/CPPLINT.cfg
@@ -0,0 +1,3 @@
+exclude_files=mfc
+exclude_files=android
+exclude_files=unittest
diff --git a/projects/vscode/iutest.code-workspace b/projects/vscode/iutest.code-workspace
@@ -12,6 +12,7 @@
 		],
 		"files.associations": {
 			"*.ipp": "cpp",
+			"*.inl": "cpp",
 			"*.in": "makefile",
 			".ecrc": "json",
 			".nuspec": "xml",

diff --git a/samples/CPPLINT.cfg b/samples/CPPLINT.cfg
@@ -0,0 +1 @@
+filter=-build/namespaces,-runtime/printf,-build/include_subdir
diff --git a/samples/gmock/main.cpp b/samples/gmock/main.cpp
@@ -1,4 +1,18 @@
-
+//======================================================================
+//-----------------------------------------------------------------------
+/**
+ * @file        main.cpp
+ * @brief       gmock sample
+ *
+ * @author      t.shirayanagi
+ * @par         copyright
+ * Copyright (C) 2020, Takazumi Shirayanagi\n
+ * This software is released under the new BSD License,
+ * see LICENSE
+*/
+//-----------------------------------------------------------------------
+//======================================================================
+
 /*
  * is not available vprintf, can be replaced.
 */
@@ -20,11 +34,11 @@ int main(int argc, char* argv[])
 {
     ::testing::InitGoogleMock(&argc, argv);
     IUTEST_INIT(&argc, argv);
-    return IUTEST_RUN_ALL_TESTS();	// run all
+    return IUTEST_RUN_ALL_TESTS();  // run all
 }
 
 /**
- * @brief	モック対象のオブジェクト
+ * @brief   モック対象のオブジェクト
 */
 class Foo
 {
@@ -33,7 +47,7 @@ class Foo
 };
 
 /**
- * @brief	モック
+ * @brief   モック
 */
 class MockFoo : public Foo
 {
@@ -42,13 +56,13 @@ class MockFoo : public Foo
 };
 
 /**
- * @brief	テストしたいクラス
+ * @brief   テストしたいクラス
 */
 class FooTest
 {
-    Foo*	m_foo;
+    Foo*    m_foo;
 public:
-    FooTest(Foo* foo) : m_foo(foo) {}
+    explicit FooTest(Foo* foo) : m_foo(foo) {}
 
     ::std::string name(void) { return m_foo->name(); }
     ::std::string repeat(int n)

diff --git a/samples/vcunittest/unittest.cpp b/samples/vcunittest/unittest.cpp
@@ -1,4 +1,19 @@
-#include "stdafx.h"
+//======================================================================
+//-----------------------------------------------------------------------
+/**
+ * @file        unittest.cpp
+ * @brief       vc unittest sample
+ *
+ * @author      t.shirayanagi
+ * @par         copyright
+ * Copyright (C) 2020, Takazumi Shirayanagi\n
+ * This software is released under the new BSD License,
+ * see LICENSE
+*/
+//-----------------------------------------------------------------------
+//======================================================================
+
+#include "stdafx.h"
 #include "CppUnitTest.h"
 
 #include "../../include/iutest.hpp"
@@ -29,9 +44,8 @@ namespace iutest_unittest
         {
             Assert::AreEqual(0, 1);
         }
-
     };
-}
+}   // end of namespace iutest_unittest
 #endif
 
 /** --------------------------------------------------
@@ -125,7 +139,7 @@ IUTEST(AssertionTest, Base)
         IUTEST_ASSERT_NE(x0, x1);
         IUTEST_EXPECT_NE(x0, x1);
         IUTEST_INFORM_NE(x0, x1);
-        int* one=(int*)1;
+        int* one=reinterpret_cast<int*>(1);
         IUTEST_ASSERT_NE(NULL, one);
     }
 
@@ -507,7 +521,7 @@ IUTEST(AssertionTest, Exception)
 class exception_test
 {
 public:
-    exception_test(const ::std::vector<int>&)
+    explicit exception_test(const ::std::vector<int>&)
     {
         IUTEST_SUPPRESS_UNREACHABLE_CODE_WARNING(throw ::std::exception());
     }

diff --git a/samples/windows/CPPLINT.cfg b/samples/windows/CPPLINT.cfg
@@ -0,0 +1,4 @@
+exclude_files=Resource\.h
+exclude_files=stdafx\..*
+exclude_files=targetver.h
+exclude_files=iutest_windows_sample\..*
diff --git a/samples/windows/tests/test1.cpp b/samples/windows/tests/test1.cpp
@@ -1,4 +1,19 @@
-#include <stdafx.h>
+//======================================================================
+//-----------------------------------------------------------------------
+/**
+ * @file        test1.cpp
+ * @brief       windows sample
+ *
+ * @author      t.shirayanagi
+ * @par         copyright
+ * Copyright (C) 2020, Takazumi Shirayanagi\n
+ * This software is released under the new BSD License,
+ * see LICENSE
+*/
+//-----------------------------------------------------------------------
+//======================================================================
+
+#include <stdafx.h>
 
 IUTEST_TEST(TestCase1, Test1)
 {

diff --git a/sider.yml b/sider.yml
@@ -6,9 +6,14 @@ linter:
   goodcheck:
     config: ./.ci/goodcheck.yml
   cpplint:
-    filter: "-readability/braces\
+    filter: "-build/c++11\
+      ,-build/c++tr1\
+      ,-build/header_guard\
+      ,-readability/braces\
       ,-readability/todo\
       ,-runtime/int\
+      ,-runtime/references\
+      ,-runtime/string\
       ,-whitespace/braces\
       ,-whitespace/comments\
       ,-whitespace/indent\
@@ -19,8 +24,3 @@ linter:
     linelength: 150
     extensions: "c,cpp"
     headers: "h,hpp,ipp"
-    exclude:
-      - "projects/*/android/iutest_android.NativeActivity/*"
-      - "projects/*/mfc/*"
-      - "samples/*/*"
-