Jigsaw Test Conversions (sccconfig, scconfigHeld, radar) (DOI-USGS#4463)

* Converted jigsaw scconfig tests. * Added jigsaw radar test * Updated tests to reflect PR DOI-USGS#4446 changes & removed makefile tests * Updates to scconfig tests
tgiroux · Jun 8, 2021 · 1f7d245 · 1f7d245
1 parent af57a80
commit 1f7d245
Show file tree

Hide file tree

Showing 17 changed files with 24,133 additions and 159 deletions.
diff --git a/isis/src/control/apps/jigsaw/tsts/Makefile b/isis/src/control/apps/jigsaw/tsts/Makefile
diff --git a/isis/src/control/apps/jigsaw/tsts/radar/Makefile b/isis/src/control/apps/jigsaw/tsts/radar/Makefile
diff --git a/isis/src/control/apps/jigsaw/tsts/scconfig/Makefile b/isis/src/control/apps/jigsaw/tsts/scconfig/Makefile
diff --git a/isis/src/control/apps/jigsaw/tsts/scconfigHeld/Makefile b/isis/src/control/apps/jigsaw/tsts/scconfigHeld/Makefile
diff --git a/isis/tests/Fixtures.cpp b/isis/tests/Fixtures.cpp
@@ -1415,5 +1415,93 @@ namespace Isis {
       delete testCube;
     }
   }
+
+  void MiniRFNetwork::SetUp() {
+    TempTestingFiles::SetUp();
+
+    testCube1 = new Cube("data/miniRFImage/LSZ_00455_1CD_XKU_87S324_V1_S1_Null.crop.cub");
+    testCube2 = new Cube("data/miniRFImage/LSZ_00457_1CD_XKU_87S321_V1_S1_Null.crop.cub");
+    testCube3 = new Cube("data/miniRFImage/LSZ_00459_1CD_XKU_88S327_V1_S1_Null.crop.cub");
+
+    cubeList = new FileList();
+
+    cubeList->append(testCube1->fileName());
+    cubeList->append(testCube2->fileName());
+    cubeList->append(testCube3->fileName());
+
+
+    cubeListFile = tempDir.path() + "/cubes.lis";
+    cubeList->write(cubeListFile);
+
+    network = new ControlNet("data/miniRFImage/Cabeus_Orbit400_withSS_AprioriPts.net");
+    controlNetPath = tempDir.path() + "/miniRFNet.net";
+    network->Write(controlNetPath);
+  }
+
+  void MiniRFNetwork::TearDown() {
+    if (testCube1->isOpen()) {
+      testCube1->close();
+    }
+    delete testCube1;
+    if (testCube2->isOpen()) {
+      testCube2->close();
+    }
+    delete testCube2;
+    if (testCube3->isOpen()) {
+      testCube3->close();
+    }
+    delete testCube3;
+
+    if (cubeList) {
+      delete cubeList;
+    }
+  }
+
+  void VikThmNetwork::SetUp() {
+    TempTestingFiles::SetUp();
+
+    testCube1 = new Cube("data/vikingThemisNetwork/F704b51.lev1_slo_crop.cub");
+    testCube2 = new Cube("data/vikingThemisNetwork/F857a32.lev1_slo_crop.cub");
+    testCube3 = new Cube("data/vikingThemisNetwork/I28234014RDR_crop.cub");
+    testCube4 = new Cube("data/vikingThemisNetwork/I52634011RDR_crop.cub");
+
+    cubeList = new FileList();
+
+    cubeList->append(testCube1->fileName());
+    cubeList->append(testCube2->fileName());
+    cubeList->append(testCube3->fileName());
+    cubeList->append(testCube4->fileName());
+
+
+    cubeListFile = tempDir.path() + "/cubes.lis";
+    cubeList->write(cubeListFile);
+
+    network = new ControlNet("data/vikingThemisNetwork/themis_dayir_VO_arcadia_extract_hand.net");
+    controlNetPath = tempDir.path() + "/vikThmNet.net";
+    network->Write(controlNetPath);
+  }
+
+  void VikThmNetwork::TearDown() {
+    if (testCube1->isOpen()) {
+      testCube1->close();
+    }
+    delete testCube1;
+    if (testCube2->isOpen()) {
+      testCube2->close();
+    }
+    delete testCube2;
+    if (testCube3->isOpen()) {
+      testCube3->close();
+    }
+    delete testCube3;
+    if (testCube4->isOpen()) {
+      testCube4->close();
+    }
+    delete testCube4;
+
+    if (cubeList) {
+      delete cubeList;
+    }
+  }
 
 }
