Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 28, 2025
+20 −18
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions lib/analyzerinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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;
};
Expand Down
30 changes: 17 additions & 13 deletions test/testanalyzerinformation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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));
}
Expand All @@ -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 {
Expand Down Expand Up @@ -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());
}

Expand All @@ -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());
}

Expand All @@ -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());
}

Expand All @@ -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());
}

Expand All @@ -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());
}

Expand All @@ -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());
}

Expand All @@ -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());
}
}
Expand Down