added error tests for jigsaw

isis/src/control/apps/jigsaw/jigsaw.cpp

@@ -53,7 +53,6 @@ namespace Isis {
     QString cubeList = ui.GetFileName("FROMLIST");
 
     // retrieve settings from jigsaw gui
-
     BundleSettingsQsp settings = bundleSettings(ui);
     settings->setCubeList(cubeList);
     BundleAdjust *bundleAdjustment = NULL;
@@ -73,7 +72,6 @@ namespace Isis {
       throw;
     }
 
-
     // Bundle adjust the network
     try {
 
@@ -103,7 +101,6 @@ namespace Isis {
       bundleAdjustment->controlNet()->Write(ui.GetFileName("ONET"));
 
       PvlGroup gp("JigsawResults");
-
       // Update the cube pointing if requested but ONLY if bundle has converged
       if (ui.GetBoolean("UPDATE") ) {
         if ( !bundleAdjustment->isConverged() ) {

isis/tests/FunctionalTestsJigsaw.cpp

@@ -1,15 +1,17 @@
-#include "Fixtures.h"
 #include "Pvl.h"
 #include "PvlGroup.h"
-#include "TestUtilities.h"
 #include "ControlNet.h"
 #include "Statistics.h"
 
 #include "jigsaw.h"
 
-#include "gtest/gtest.h"
+#include "TestUtilities.h"
+#include "Fixtures.h"
+#include "gmock/gmock.h"
 
 using namespace Isis;
+using namespace testing; 
+
 
 static QString APP_XML = FileName("$ISISROOT/bin/xml/jigsaw.xml").expanded();
 
@@ -143,4 +145,78 @@ TEST_F(ObservationPair, FunctionalTestJigsawCamSolveAll) {
   // DEC(t3) final
   EXPECT_NEAR(elems.at(56).toDouble(), 0.365717165,          0.00001); 
 
-}
+}
+
+TEST_F(ObservationPair, FunctionalTestJigsawErrorNoSolve) {
+  QTemporaryDir prefix;
+  QString outCnetFileName = prefix.path() + "/outTemp.net";
+  QVector<QString> args = {"fromlist="+cubeListFile, "cnet="+cnetPath, "onet="+outCnetFileName, 
+                           "camsolve=None", "spsolve=None"};
+
+  UserInterface options(APP_XML, args);
+
+  Pvl log; 
+
+  try {
+    jigsaw(options, &log);
+    FAIL() << "Should throw" << std::endl;
+  }
+  catch (IException &e) {
+    EXPECT_THAT(e.what(), HasSubstr("Must either solve for camera pointing or spacecraft position"));
+  }
+}
+
+
+TEST_F(ObservationPair, FunctionalTestJigsawErrorTBParamsNoTarget) {
+  QTemporaryDir prefix;
+  QString outCnetFileName = prefix.path() + "/outTemp.net";
+
+  // just use isdPath for a valid PVL file without the wanted groups
+  QVector<QString> args = {"fromlist="+cubeListFile, "cnet="+cnetPath, "onet="+outCnetFileName, "SOLVETARGETBODY=TRUE", "tbparameters="+cubeRPath};
+
+  UserInterface options(APP_XML, args);
+
+  Pvl log; 
+
+  try {
+    jigsaw(options, &log);
+    FAIL() << "Should throw an exception" << std::endl;
+  }
+  catch (IException &e) {
+    EXPECT_THAT(e.what(), HasSubstr("Input Target parameters file missing main Target object"));
+  } 
+}
+
+
+TEST_F(ObservationPair, FunctionalTestJigsawErrorTBParamsNoSolve) {
+  QTemporaryDir prefix;
+  QString outCnetFileName = prefix.path() + "/outTemp.net";
+
+  std::istringstream iss(R"(
+    Object = Target
+    Group = "NAME"
+       Name=Enceladus
+    EndGroup
+    END_OBJECT
+  )"); 
+
+  QString tbsolvepath = prefix.path() + "/tbsolve.pvl";
+  Pvl tbsolve; 
+  iss >> tbsolve; 
+  tbsolve.write(tbsolvepath);
+
+  // just use isdPath for a valid PVL file without the wanted groups
+  QVector<QString> args = {"fromlist="+cubeListFile, "cnet="+cnetPath, "onet="+outCnetFileName, "SOLVETARGETBODY=TRUE", "tbparameters="+tbsolvepath};
+
+  UserInterface options(APP_XML, args);
+
+  Pvl log; 
+
+  try {
+    jigsaw(options, &log);
+    FAIL() << "Should throw an exception" << std::endl;
+  }
+  catch (IException &e) {
+    EXPECT_THAT(e.what(), HasSubstr("Must solve for at least one target body option"));
+  } 
+}