PreprocessorHelper: moved getRemarkComments() to TestPreprocessor

Author: firewave

test/helpers.cpp

@@ -202,18 +202,6 @@ void PreprocessorHelper::preprocess(const char code[], std::vector<std::string>
     tokenizer.setDirectives(std::move(directives));
 }
 
-std::vector<RemarkComment> PreprocessorHelper::getRemarkComments(const char code[], ErrorLogger& errorLogger)
-{
-    std::vector<std::string> files{"test.cpp"};
-    std::istringstream istr(code);
-    const simplecpp::TokenList tokens1(istr, files, files[0]);
-
-    const Settings settings;
-
-    const Preprocessor preprocessor(settings, errorLogger);
-    return preprocessor.getRemarkComments(tokens1);
-}
-
 bool LibraryHelper::loadxmldata(Library &lib, const char xmldata[], std::size_t len)
 {
     tinyxml2::XMLDocument doc;

test/helpers.h

@@ -175,9 +175,6 @@ class PreprocessorHelper
     static void preprocess(const char code[], std::vector<std::string> &files, Tokenizer& tokenizer, ErrorLogger& errorlogger);
     static void preprocess(const char code[], std::vector<std::string> &files, Tokenizer& tokenizer, ErrorLogger& errorlogger, const simplecpp::DUI& dui);
 
-    /** get remark comments */
-    static std::vector<RemarkComment> getRemarkComments(const char code[], ErrorLogger& errorLogger);
-
 private:
     static std::map<std::string, std::string> getcode(const Settings& settings, ErrorLogger& errorlogger, const char code[], std::set<std::string> cfgs, const std::string &filename = "file.c", SuppressionList *inlineSuppression = nullptr);
 };

test/testpreprocessor.cpp

@@ -60,6 +60,18 @@ class TestPreprocessor : public TestFixture {
         return tokens2.stringify();
     }
 
+    static std::vector<RemarkComment> getRemarkComments(const char code[], ErrorLogger& errorLogger)
+    {
+        std::vector<std::string> files{"test.cpp"};
+        std::istringstream istr(code);
+        const simplecpp::TokenList tokens1(istr, files, files[0]);
+
+        const Settings settings;
+
+        const Preprocessor preprocessor(settings, errorLogger);
+        return preprocessor.getRemarkComments(tokens1);
+    }
+
     const Settings settings0 = settingsBuilder().severity(Severity::information).build();
 
     void run() override {
@@ -1917,15 +1929,15 @@ class TestPreprocessor : public TestFixture {
     void remarkComment1() {
         const char code[] = "// REMARK: assignment with 1\n"
                             "x=1;\n";
-        const auto remarkComments = PreprocessorHelper::getRemarkComments(code, *this);
+        const auto remarkComments = getRemarkComments(code, *this);
         ASSERT_EQUALS(1, remarkComments.size());
         ASSERT_EQUALS(2, remarkComments[0].lineNumber);
         ASSERT_EQUALS("assignment with 1", remarkComments[0].str);
     }
 
     void remarkComment2() {
         const char code[] = "x=1; ///REMARK assignment with 1\n";
-        const auto remarkComments = PreprocessorHelper::getRemarkComments(code, *this);
+        const auto remarkComments = getRemarkComments(code, *this);
         ASSERT_EQUALS(1, remarkComments.size());
         ASSERT_EQUALS(1, remarkComments[0].lineNumber);
         ASSERT_EQUALS("assignment with 1", remarkComments[0].str);
@@ -1934,7 +1946,7 @@ class TestPreprocessor : public TestFixture {
     void remarkComment3() {
         const char code[] = "/**   REMARK: assignment with 1 */\n"
                             "x=1;\n";
-        const auto remarkComments = PreprocessorHelper::getRemarkComments(code, *this);
+        const auto remarkComments = getRemarkComments(code, *this);
         ASSERT_EQUALS(1, remarkComments.size());
         ASSERT_EQUALS(2, remarkComments[0].lineNumber);
         ASSERT_EQUALS("assignment with 1 ", remarkComments[0].str);