Supporting failures and cdata

Author: Luis Díaz Más

data/gtests.xml

@@ -26,7 +26,7 @@
     <testcase name="shouldPerformOperationFool21" status="run" time="0" classname="TestSuite2" />
     <testcase name="shouldPerformOperationFool22" status="run" time="0" classname="TestSuite2" />
   </testsuite>
-  <testsuite name="TestSuite3" tests="3" failures="0" disabled="0" errors="0" time="0.005">
+  <testsuite name="TestSuite3" tests="4" failures="0" disabled="0" errors="0" time="0.005">
     <testcase name="shouldPerformOperationFool23" status="run" time="0.002" classname="TestSuite3" />
     <testcase name="shouldPerformOperationFool24" status="run" time="0.002" classname="TestSuite3" />
     <testcase name="shouldPerformOperationFool25" status="run" time="0.001" classname="TestSuite3" />

include/Types.h

@@ -18,6 +18,8 @@ struct TestCase
 
    QString  _name;
    QString  _valid;
+   QString  _failureMsg;
+   QString  _cDATA;
 };
 
 struct TestSuite

include/XmlJoiner.h

@@ -42,6 +42,8 @@ class XmlJoiner
 private:
    void processTestSuiteAttrs(const QXmlStreamAttributes attrs);
    void processTestCaseAttrs(const QXmlStreamAttributes attrs);
+   void processTestFailureAttrs(const QXmlStreamAttributes attrs);
+   void processTestCDataAttrs(const QStringRef text);
 
    void outputXmlHeader(QXmlStreamWriter &writer);
    void outputXmlElements(QXmlStreamWriter &writer);

src/XmlJoiner.cpp

@@ -69,6 +69,10 @@ void XmlJoiner::processFile(const QString absolutePath)
          }
          else if (xml.name() == "failure")
          {
+            processTestFailureAttrs(xml.attributes());
+            xml.readNext();
+            Q_ASSERT(xml.isCDATA());
+            processTestCDataAttrs(xml.text());
          }
       }
    }
@@ -86,6 +90,9 @@ void XmlJoiner::processTestSuiteAttrs(const QXmlStreamAttributes attrs)
                                      attrs.value("tests").toString().toInt(),
                                      attrs.value("failures").toString().toInt(),
                                      attrs.value("errors").toString().toInt());
+
+   /// \todo set "disabled" field
+   /// \todo set "time" field
    _suites.push_back(suite);
 }
 
@@ -107,6 +114,18 @@ void XmlJoiner::processTestCaseAttrs(const QXmlStreamAttributes attrs)
    suite->_cases.push_back(testCase);
 }
 
+void XmlJoiner::processTestFailureAttrs(const QXmlStreamAttributes attrs)
+{
+   TestCase *testCase = _suites.back()->_cases.back();
+   testCase->_failureMsg = attrs.value("message").toString();
+}
+
+void XmlJoiner::processTestCDataAttrs(const QStringRef text)
+{
+   TestCase *testCase = _suites.back()->_cases.back();
+   testCase->_cDATA.append(text);
+}
+
 void XmlJoiner::writeOutput(const QString pathFile)
 {
    QFile outFile(pathFile);
@@ -150,12 +169,22 @@ void XmlJoiner::outputXmlElements(QXmlStreamWriter &writer)
       writer.writeAttribute("failures", QString::number(testSuite->_failures));
       writer.writeAttribute("errors", QString::number(testSuite->_errors));
 
-      foreach(const auto testCase, testSuite->_cases)
+      for(const auto &testCase: testSuite->_cases)
       {
          writer.writeStartElement("testcase");
          writer.writeAttribute("name", testCase->_name);
          writer.writeAttribute("status", testCase->_valid);
          writer.writeAttribute("classname", testSuite->_name);
+
+         if (testCase->_failureMsg.isEmpty() == false)
+         {
+            writer.writeStartElement("failure");
+            writer.writeAttribute("message", testCase->_failureMsg);
+            writer.writeAttribute("type", "");
+            writer.writeCDATA(testCase->_cDATA);
+            writer.writeEndElement();
+         }
+
          writer.writeEndElement();
       }
 

utils/CMakeLists.txt

@@ -1,6 +1,7 @@
 if(BUILD_UTILS)
+   include_directories(${PROJECT_SOURCE_DIR}/include)
 
    add_executable(xml_join xml_join.cpp)
-   target_link_libraries(xml_join ${PROJECT_NAME})
+   target_link_libraries(xml_join ${PROJECT_NAME} ${ARGTABLE})
 
 endif()

utils/xml_join.cpp

@@ -15,6 +15,9 @@
 #include <argtable2.h>
 #include <iostream>
 
+using namespace TestsXml;
+using namespace TestsXml;
+
 // #####   PROTOTYPES  -  LOCAL TO THIS SOURCE FILE   ##################
 static void readArguments(int argc, char **argv);