Commit d3c794c9 authored by Jesse Mapel's avatar Jesse Mapel Committed by Jesse Mapel
Browse files

Re-enabled ObservationPair tests

parent 01220113

isis/tests/FunctionalTestsCkwriter.cpp

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ TEST_F(DefaultCube, FunctionalTestCkwriterFromlist) { 
  }

}



TEST_F(ObservationPair, DISABLED_FunctionalTestCkwriterCantValidate) {

TEST_F(ObservationPair, FunctionalTestCkwriterCantValidate) {

  Pvl appLog;

  QVector<QString> args = {"fromlist=" + cubeListFile,

                           "to=" + tempDir.path() + "/newKernel.bc"};
@@ -160,7 +160,7 @@ TEST_F(ObservationPair, DISABLED_FunctionalTestCkwriterCantValidate) { 
  }

}



TEST_F(ObservationPair, DISABLED_FunctionalTestCkwriterWarnValidate) {

TEST_F(ObservationPair, FunctionalTestCkwriterWarnValidate) {

  Pvl appLog;

  QVector<QString> args = {"fromlist=" + cubeListFile,

                           "to=" + tempDir.path() + "/newKernel.bc",

isis/tests/FunctionalTestsJigsaw.cpp

+4 −4
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ TEST_F(ApolloNetwork, FunctionalTestJigsawBundleXYZ) { 
  }

}



TEST_F(ObservationPair, DISABLED_FunctionalTestJigsawCamSolveAll) {

TEST_F(ObservationPair, FunctionalTestJigsawCamSolveAll) {

  // delete to remove old camera for when cam is updated

  delete cubeL;

  delete cubeR;
@@ -789,7 +789,7 @@ TEST_F(ApolloNetwork, FunctionalTestJigsawMEstimator) { 
}





 TEST_F(ObservationPair, DISABLED_FunctionalTestJigsawErrorNoSolve) {

 TEST_F(ObservationPair, FunctionalTestJigsawErrorNoSolve) {

  QTemporaryDir prefix;

  QString outCnetFileName = prefix.path() + "/outTemp.net";

  QVector<QString> args = {"fromlist="+cubeListFile, "cnet="+cnetPath, "onet="+outCnetFileName,
@@ -808,7 +808,7 @@ TEST_F(ApolloNetwork, FunctionalTestJigsawMEstimator) { 
}





TEST_F(ObservationPair, DISABLED_FunctionalTestJigsawErrorTBParamsNoTarget) {

TEST_F(ObservationPair, FunctionalTestJigsawErrorTBParamsNoTarget) {

  QTemporaryDir prefix;

  QString outCnetFileName = prefix.path() + "/outTemp.net";
@@ -829,7 +829,7 @@ TEST_F(ObservationPair, DISABLED_FunctionalTestJigsawErrorTBParamsNoTarget) { 
}





TEST_F(ObservationPair, DISABLED_FunctionalTestJigsawErrorTBParamsNoSolve) {

TEST_F(ObservationPair, FunctionalTestJigsawErrorTBParamsNoSolve) {

  QTemporaryDir prefix;

  QString outCnetFileName = prefix.path() + "/outTemp.net";

isis/tests/FunctionalTestsLronac2pds.cpp

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ using namespace Isis; 


static QString APP_XML = FileName("$ISISROOT/bin/xml/lronac2pds.xml").expanded();



TEST_F(ObservationPair, DISABLED_FunctionalTestLronac2pdsIof) {

TEST_F(ObservationPair, FunctionalTestLronac2pdsIof) {

  QVector<QString> args = {"from=" + cubeLPath,

                           "to=" + tempDir.path() + "/LroNacL.img"};

  UserInterface options(APP_XML, args);
@@ -46,7 +46,7 @@ TEST_F(ObservationPair, DISABLED_FunctionalTestLronac2pdsIof) { 
  EXPECT_EQ(QString(imageObject["MD5_CHECKSUM"]), "5f5d7bc236f794ca651cebdde529f8a4");

}



TEST_F(ObservationPair, DISABLED_FunctionalTestLronac2pdsRadiance) {

TEST_F(ObservationPair, FunctionalTestLronac2pdsRadiance) {

  QVector<QString> args = {"from=" + cubeLPath,

                           "to=" + tempDir.path() + "/LroNacL.img"};

  UserInterface options(APP_XML, args);

isis/tests/FunctionalTestsSpkwriter.cpp

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ TEST_F(DefaultCube, FunctionalTestSpkwriterFromlist) { 
  }

}



TEST_F(ObservationPair, DISABLED_FunctionalTestSpkwriterCantValidate) {

TEST_F(ObservationPair, FunctionalTestSpkwriterCantValidate) {

  Pvl appLog;

  QVector<QString> args = {"fromlist=" + cubeListFile,

                           "to=" + tempDir.path() + "/newKernel.bsp"};
@@ -141,7 +141,7 @@ TEST_F(ObservationPair, DISABLED_FunctionalTestSpkwriterCantValidate) { 
  }

}



TEST_F(ObservationPair, DISABLED_FunctionalTestSpkwriterWarnValidate) {

TEST_F(ObservationPair, FunctionalTestSpkwriterWarnValidate) {

  Pvl appLog;

  QVector<QString> args = {"fromlist=" + cubeListFile,

                           "to=" + tempDir.path() + "/newKernel.bsp",