danmar · danmar · Jan 27, 2023 · Jan 10, 2023 · Jan 10, 2023
diff --git a/.codacy.yml b/.codacy.yml
@@ -4,6 +4,5 @@ exclude_paths:
   - htmlreport/example.cc
   - samples/**/bad.c
   - samples/**/bad.cpp
-  - test/test.cxx
   - test/cfg/*.c
   - test/cfg/*.cpp
diff --git a/Makefile b/Makefile
diff --git a/cppcheck.cppcheck b/cppcheck.cppcheck
@@ -18,6 +18,5 @@
     </paths>
     <exclude>
         <path name="gui/temp/"/>
-        <path name="test/test.cxx"/>
     </exclude>
 </project>
diff --git a/test/testsuite.cpp → test/fixture.cpp b/test/testsuite.cpp → test/fixture.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "testsuite.h"
+#include "fixture.h"
 
 #include "color.h"
 #include "options.h"

diff --git a/test/testsuite.h → test/fixture.h b/test/testsuite.h → test/fixture.h
@@ -17,8 +17,8 @@
  */
 
 
-#ifndef testsuiteH
-#define testsuiteH
+#ifndef fixtureH
+#define fixtureH
 
 #include "color.h"
 #include "config.h"
@@ -143,4 +143,4 @@ extern std::ostringstream output;
         } \
 } while (false)
 
-#endif
+#endif // fixtureH
diff --git a/test/testutils.h → test/helpers.h b/test/testutils.h → test/helpers.h
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TestUtilsH
-#define TestUtilsH
+#ifndef helpersH
+#define helpersH
 
 #include "color.h"
 #include "errorlogger.h"
@@ -86,4 +86,4 @@ class ScopedFile {
     std::string mName;
 };
 
-#endif // TestUtilsH
+#endif // helpersH
diff --git a/test/testrunner.cpp → test/main.cpp b/test/testrunner.cpp → test/main.cpp
@@ -18,7 +18,7 @@
 
 #include "options.h"
 #include "preprocessor.h"
-#include "testsuite.h"
+#include "fixture.h"
 
 #include <cstdlib>
 

diff --git a/test/precompiled.h b/test/precompiled.h
@@ -17,7 +17,7 @@
  */
 
 #pragma once
-#include "testsuite.h"
+#include "fixture.h"
 #include "settings.h"
 #include "tokenize.h"
 #include "library.h"

diff --git a/test/test.cxx b/test/test.cxx
diff --git a/test/test64bit.cpp b/test/test64bit.cpp
@@ -20,7 +20,7 @@
 #include "check64bit.h"
 #include "errortypes.h"
 #include "settings.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "tokenize.h"
 
 #include <sstream> // IWYU pragma: keep

diff --git a/test/testanalyzerinformation.cpp b/test/testanalyzerinformation.cpp
@@ -18,7 +18,7 @@
 
 
 #include "analyzerinfo.h"
-#include "testsuite.h"
+#include "fixture.h"
 
 #include <sstream>
 

diff --git a/test/testassert.cpp b/test/testassert.cpp
@@ -20,7 +20,7 @@
 #include "checkassert.h"
 #include "errortypes.h"
 #include "settings.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "tokenize.h"
 
 #include <sstream> // IWYU pragma: keep

diff --git a/test/testastutils.cpp b/test/testastutils.cpp
@@ -20,7 +20,7 @@
 #include "astutils.h"
 #include "library.h"
 #include "settings.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "token.h"
 #include "tokenize.h"
 #include "tokenlist.h"

diff --git a/test/testautovariables.cpp b/test/testautovariables.cpp
@@ -20,7 +20,7 @@
 #include "checkautovariables.h"
 #include "errortypes.h"
 #include "settings.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "tokenize.h"
 
 #include <sstream> // IWYU pragma: keep

diff --git a/test/testbool.cpp b/test/testbool.cpp
@@ -20,7 +20,7 @@
 #include "checkbool.h"
 #include "errortypes.h"
 #include "settings.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "tokenize.h"
 
 #include <sstream> // IWYU pragma: keep

diff --git a/test/testboost.cpp b/test/testboost.cpp
@@ -20,7 +20,7 @@
 #include "checkboost.h"
 #include "errortypes.h"
 #include "settings.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "tokenize.h"
 
 #include <sstream> // IWYU pragma: keep

diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
@@ -25,7 +25,7 @@
 #include "library.h"
 #include "preprocessor.h"
 #include "settings.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "tokenize.h"
 
 #include <map>

diff --git a/test/testcharvar.cpp b/test/testcharvar.cpp
@@ -21,7 +21,7 @@
 #include "errortypes.h"
 #include "platform.h"
 #include "settings.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "tokenize.h"
 
 #include <sstream> // IWYU pragma: keep

diff --git a/test/testclangimport.cpp b/test/testclangimport.cpp
@@ -20,7 +20,7 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
-#include "testsuite.h"
+#include "fixture.h"
 
 #include <cstdint>
 #include <list>