diff --git a/isis/tests/Fixtures.h b/isis/tests/Fixtures.h
@@ -273,56 +273,89 @@ namespace Isis {
   };
 
   class CSMCubeFixture : public SmallCube {
-  protected:
-    QString filename;
-    MockRasterGM mockModel;
+    protected:
+      QString filename;
+      MockRasterGM mockModel;
+
+      void SetUp() override;
+  };
+
+
+  class CSMCameraFixture : public CSMCubeFixture {
+    protected:
+      Camera *testCam;
+
+      void SetUp() override;
+  };
+
 
-    void SetUp() override;
-};
+  class CSMCameraSetFixture : public CSMCameraFixture {
+    protected:
+      csm::Ellipsoid wgs84;
+      csm::ImageCoord imagePt;
+      csm::EcefCoord groundPt;
+      csm::EcefLocus imageLocus;
+
+      void SetUp() override;
+  };
 
 
-class CSMCameraFixture : public CSMCubeFixture {
-  protected:
-    Camera *testCam;
+  class CSMCameraDemFixture : public CSMCubeFixture {
+    protected:
+      Camera *testCam;
+      double demRadius;
 
-    void SetUp() override;
-};
+      void SetUp() override;
+  };
+
+  class HistoryBlob : public TempTestingFiles {
+    protected:
+      Blob historyBlob;
+      PvlObject historyPvl;
+
+      void SetUp() override;
+  };
 
+  class NullPixelCube : public TempTestingFiles {
+    protected:
+      Cube *testCube;
 
-class CSMCameraSetFixture : public CSMCameraFixture {
-  protected:
-    csm::Ellipsoid wgs84;
-    csm::ImageCoord imagePt;
-    csm::EcefCoord groundPt;
-    csm::EcefLocus imageLocus;
+      void SetUp() override;
+      void TearDown() override;
+  };
 
-    void SetUp() override;
-};
+  class MiniRFNetwork : public TempTestingFiles {
+    protected:
+      Cube *testCube1;
+      Cube *testCube2;
+      Cube *testCube3;
 
+      FileList *cubeList;
+      QString cubeListFile;
 
-class CSMCameraDemFixture : public CSMCubeFixture {
-  protected:
-    Camera *testCam;
-    double demRadius;
+      ControlNet *network;
+      QString controlNetPath;
 
-    void SetUp() override;
-};
+      void SetUp() override;
+      void TearDown() override;
+  };
 
-class HistoryBlob : public TempTestingFiles {
-  protected:
-    Blob historyBlob;
-    PvlObject historyPvl;
+  class VikThmNetwork : public TempTestingFiles {
+    protected:
+      Cube *testCube1;
+      Cube *testCube2;
+      Cube *testCube3;
+      Cube *testCube4;
 
-    void SetUp() override;
-};
+      FileList *cubeList;
+      QString cubeListFile;
 
-class NullPixelCube : public TempTestingFiles {
-  protected:
-    Cube *testCube;
+      ControlNet *network;
+      QString controlNetPath;
 
-    void SetUp() override;
-    void TearDown() override;
-};
+      void SetUp() override;
+      void TearDown() override;
+  };
 }
 
 #endif