increase code coverage

squinky86 · Mar 22, 2021 · ffc29fe · ffc29fe
1 parent cc1e3ab
commit ffc29fe
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
         }
 
         std::cout << "Test " << ++onTest << ": Include STIG Supplements" << std::endl;
-        QMetaObject::invokeMethod(&w, "SupplementsChanged", Qt::DirectConnection, Q_ARG(Qt::CheckState, Qt::Checked));
+        QMetaObject::invokeMethod(&w, "SupplementsChanged", Qt::DirectConnection, Q_ARG(int, Qt::Checked));
         while (!w.isProcessingEnabled())
         {
             QThread::sleep(1);
@@ -147,6 +147,18 @@ int main(int argc, char *argv[])
             a.processEvents();
         }
 
+        {
+            std::cout << "Test " << ++onTest << ": Delete STIGs" << std::endl;
+            WorkerSTIGDelete wd;
+            DbManager db;
+            Q_FOREACH (auto stig, db.GetSTIGs())
+            {
+                wd.AddId(stig.id);
+            }
+            wd.process();
+            a.processEvents();
+        }
+
         {
             QDirIterator it(QStringLiteral("tests"));
             WorkerCKLImport wc;
@@ -178,18 +190,6 @@ int main(int argc, char *argv[])
             a.processEvents();
         }
 
-        {
-            std::cout << "Test " << ++onTest << ": Delete STIGs" << std::endl;
-            WorkerSTIGDelete wd;
-            DbManager db;
-            Q_FOREACH (auto stig, db.GetSTIGs())
-            {
-                wd.AddId(stig.id);
-            }
-            wd.process();
-            a.processEvents();
-        }
-
         std::cout << "Test " << ++onTest << ": Delete CCIs" << std::endl;
         QMetaObject::invokeMethod(&w, "DeleteCCIs", Qt::DirectConnection);
         while (!w.isProcessingEnabled())

diff --git a/src/stigqter.cpp b/src/stigqter.cpp
@@ -331,6 +331,15 @@ void STIGQter::RunTests()
         ProcEvents();
     }
 
+    // build monolithic CKL files
+    std::cout << "\tTest " << step++ << ": Exporting Monolithic CKL files" << std::endl;
+    ExportCKLsMonolithic(QStringLiteral("tests"));
+    while (!isProcessingEnabled())
+    {
+        QThread::sleep(1);
+        ProcEvents();
+    }
+
     // save .stigqter file
     std::cout << "\tTest " << step++ << ": Saving .stigqter file" << std::endl;
     SaveAs(QStringLiteral("tests/test.stigqter"));

diff --git a/src/workercklexport.cpp b/src/workercklexport.cpp
@@ -123,7 +123,7 @@ void WorkerCKLExport::process()
         if (_monolithic)
         {
             WorkerCKL wc;
-            wc.AddFilename(QDir(_dirName).filePath(PrintAsset(a) + ".ckl"));
+            wc.AddFilename(QDir(_dirName).filePath(PrintAsset(a) + "-monolithic.ckl"));
             wc.AddAsset(a);
             wc.process();
         }