removed need for friend declaration of test class in AnalyzerInformation (danmar#7921)

Author: firewave

lib/analyzerinfo.h

@@ -53,12 +53,8 @@ namespace tinyxml2 {
  */
 class CPPCHECKLIB AnalyzerInformation {
 public:
-    friend class TestAnalyzerInformation;
-
     ~AnalyzerInformation();
 
-    static std::string getFilesTxt(const std::list<std::string> &sourcefiles, const std::string &userDefines, const std::list<FileSettings> &fileSettings);
-
     static void writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::string &userDefines, const std::list<FileSettings> &fileSettings);
 
     /** Close current TU.analyzerinfo file */
@@ -80,11 +76,13 @@ class CPPCHECKLIB AnalyzerInformation {
     };
 
 protected:
+    static std::string getFilesTxt(const std::list<std::string> &sourcefiles, const std::string &userDefines, const std::list<FileSettings> &fileSettings);
+
     static std::string getAnalyzerInfoFileFromFilesTxt(std::istream& filesTxt, const std::string &sourcefile, const std::string &cfg, int fileIndex);
 
-private:
     static bool skipAnalysis(const tinyxml2::XMLDocument &analyzerInfoDoc, std::size_t hash, std::list<ErrorMessage> &errors);
 
+private:
     std::ofstream mOutputStream;
     std::string mAnalyzerInfoFile;
 };

test/testanalyzerinformation.cpp

@@ -28,11 +28,15 @@
 
 #include "xml.h"
 
-class TestAnalyzerInformation : public TestFixture, private AnalyzerInformation {
+class TestAnalyzerInformation : public TestFixture {
 public:
     TestAnalyzerInformation() : TestFixture("TestAnalyzerInformation") {}
 
 private:
+    class AnalyzerInformationTest : public AnalyzerInformation
+    {
+        friend class TestAnalyzerInformation;
+    };
 
     void run() override {
         TEST_CASE(getAnalyzerInfoFile);
@@ -45,9 +49,9 @@ class TestAnalyzerInformation : public TestFixture, private AnalyzerInformation
     void getAnalyzerInfoFile() const {
         constexpr char filesTxt[] = "file1.a4:::file1.c\n";
         std::istringstream f1(filesTxt);
-        ASSERT_EQUALS("file1.a4", getAnalyzerInfoFileFromFilesTxt(f1, "file1.c", "", 0));
+        ASSERT_EQUALS("file1.a4", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f1, "file1.c", "", 0));
         std::istringstream f2(filesTxt);
-        ASSERT_EQUALS("file1.a4", getAnalyzerInfoFileFromFilesTxt(f2, "./file1.c", "", 0));
+        ASSERT_EQUALS("file1.a4", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f2, "./file1.c", "", 0));
         ASSERT_EQUALS("builddir/file1.c.analyzerinfo", AnalyzerInformation::getAnalyzerInfoFile("builddir", "file1.c", "", 0));
         ASSERT_EQUALS("builddir/file1.c.analyzerinfo", AnalyzerInformation::getAnalyzerInfoFile("builddir", "some/path/file1.c", "", 0));
     }
@@ -62,17 +66,17 @@ class TestAnalyzerInformation : public TestFixture, private AnalyzerInformation
         const char expected[] = "a.a1:::a.c\n"
                                 "a.a2::1:a.c\n";
 
-        ASSERT_EQUALS(expected, getFilesTxt({}, "", fileSettings));
+        ASSERT_EQUALS(expected, AnalyzerInformationTest::getFilesTxt({}, "", fileSettings));
     }
 
     void duplicateFile() const {
         // same file duplicated
         constexpr char filesTxt[] = "file1.a1::1:file1.c\n"
                                     "file1.a2::2:file1.c\n";
         std::istringstream f1(filesTxt);
-        ASSERT_EQUALS("file1.a1", getAnalyzerInfoFileFromFilesTxt(f1, "file1.c", "", 1));
+        ASSERT_EQUALS("file1.a1", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f1, "file1.c", "", 1));
         std::istringstream f2(filesTxt);
-        ASSERT_EQUALS("file1.a2", getAnalyzerInfoFileFromFilesTxt(f2, "file1.c", "", 2));
+        ASSERT_EQUALS("file1.a2", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f2, "file1.c", "", 2));
     }
 
     void parse() const {
@@ -118,7 +122,7 @@ class TestAnalyzerInformation : public TestFixture, private AnalyzerInformation
                 );
             ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
 
-            ASSERT_EQUALS(false, AnalyzerInformation::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS(false, AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
             ASSERT_EQUALS(0, errorList.size());
         }
 
@@ -137,7 +141,7 @@ class TestAnalyzerInformation : public TestFixture, private AnalyzerInformation
                 );
             ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
 
-            ASSERT_EQUALS(false, AnalyzerInformation::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS(false, AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
             ASSERT_EQUALS(0, errorList.size());
         }
 
@@ -156,7 +160,7 @@ class TestAnalyzerInformation : public TestFixture, private AnalyzerInformation
                 );
             ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
 
-            ASSERT_EQUALS(false, AnalyzerInformation::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS(false, AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
             ASSERT_EQUALS(0, errorList.size());
         }
 
@@ -177,7 +181,7 @@ class TestAnalyzerInformation : public TestFixture, private AnalyzerInformation
                 );
             ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
 
-            ASSERT_EQUALS(true, AnalyzerInformation::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS(true, AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
             ASSERT_EQUALS(1, errorList.size());
         }
 
@@ -193,7 +197,7 @@ class TestAnalyzerInformation : public TestFixture, private AnalyzerInformation
                 );
             ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
 
-            ASSERT_EQUALS(true, AnalyzerInformation::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS(true, AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
             ASSERT_EQUALS(0, errorList.size());
         }
 
@@ -214,7 +218,7 @@ class TestAnalyzerInformation : public TestFixture, private AnalyzerInformation
                 );
             ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
 
-            ASSERT_EQUALS(false, AnalyzerInformation::skipAnalysis(doc, 99, errorList));
+            ASSERT_EQUALS(false, AnalyzerInformationTest::skipAnalysis(doc, 99, errorList));
             ASSERT_EQUALS(0, errorList.size());
         }
 
@@ -226,7 +230,7 @@ class TestAnalyzerInformation : public TestFixture, private AnalyzerInformation
             const tinyxml2::XMLError xmlError = doc.Parse("");
             ASSERT_EQUALS(tinyxml2::XML_ERROR_EMPTY_DOCUMENT, xmlError);
 
-            ASSERT_EQUALS(false, AnalyzerInformation::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS(false, AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
             ASSERT_EQUALS(0, errorList.size());
         }
     }