Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorMartin Hořeňovský2019-06-22 15:31:11 +0200
committerMartin Hořeňovský2019-10-29 14:07:18 +0100
commitbe44cfa63baf05342d7cea6156504045a56bedf1 (patch)
tree99fac73d1a237abbfc2b174964eca5b008f804c8 /include
parent85b129c741d7493df178c4e0644cd221ad434141 (diff)
downloadcatch3-be44cfa63baf05342d7cea6156504045a56bedf1.tar.gz
Specialize XML reporter's --list output
Diffstat (limited to 'include')
-rw-r--r--include/reporters/catch_reporter_bases.hpp5
-rw-r--r--include/reporters/catch_reporter_listening.cpp27
-rw-r--r--include/reporters/catch_reporter_listening.h5
-rw-r--r--include/reporters/catch_reporter_xml.cpp59
-rw-r--r--include/reporters/catch_reporter_xml.h4
5 files changed, 97 insertions, 3 deletions
diff --git a/include/reporters/catch_reporter_bases.hpp b/include/reporters/catch_reporter_bases.hpp
index 7bedd086..a0ff487f 100644
--- a/include/reporters/catch_reporter_bases.hpp
+++ b/include/reporters/catch_reporter_bases.hpp
@@ -261,6 +261,11 @@ namespace Catch {
void assertionStarting(AssertionInfo const&) override;
bool assertionEnded(AssertionStats const&) override;
+
+ // Event listeners should not use the default listing impl
+ void listReporters(std::vector<ReporterDescription> const&, Config const&) override {}
+ void listTests(std::vector<TestCase> const&, Config const&) override {}
+ void listTags(std::vector<TagInfo> const&, Config const&) override {}
};
} // end namespace Catch
diff --git a/include/reporters/catch_reporter_listening.cpp b/include/reporters/catch_reporter_listening.cpp
index 32ee54ac..2f43b978 100644
--- a/include/reporters/catch_reporter_listening.cpp
+++ b/include/reporters/catch_reporter_listening.cpp
@@ -36,13 +36,13 @@ namespace Catch {
}
m_reporter->noMatchingTestCases( spec );
}
-
+
void ListeningReporter::reportInvalidArguments(std::string const&arg){
for ( auto const& listener : m_listeners ) {
listener->reportInvalidArguments( arg );
}
m_reporter->reportInvalidArguments( arg );
- }
+ }
#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
void ListeningReporter::benchmarkPreparing( std::string const& name ) {
@@ -156,4 +156,25 @@ namespace Catch {
return true;
}
-} // end namespace Catch \ No newline at end of file
+ void ListeningReporter::listReporters(std::vector<ReporterDescription> const& descriptions, Config const& config) {
+ for (auto const& listener : m_listeners) {
+ listener->listReporters(descriptions, config);
+ }
+ m_reporter->listReporters(descriptions, config);
+ }
+
+ void ListeningReporter::listTests(std::vector<TestCase> const& tests, Config const& config) {
+ for (auto const& listener : m_listeners) {
+ listener->listTests(tests, config);
+ }
+ m_reporter->listTests(tests, config);
+ }
+
+ void ListeningReporter::listTags(std::vector<TagInfo> const& tags, Config const& config) {
+ for (auto const& listener : m_listeners) {
+ listener->listTags(tags, config);
+ }
+ m_reporter->listTags(tags, config);
+ }
+
+} // end namespace Catch
diff --git a/include/reporters/catch_reporter_listening.h b/include/reporters/catch_reporter_listening.h
index 7fbd7af5..027f66df 100644
--- a/include/reporters/catch_reporter_listening.h
+++ b/include/reporters/catch_reporter_listening.h
@@ -54,6 +54,11 @@ namespace Catch {
void skipTest( TestCaseInfo const& testInfo ) override;
bool isMulti() const override;
+ void listReporters(std::vector<ReporterDescription> const& descriptions, Config const& config) override;
+ void listTests(std::vector<TestCase> const& tests, Config const& config) override;
+ void listTags(std::vector<TagInfo> const& tags, Config const& config) override;
+
+
};
} // end namespace Catch
diff --git a/include/reporters/catch_reporter_xml.cpp b/include/reporters/catch_reporter_xml.cpp
index e110317c..8e89eb82 100644
--- a/include/reporters/catch_reporter_xml.cpp
+++ b/include/reporters/catch_reporter_xml.cpp
@@ -10,6 +10,7 @@
#include "../internal/catch_capture.hpp"
#include "../internal/catch_reporter_registrars.hpp"
+#include "../internal/catch_list.h"
#if defined(_MSC_VER)
#pragma warning(push)
@@ -264,6 +265,64 @@ namespace Catch {
}
#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+ void XmlReporter::listReporters(std::vector<ReporterDescription> const& descriptions, Config const&) {
+ auto outerTag = m_xml.scopedElement("AvailableReporters");
+ for (auto const& reporter : descriptions) {
+ auto inner = m_xml.scopedElement("Reporter");
+ m_xml.startElement("Name", XmlFormatting::Indent)
+ .writeText(reporter.name, XmlFormatting::None)
+ .endElement(XmlFormatting::Newline);
+ m_xml.startElement("Description", XmlFormatting::Indent)
+ .writeText(reporter.description, XmlFormatting::None)
+ .endElement(XmlFormatting::Newline);
+ }
+ }
+
+ void XmlReporter::listTests(std::vector<TestCase> const& tests, Config const&) {
+ auto outerTag = m_xml.scopedElement("MatchingTests");
+ for (auto const& test : tests) {
+ auto innerTag = m_xml.scopedElement("TestCase");
+ auto const& testInfo = test.getTestCaseInfo();
+ m_xml.startElement("Name", XmlFormatting::Indent)
+ .writeText(testInfo.name, XmlFormatting::None)
+ .endElement(XmlFormatting::Newline);
+ m_xml.startElement("ClassName", XmlFormatting::Indent)
+ .writeText(testInfo.className, XmlFormatting::None)
+ .endElement(XmlFormatting::Newline);
+ m_xml.startElement("Description", XmlFormatting::Indent)
+ .writeText(testInfo.description, XmlFormatting::None)
+ .endElement(XmlFormatting::Newline);
+ m_xml.startElement("Tags", XmlFormatting::Indent)
+ .writeText(testInfo.tagsAsString(), XmlFormatting::None)
+ .endElement(XmlFormatting::Newline);
+
+ auto sourceTag = m_xml.scopedElement("SourceInfo");
+ m_xml.startElement("File", XmlFormatting::Indent)
+ .writeText(testInfo.lineInfo.file, XmlFormatting::None)
+ .endElement(XmlFormatting::Newline);
+ m_xml.startElement("Line", XmlFormatting::Indent)
+ .writeText(std::to_string(testInfo.lineInfo.line), XmlFormatting::None)
+ .endElement(XmlFormatting::Newline);
+ }
+ }
+
+ void XmlReporter::listTags(std::vector<TagInfo> const& tags, Config const&) {
+ auto outerTag = m_xml.scopedElement("TagsFromMatchingTests");
+ for (auto const& tag : tags) {
+ auto innerTag = m_xml.scopedElement("Tag");
+ m_xml.startElement("Count", XmlFormatting::Indent)
+ .writeText(std::to_string(tag.count), XmlFormatting::None)
+ .endElement(XmlFormatting::Newline);
+ auto aliasTag = m_xml.scopedElement("Aliases");
+ for (auto const& alias : tag.spellings) {
+ m_xml.startElement("Alias", XmlFormatting::Indent)
+ .writeText(alias, XmlFormatting::None)
+ .endElement(XmlFormatting::Newline);
+ }
+ }
+ }
+
+
CATCH_REGISTER_REPORTER( "xml", XmlReporter )
} // end namespace Catch
diff --git a/include/reporters/catch_reporter_xml.h b/include/reporters/catch_reporter_xml.h
index 5b6ba310..0013d2ee 100644
--- a/include/reporters/catch_reporter_xml.h
+++ b/include/reporters/catch_reporter_xml.h
@@ -57,6 +57,10 @@ namespace Catch {
void benchmarkFailed(std::string const&) override;
#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+ void listReporters(std::vector<ReporterDescription> const& descriptions, Config const& config) override;
+ void listTests(std::vector<TestCase> const& tests, Config const& config) override;
+ void listTags(std::vector<TagInfo> const& tags, Config const& config) override;
+
private:
Timer m_testCaseTimer;
XmlWriter m_xml;