diff --git a/test/testclass.cpp b/test/testclass.cpp
@@ -21,7 +21,7 @@
 #include "errortypes.h"
 #include "library.h"
 #include "settings.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "tokenize.h"
 
 #include <list>

diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
@@ -24,7 +24,7 @@
 #include "settings.h"
 #include "standards.h"
 #include "suppressions.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "timer.h"
 
 #include <cstdio>

diff --git a/test/testcondition.cpp b/test/testcondition.cpp
@@ -22,7 +22,7 @@
 #include "platform.h"
 #include "preprocessor.h"
 #include "settings.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "tokenize.h"
 
 #include <map>

diff --git a/test/testconstructors.cpp b/test/testconstructors.cpp
@@ -21,7 +21,7 @@
 #include "errortypes.h"
 #include "standards.h"
 #include "settings.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "tokenize.h"
 
 #include <list>

diff --git a/test/testcppcheck.cpp b/test/testcppcheck.cpp
@@ -20,7 +20,7 @@
 #include "color.h"
 #include "cppcheck.h"
 #include "errorlogger.h"
-#include "testsuite.h"
+#include "fixture.h"
 
 #include <algorithm>
 #include <functional>

diff --git a/test/testerrorlogger.cpp b/test/testerrorlogger.cpp
@@ -21,7 +21,7 @@
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "suppressions.h"
-#include "testsuite.h"
+#include "fixture.h"
 
 #include <iosfwd>
 #include <list>

diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
@@ -20,7 +20,7 @@
 #include "checkexceptionsafety.h"
 #include "errortypes.h"
 #include "settings.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "tokenize.h"
 
 #include <sstream> // IWYU pragma: keep

diff --git a/test/testfilelister.cpp b/test/testfilelister.cpp
@@ -18,7 +18,7 @@
 
 #include "filelister.h"
 #include "pathmatch.h"
-#include "testsuite.h"
+#include "fixture.h"
 
 #include <cstddef>
 #include <fstream>

diff --git a/test/testfunctions.cpp b/test/testfunctions.cpp
@@ -21,7 +21,7 @@
 #include "library.h"
 #include "settings.h"
 #include "standards.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "tokenize.h"
 
 #include <list>

diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
@@ -20,7 +20,7 @@
 #include "errortypes.h"
 #include "mathlib.h"
 #include "settings.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "token.h"
 #include "tokenize.h"
 

diff --git a/test/testimportproject.cpp b/test/testimportproject.cpp
@@ -18,7 +18,7 @@
 
 #include "importproject.h"
 #include "settings.h"
-#include "testsuite.h"
+#include "fixture.h"
 
 #include <list>
 #include <memory>

diff --git a/test/testincompletestatement.cpp b/test/testincompletestatement.cpp
@@ -19,7 +19,7 @@
 #include "checkother.h"
 #include "errortypes.h"
 #include "settings.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "tokenize.h"
 
 #include <map>

diff --git a/test/testinternal.cpp b/test/testinternal.cpp
@@ -20,7 +20,7 @@
 
 #include "tokenize.h"
 #include "checkinternal.h"
-#include "testsuite.h"
+#include "fixture.h"
 
 #include <sstream>
 

diff --git a/test/testio.cpp b/test/testio.cpp
@@ -22,7 +22,7 @@
 #include "errortypes.h"
 #include "platform.h"
 #include "settings.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "tokenize.h"
 
 #include <sstream> // IWYU pragma: keep

diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
@@ -21,7 +21,7 @@
 #include "errortypes.h"
 #include "library.h"
 #include "settings.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "tokenize.h"
 
 #include <map>

diff --git a/test/testlibrary.cpp b/test/testlibrary.cpp
@@ -20,8 +20,8 @@
 #include "library.h"
 #include "settings.h"
 #include "standards.h"
-#include "testsuite.h"
-#include "testutils.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "token.h"
 #include "tokenize.h"
 #include "tokenlist.h"

diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp
@@ -18,7 +18,7 @@
 
 
 #include "mathlib.h"
-#include "testsuite.h"
+#include "fixture.h"
 
 #include <limits>
 #include <string>

diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
@@ -20,7 +20,7 @@
 #include "errortypes.h"
 #include "settings.h"
 #include "symboldatabase.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "token.h"
 #include "tokenize.h"
 

diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
@@ -22,7 +22,7 @@
 #include "errortypes.h"
 #include "library.h"
 #include "settings.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "token.h"
 #include "tokenize.h"
 

diff --git a/test/testoptions.cpp b/test/testoptions.cpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "options.h"
-#include "testsuite.h"
+#include "fixture.h"
 
 #include <set>
 #include <string>

diff --git a/test/testother.cpp b/test/testother.cpp
@@ -23,7 +23,7 @@
 #include "preprocessor.h"
 #include "settings.h"
 #include "standards.h"
-#include "testsuite.h"
+#include "fixture.h"
 #include "tokenize.h"
 
 #include <map>

diff --git a/test/testpath.cpp b/test/testpath.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "path.h"
-#include "testsuite.h"
+#include "fixture.h"
 
 #include <string>
 #include <vector>