Fix botched merge2

DOI-USGS · Oct 29, 2020 · fcb4d21 · fcb4d21
1 parent e24b4ca
commit fcb4d21
Showing 1 changed file with 1 addition and 47 deletions.
diff --git a/isis/tests/Fixtures.cpp b/isis/tests/Fixtures.cpp
@@ -402,53 +402,7 @@ 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 ObservationPair::SetUp() {
       FileName labelPathL = FileName("data/observationPair/observationImageL.pvl");
       FileName labelPathR = FileName("data/observationPair/observationImageR.pvl");