Updated botched merge

DOI-USGS · Oct 29, 2020 · 1bc29f5 · 1bc29f5
1 parent 859d158
commit 1bc29f5
Show file tree

Hide file tree

Showing 3 changed files with 205 additions and 214 deletions.
diff --git a/isis/tests/Fixtures.cpp b/isis/tests/Fixtures.cpp
@@ -402,6 +402,53 @@ namespace Isis {
     }
   }
 
+  void ObservationPair::SetUp() {
+      FileName labelPathL = FileName("data/observationPair/observationImageL.pvl");
+      FileName labelPathR = FileName("data/observationPair/observationImageR.pvl");
+
+      isdPathL = new FileName("data/observationPair/observationImageL.isd");
+      isdPathR = new FileName("data/observationPair/observationImageR.isd");
+
+      cubeL = new Cube();
+      cubeR = new Cube();
+
+      cubeLPath = tempDir.path() + "/observationPairL.cub";
+      cubeRPath = tempDir.path() + "/observationPairR.cub";
+
+      cubeL->fromIsd(cubeLPath, labelPathL, *isdPathL, "rw");    
+      cubeR->fromIsd(cubeRPath, labelPathR, *isdPathR, "rw");    
+
+      cubeList = new FileList();
+      cubeList->append(cubeL->fileName());
+      cubeList->append(cubeR->fileName());
+
+      cubeListFile = tempDir.path() + "/cubes.lis";
+      cubeList->write(cubeListFile);
+
+      cnetPath = "data/observationPair/observationPair.net";
+      network = new ControlNet();
+      network->ReadControl(cnetPath);
+  }
+
+
+  void ObservationPair::TearDown() {
+    delete cubeList;
+    delete network;
+
+    if (cubeL) {
+      delete cubeL;
+    }
+
+    if (cubeR) {
+      delete cubeR;
+    }
+
+    delete isdPathL;
+    delete isdPathR;
+
+  }
+
+
   void MroCube::setInstrument(QString ikid, QString instrumentId, QString spacecraftName) {
     PvlGroup &kernels = testCube->label()->findObject("IsisCube").findGroup("Kernels");
     kernels.findKeyword("NaifFrameCode").setValue(ikid);    

diff --git a/isis/tests/Fixtures.h b/isis/tests/Fixtures.h
@@ -130,6 +130,28 @@ namespace Isis {
       FileList *cubeList;
       QString cubeListFile;
       QString controlNetPath;
+
+      void SetUp() override;
+      void TearDown() override;
+  };
+
+  class ObservationPair : public TempTestingFiles {
+    protected: 
+
+      Cube *cubeL; 
+      Cube *cubeR;
+
+      QString cubeLPath; 
+      QString cubeRPath; 
+
+      FileName *isdPathL;
+      FileName *isdPathR; 
+
+      FileList *cubeList; 
+      QString cubeListFile;
+
+      ControlNet *network; 
+      QString cnetPath; 
 
       void SetUp() override;
       void TearDown() override;