summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmParseJacocoCoverage.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/CTest/cmParseJacocoCoverage.cxx')
-rw-r--r--Source/CTest/cmParseJacocoCoverage.cxx284
1 files changed, 127 insertions, 157 deletions
diff --git a/Source/CTest/cmParseJacocoCoverage.cxx b/Source/CTest/cmParseJacocoCoverage.cxx
index d9c4ffb..6afaca6 100644
--- a/Source/CTest/cmParseJacocoCoverage.cxx
+++ b/Source/CTest/cmParseJacocoCoverage.cxx
@@ -8,172 +8,145 @@
#include <stdio.h>
#include <stdlib.h>
-
-class cmParseJacocoCoverage::XMLParser: public cmXMLParser
+class cmParseJacocoCoverage::XMLParser : public cmXMLParser
{
- public:
- XMLParser(cmCTest* ctest, cmCTestCoverageHandlerContainer& cont)
- : CTest(ctest), Coverage(cont)
- {
- this->FilePath = "";
- this->PackagePath = "";
- this->PackageName = "";
- }
+public:
+ XMLParser(cmCTest* ctest, cmCTestCoverageHandlerContainer& cont)
+ : CTest(ctest)
+ , Coverage(cont)
+ {
+ this->FilePath = "";
+ this->PackagePath = "";
+ this->PackageName = "";
+ }
- virtual ~XMLParser()
- {
- }
+ virtual ~XMLParser() {}
- protected:
+protected:
+ virtual void EndElement(const std::string&) {}
- virtual void EndElement(const std::string&)
- {
+ virtual void StartElement(const std::string& name, const char** atts)
+ {
+ if (name == "package") {
+ this->PackageName = atts[1];
+ this->PackagePath = "";
+ } else if (name == "sourcefile") {
+ std::string fileName = atts[1];
+
+ if (this->PackagePath == "") {
+ if (!this->FindPackagePath(fileName)) {
+ cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot find file: "
+ << this->PackageName << "/" << fileName << std::endl);
+ this->Coverage.Error++;
+ return;
+ }
}
- virtual void StartElement(const std::string& name,
- const char** atts)
- {
- if(name == "package")
- {
- this->PackageName = atts[1];
- this->PackagePath = "";
- }
- else if(name == "sourcefile")
- {
- std::string fileName = atts[1];
-
- if (this->PackagePath == "")
- {
- if(!this->FindPackagePath(fileName))
- {
- cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot find file: "
- << this->PackageName << "/" << fileName << std::endl);
- this->Coverage.Error++;
- return;
- }
- }
+ cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+ "Reading file: " << fileName << std::endl,
+ this->Coverage.Quiet);
- cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
- "Reading file: " << fileName << std::endl,
- this->Coverage.Quiet);
-
- this->FilePath = this->PackagePath + "/" + fileName;
- cmsys::ifstream fin(this->FilePath.c_str());
- if (!fin)
- {
- cmCTestLog(this->CTest, ERROR_MESSAGE,
- "Jacoco Coverage: Error opening " << this->FilePath
- << std::endl);
- }
- std::string line;
- FileLinesType& curFileLines =
- this->Coverage.TotalCoverage[this->FilePath];
- if(fin)
- {
- curFileLines.push_back(-1);
- }
- while(cmSystemTools::GetLineFromStream(fin, line))
- {
- curFileLines.push_back(-1);
- }
+ this->FilePath = this->PackagePath + "/" + fileName;
+ cmsys::ifstream fin(this->FilePath.c_str());
+ if (!fin) {
+ cmCTestLog(this->CTest, ERROR_MESSAGE,
+ "Jacoco Coverage: Error opening " << this->FilePath
+ << std::endl);
+ }
+ std::string line;
+ FileLinesType& curFileLines =
+ this->Coverage.TotalCoverage[this->FilePath];
+ if (fin) {
+ curFileLines.push_back(-1);
+ }
+ while (cmSystemTools::GetLineFromStream(fin, line)) {
+ curFileLines.push_back(-1);
+ }
+ } else if (name == "line") {
+ int tagCount = 0;
+ int nr = -1;
+ int ci = -1;
+ while (true) {
+ if (strcmp(atts[tagCount], "ci") == 0) {
+ ci = atoi(atts[tagCount + 1]);
+ } else if (strcmp(atts[tagCount], "nr") == 0) {
+ nr = atoi(atts[tagCount + 1]);
}
- else if(name == "line")
- {
- int tagCount = 0;
- int nr = -1;
- int ci = -1;
- while(true)
- {
- if(strcmp(atts[tagCount],"ci") == 0)
- {
- ci = atoi(atts[tagCount+1]);
- }
- else if (strcmp(atts[tagCount],"nr") == 0)
- {
- nr = atoi(atts[tagCount+1]);
- }
- if (ci > -1 && nr > 0)
- {
- FileLinesType& curFileLines=
- this->Coverage.TotalCoverage[this->FilePath];
- if(!curFileLines.empty())
- {
- curFileLines[nr-1] = ci;
- }
- break;
- }
- ++tagCount;
+ if (ci > -1 && nr > 0) {
+ FileLinesType& curFileLines =
+ this->Coverage.TotalCoverage[this->FilePath];
+ if (!curFileLines.empty()) {
+ curFileLines[nr - 1] = ci;
}
+ break;
}
+ ++tagCount;
}
+ }
+ }
- virtual bool FindPackagePath(const std::string fileName)
- {
- // Search for the source file in the source directory.
- if (this->PackagePathFound(fileName, this->Coverage.SourceDir))
- {
- return true;
- }
-
- // If not found there, check the binary directory.
- if (this->PackagePathFound(fileName, this->Coverage.BinaryDir))
- {
- return true;
- }
- return false;
- }
+ virtual bool FindPackagePath(const std::string fileName)
+ {
+ // Search for the source file in the source directory.
+ if (this->PackagePathFound(fileName, this->Coverage.SourceDir)) {
+ return true;
+ }
- virtual bool PackagePathFound(const std::string fileName,
- const std::string baseDir)
- {
- // Search for the file in the baseDir and its subdirectories.
- std::string packageGlob = baseDir;
- packageGlob += "/";
- packageGlob += fileName;
- cmsys::Glob gl;
- gl.RecurseOn();
- gl.RecurseThroughSymlinksOn();
- gl.FindFiles(packageGlob);
- std::vector<std::string> const& files = gl.GetFiles();
- if (files.size() == 0)
- {
- return false;
- }
+ // If not found there, check the binary directory.
+ if (this->PackagePathFound(fileName, this->Coverage.BinaryDir)) {
+ return true;
+ }
+ return false;
+ }
- // Check if any of the locations found match our package.
- for(std::vector<std::string>::const_iterator fi = files.begin();
- fi != files.end(); ++fi)
- {
- std::string dir = cmsys::SystemTools::GetParentDirectory(*fi);
- if (cmsys::SystemTools::StringEndsWith(dir, this->PackageName.c_str()))
- {
- cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
- "Found package directory for " << fileName <<
- ": " << dir << std::endl,
- this->Coverage.Quiet);
- this->PackagePath = dir;
- return true;
- }
- }
+ virtual bool PackagePathFound(const std::string fileName,
+ const std::string baseDir)
+ {
+ // Search for the file in the baseDir and its subdirectories.
+ std::string packageGlob = baseDir;
+ packageGlob += "/";
+ packageGlob += fileName;
+ cmsys::Glob gl;
+ gl.RecurseOn();
+ gl.RecurseThroughSymlinksOn();
+ gl.FindFiles(packageGlob);
+ std::vector<std::string> const& files = gl.GetFiles();
+ if (files.size() == 0) {
return false;
+ }
+
+ // Check if any of the locations found match our package.
+ for (std::vector<std::string>::const_iterator fi = files.begin();
+ fi != files.end(); ++fi) {
+ std::string dir = cmsys::SystemTools::GetParentDirectory(*fi);
+ if (cmsys::SystemTools::StringEndsWith(dir, this->PackageName.c_str())) {
+ cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+ "Found package directory for " << fileName << ": "
+ << dir << std::endl,
+ this->Coverage.Quiet);
+ this->PackagePath = dir;
+ return true;
}
+ }
+ return false;
+ }
- private:
- std::string FilePath;
- std::string PackagePath;
- std::string PackageName;
- typedef cmCTestCoverageHandlerContainer::SingleFileCoverageVector
- FileLinesType;
- cmCTest* CTest;
- cmCTestCoverageHandlerContainer& Coverage;
+private:
+ std::string FilePath;
+ std::string PackagePath;
+ std::string PackageName;
+ typedef cmCTestCoverageHandlerContainer::SingleFileCoverageVector
+ FileLinesType;
+ cmCTest* CTest;
+ cmCTestCoverageHandlerContainer& Coverage;
};
cmParseJacocoCoverage::cmParseJacocoCoverage(
- cmCTestCoverageHandlerContainer& cont,
- cmCTest* ctest)
- :Coverage(cont), CTest(ctest)
- {
- }
+ cmCTestCoverageHandlerContainer& cont, cmCTest* ctest)
+ : Coverage(cont)
+ , CTest(ctest)
+{
+}
bool cmParseJacocoCoverage::LoadCoverageData(
const std::vector<std::string> files)
@@ -183,27 +156,24 @@ bool cmParseJacocoCoverage::LoadCoverageData(
size_t i;
std::string path;
size_t numf = files.size();
- for (i = 0; i < numf; i++)
- {
+ for (i = 0; i < numf; i++) {
path = files[i];
- cmCTestOptionalLog(this->CTest,HANDLER_VERBOSE_OUTPUT,
- "Reading XML File " << path << std::endl, this->Coverage.Quiet);
- if(cmSystemTools::GetFilenameLastExtension(path) == ".xml")
- {
- if(!this->ReadJacocoXML(path.c_str()))
- {
+ cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+ "Reading XML File " << path << std::endl,
+ this->Coverage.Quiet);
+ if (cmSystemTools::GetFilenameLastExtension(path) == ".xml") {
+ if (!this->ReadJacocoXML(path.c_str())) {
return false;
- }
}
}
+ }
return true;
}
bool cmParseJacocoCoverage::ReadJacocoXML(const char* file)
{
- cmParseJacocoCoverage::XMLParser
- parser(this->CTest, this->Coverage);
+ cmParseJacocoCoverage::XMLParser parser(this->CTest, this->Coverage);
parser.ParseFile(file);
return true;
}