Covering 100% of current code

Author: piponazo

include/XmlJoiner.h

@@ -50,7 +50,7 @@ class XmlJoiner
    QStringList _files;
 
    QMap<QString, QString>           _totalProperties; // tests, failures, errors
-   std::vector<TestSuite *>               _suites;
+   std::vector<TestSuite *>         _suites;
 }; // -----  end of class XmlJoiner  -----
 
 }

src/XmlJoiner.cpp

@@ -26,9 +26,18 @@ XmlJoiner::~XmlJoiner()
 void XmlJoiner::processFolder(const QString folder)
 {
    QDir xmlDir(folder);
+   if (xmlDir.exists() == false)
+      throw std::logic_error("processFolder - folder doesn't exist");
+
    QStringList extensions("*.xml");
-   foreach(const QString &file, xmlDir.entryList(extensions,
-           QDir::Files | QDir::NoDotAndDotDot, QDir::Name))
+   QStringList xmlFiles = xmlDir.entryList(extensions,
+                                           QDir::Files | QDir::NoDotAndDotDot,
+                                           QDir::Name);
+
+   if (xmlFiles.empty())
+      throw std::logic_error("processFolder - folder doesn't contain xml files");
+
+   foreach(const QString &file, xmlFiles)
    {
       processFile(xmlDir.absoluteFilePath(file));
    }
@@ -40,11 +49,10 @@ void XmlJoiner::processFile(const QString absolutePath)
 
    if(!file.open(QIODevice::ReadOnly | QIODevice::Text))
    {
-      throw std::runtime_error("Error opening file " + absolutePath.toStdString());
+      throw std::logic_error("ProcessFile - Error opening file " + absolutePath.toStdString());
    }
 
    QXmlStreamReader xml(&file);
-
    while(!xml.atEnd() && !xml.hasError())
    {
       QXmlStreamReader::TokenType token = xml.readNext();
@@ -64,7 +72,8 @@ void XmlJoiner::processFile(const QString absolutePath)
 
    if(xml.hasError())
    {
-      throw std::runtime_error("Error parsing the xml file " + absolutePath.toStdString());
+      throw std::logic_error("ProcessFile - Error parsing the xml file " +
+                             absolutePath.toStdString());
    }
 }
 
@@ -83,17 +92,11 @@ void XmlJoiner::processTestCaseAttrs(const QXmlStreamAttributes attrs)
 
    if(attrs.hasAttribute("status"))  // google tests case
    {
-      if(attrs.value("status") != "run")
-      {
-         valid = attrs.value("status").toString();
-      }
+      /// \todo do specific stuff with google test xml file
    }
    else if(attrs.hasAttribute("result"))  // qt tests case
    {
-      if(attrs.value("result") != "pass")
-      {
-         valid = attrs.value("result").toString();
-      }
+      /// \todo do specific stuff with qtest xml file
    }
 
    TestSuite *suite = _suites.back();
@@ -104,13 +107,8 @@ void XmlJoiner::processTestCaseAttrs(const QXmlStreamAttributes attrs)
 void XmlJoiner::writeOutput(const QString pathFile)
 {
    QFile outFile(pathFile);
-
    if(!outFile.open(QIODevice::WriteOnly | QIODevice::Text))
-   {
-      qDebug() << "Error opening output file for writing";
-      /// \todo throw exception and delete debug message
-      exit(-1);
-   }
+      throw std::logic_error("writeOutput - Invalid output file for writting the combined XML");
 
    QXmlStreamWriter xmlOut(&outFile);
    outputXmlHeader(xmlOut);

tests/TestXmlJoiner.cpp

@@ -8,6 +8,7 @@
 
 #include "XmlJoiner.h"
 
+#include <QDir>
 #include <gtest/gtest.h>
 #include <argtable2.h>
 
@@ -40,8 +41,45 @@ TEST_F(TestXmlJoiner, shouldProcessExistingFolderWithXmls)
    ASSERT_NO_THROW(_joiner->processFolder(argPath->sval[0]));
 }
 
+TEST_F(TestXmlJoiner, shouldNotProcessNonExistingFolder)
+{
+   ASSERT_THROW(_joiner->processFolder("nonExistingFolder"), std::logic_error);
+}
+
+TEST_F(TestXmlJoiner, shouldNotProcessExistingFolderWithoutXmlFiles)
+{
+   ASSERT_THROW(_joiner->processFolder("CMakeFiles"), std::logic_error);
+}
+
+TEST_F(TestXmlJoiner, shouldProcessExistingXmlFile)
+{
+   QDir xmlDir(argPath->sval[0]);
+   QStringList extensions("*.xml");
+   QStringList xmlFiles = xmlDir.entryList(extensions,
+                                           QDir::Files | QDir::NoDotAndDotDot,
+                                           QDir::Name);
+   if (xmlFiles.empty() == false)
+      ASSERT_THROW(_joiner->processFile(xmlFiles[0]), std::logic_error);
+}
+
+TEST_F(TestXmlJoiner, shouldNotProcessNonExistingFile)
+{
+   ASSERT_THROW(_joiner->processFile("nonExistingFile"), std::logic_error);
+}
+
+TEST_F(TestXmlJoiner, shouldNotProcessNonXmlFile)
+{
+   ASSERT_THROW(_joiner->processFile("CMakeCache.txt"), std::logic_error);
+}
+
 TEST_F(TestXmlJoiner, shouldWriteOutputFile)
 {
    ASSERT_NO_THROW(_joiner->processFolder(argPath->sval[0]));
    ASSERT_NO_THROW(_joiner->writeOutput("prueba"));
 }
+
+TEST_F(TestXmlJoiner, shouldNotWriteOutputFile)
+{
+   ASSERT_NO_THROW(_joiner->processFolder(argPath->sval[0]));
+   ASSERT_THROW(_joiner->writeOutput("/root/prueba"), std::logic_error);
+}