Update file paths for data moved into the $ISISTESTDATA area. (DOI-US…

…GS#3991) * Update file paths for unit test-associated data which was moved into the /usgs/cpkgs/isis3/isis_testData area * Move paths for documentation-associated cubes/nets to $ISISDATA/base/examples * Fix incorrect path in comment
AndrewAnnex · Aug 28, 2020 · eabc3ea · eabc3ea
1 parent f6dc6cf
commit eabc3ea
Show file tree

Hide file tree

Showing 195 changed files with 570 additions and 570 deletions.
diff --git a/isis/src/apollo/objs/ApolloMetricCamera/unitTest.cpp b/isis/src/apollo/objs/ApolloMetricCamera/unitTest.cpp
@@ -50,7 +50,7 @@ int main(int argc, char **argv) {
     double knownLat = 12.5300329125960879;
     double knownLon = 67.7259113746637524;
 
-    Cube c(FileName("$apollo15/testData/AS15-M-0533.cropped.cub").expanded(), "r");
+    Cube c(FileName("$ISISTESTDATA/isis/src/apollo/unitTestData/AS15-M-0533.cropped.cub").expanded(), "r");
     ApolloMetricCamera *cam = (ApolloMetricCamera *) CameraFactory::Create(c);
     cout << "FileName: " << FileName(c.fileName()).name() << endl;
     cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl;
@@ -113,9 +113,9 @@ int main(int argc, char **argv) {
 
     // Test name methods
     QList<QString> files;
-    files.append("$apollo15/testData/AS15-M-0533.cropped.cub");
-    files.append("$apollo16/testData/AS16-M-0533.reduced.cub");
-    files.append("$apollo17/testData/AS17-M-0543.reduced.cub");
+    files.append("$ISISTESTDATA/isis/src/apollo/unitTestData/AS15-M-0533.cropped.cub");
+    files.append("$ISISTESTDATA/isis/src/apollo/unitTestData/AS16-M-0533.reduced.cub");
+    files.append("$ISISTESTDATA/isis/src/apollo/unitTestData/AS17-M-0543.reduced.cub");
 
     cout << endl << endl << "Testing name methods ..." << endl;
     for (int i = 0; i < files.size(); i++) {
@@ -129,7 +129,7 @@ int main(int argc, char **argv) {
 
     // Test exception
     cout << endl << "Testing exceptions:" << endl << endl;
-    Cube test("$hayabusa/testData/st_2530292409_v.cub", "r");
+    Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r");
     ApolloMetricCamera mCam(test);
   }
   catch(IException &e) {

diff --git a/isis/src/apollo/objs/ApolloPanoramicCamera/unitTest.cpp b/isis/src/apollo/objs/ApolloPanoramicCamera/unitTest.cpp
@@ -52,19 +52,19 @@ int main(void) {
     double knownLat = 18.1052476112276679;
     double knownLon = 6.3330663560966673;
 
-    Cube cubeTL(FileName("$apollo15/testData/TL.cub").expanded(), "r");
+    Cube cubeTL(FileName("$ISISTESTDATA/isis/src/apollo/unitTestData/TL.cub").expanded(), "r");
     ApolloPanoramicCamera *camTL = (ApolloPanoramicCamera *) CameraFactory::Create(cubeTL);
 
-    Cube cubeBL(FileName("$apollo15/testData/BL.cub").expanded(), "r");
+    Cube cubeBL(FileName("$ISISTESTDATA/isis/src/apollo/unitTestData/BL.cub").expanded(), "r");
     ApolloPanoramicCamera *camBL = (ApolloPanoramicCamera *) CameraFactory::Create(cubeBL);
 
-    Cube cubeM(FileName("$apollo15/testData/M.cub").expanded(), "r");
+    Cube cubeM(FileName("$ISISTESTDATA/isis/src/apollo/unitTestData/M.cub").expanded(), "r");
     ApolloPanoramicCamera *camM = (ApolloPanoramicCamera *) CameraFactory::Create(cubeM);
 
-    Cube cubeTR(FileName("$apollo15/testData/TR.cub").expanded(), "r");
+    Cube cubeTR(FileName("$ISISTESTDATA/isis/src/apollo/unitTestData/TR.cub").expanded(), "r");
     ApolloPanoramicCamera *camTR = (ApolloPanoramicCamera *) CameraFactory::Create(cubeTR);
 
-    Cube cubeBR(FileName("$apollo15/testData/BR.cub").expanded(), "r");
+    Cube cubeBR(FileName("$ISISTESTDATA/isis/src/apollo/unitTestData/BR.cub").expanded(), "r");
     ApolloPanoramicCamera *camBR = (ApolloPanoramicCamera *) CameraFactory::Create(cubeBR);
 
     cout << "FileName: " << FileName(cubeTL.fileName()).name() << endl;
@@ -124,7 +124,7 @@ int main(void) {
 
     // Test exception: camera is not a supported Kaguya camera
     cout << endl << "Testing exceptions:" << endl << endl;
-    Cube test("$hayabusa/testData/st_2530292409_v.cub", "r");
+    Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r");
     ApolloPanoramicCamera pCam(test);
 
   }

diff --git a/isis/src/base/apps/campt/campt.xml b/isis/src/base/apps/campt/campt.xml
@@ -64,7 +64,7 @@ xsi:noNamespaceSchemaLocation=
 
     <pre>
 Group = GroundPoint
-  Filename                   = /usgs/cpkgs/isis3/data/mgs/testData/ab102401.cub
+  Filename                   = $ISISDATA/base/examples/ab102401.cub
   <def>Sample</def>                     = 1.0
   <def>Line</def>                       = 1.0
   <def link="Digital Number">PixelValue</def>                 = 0.0607816

diff --git a/isis/src/base/apps/equalizer/assets/FromList.lst b/isis/src/base/apps/equalizer/assets/FromList.lst
@@ -1,3 +1,3 @@
-$odyssey/testData/I00824006RDR.lev2.cub
-$odyssey/testData/I01523019RDR.lev2.cub
-$odyssey/testData/I02609002RDR.lev2.cub
+$ISISTESTDATA/isis/src/odyssey/unitTestData/I00824006RDR.lev2.cub
+$ISISTESTDATA/isis/src/odyssey/unitTestData/I01523019RDR.lev2.cub
+$ISISTESTDATA/isis/src/odyssey/unitTestData/I02609002RDR.lev2.cub
diff --git a/isis/src/base/apps/equalizer/assets/HoldList.lst b/isis/src/base/apps/equalizer/assets/HoldList.lst
@@ -1 +1 @@
-$odyssey/testData/I01523019RDR.lev2.cub
+$ISISTESTDATA/isis/src/odyssey/unitTestData/testData/I01523019RDR.lev2.cub
diff --git a/isis/src/base/apps/equalizer/assets/Input.lst b/isis/src/base/apps/equalizer/assets/Input.lst
@@ -1,2 +1,2 @@
-$odyssey/testData/I00824006RDR.lev2.cub
-$odyssey/testData/I02609002RDR.lev2.cub
+$ISISTESTDATA/isis/src/odyssey/unitTestData/I00824006RDR.lev2.cub
+$ISISTESTDATA/isis/src/odyssey/unitTestData/I02609002RDR.lev2.cub
diff --git a/isis/src/base/apps/equalizer/assets/firstRunStats.pvl b/isis/src/base/apps/equalizer/assets/firstRunStats.pvl
@@ -8,35 +8,33 @@ Object = EqualizationInformation
     Weighted        = false
     SolutionType    = 2
     SolveMethod     = 2
-    NonOverlaps     = (/usgs/cpkgs/isis3/data/odyssey/testData/I25685003EDR.c-
-                       rop.proj.reduced.cub,
-                       /usgs/cpkgs/isis3/data/odyssey/testData/I51718010EDR.cr-
-                       op.proj.reduced.cub)
+    NonOverlaps     = (/usgs/cpkgs/isis3/isis_testData/isis/src/odyssey/unitTestData/I25685003EDR.crop.proj.reduced.cub,
+                       /usgs/cpkgs/isis3/isis_testData/isis/src/odyssey/unitTestData/I51718010EDR.crop.proj.reduced.cub)
     HasCorrections  = false
   End_Group
 
   # Formula: newDN = (oldDN - AVERAGE) * GAIN + AVERAGE + OFFSET
   # BandN = (GAIN, OFFSET, AVERAGE)
   Group = Normalization
-    FileName = $odyssey/testData/I10047011EDR.proj.reduced.cub
+    FileName = $ISISTESTDATA/isis/src/odyssey/unitTestData/I10047011EDR.proj.reduced.cub
   End_Group
 
   # Formula: newDN = (oldDN - AVERAGE) * GAIN + AVERAGE + OFFSET
   # BandN = (GAIN, OFFSET, AVERAGE)
   Group = Normalization
-    FileName = $odyssey/testData/I25685003EDR.crop.proj.reduced.cub
+    FileName = $ISISTESTDATA/isis/src/odyssey/unitTestData/I25685003EDR.crop.proj.reduced.cub
   End_Group
 
   # Formula: newDN = (oldDN - AVERAGE) * GAIN + AVERAGE + OFFSET
   # BandN = (GAIN, OFFSET, AVERAGE)
   Group = Normalization
-    FileName = $odyssey/testData/I51718010EDR.crop.proj.reduced.cub
+    FileName = $ISISTESTDATA/isis/src/odyssey/unitTestData/I51718010EDR.crop.proj.reduced.cub
   End_Group
 
   # Formula: newDN = (oldDN - AVERAGE) * GAIN + AVERAGE + OFFSET
   # BandN = (GAIN, OFFSET, AVERAGE)
   Group = Normalization
-    FileName = $odyssey/testData/I56969027EDR.proj.reduced.cub
+    FileName = $ISISTESTDATA/isis/src/odyssey/unitTestData/I56969027EDR.proj.reduced.cub
   End_Group
 End_Object
 

diff --git a/isis/src/base/apps/equalizer/assets/fixedStats.pvl b/isis/src/base/apps/equalizer/assets/fixedStats.pvl
@@ -15,7 +15,7 @@ Object = EqualizationInformation
   # Formula: newDN = (oldDN - AVERAGE) * GAIN + AVERAGE + OFFSET
   # BandN = (GAIN, OFFSET, AVERAGE)
   Group = Normalization
-    FileName = $odyssey/testData/I10047011EDR.proj.reduced.cub
+    FileName = $ISISTESTDATA/isis/src/odyssey/unitTestData/I10047011EDR.proj.reduced.cub
     Band1    = (0.93152671949526, 6.8917115026193, 115.47426360088)
     Band2    = (0.86384744244226, 6.5539312542221, 92.532407988854)
     Band3    = (0.80306456179597, 4.4447440301132, 88.324629525638)
@@ -29,7 +29,7 @@ Object = EqualizationInformation
   # Formula: newDN = (oldDN - AVERAGE) * GAIN + AVERAGE + OFFSET
   # BandN = (GAIN, OFFSET, AVERAGE)
   Group = Normalization
-    FileName = $odyssey/testData/I25685003EDR.crop.proj.reduced.cub
+    FileName = $ISISTESTDATA/isis/src/odyssey/unitTestData/testData/I25685003EDR.crop.proj.reduced.cub
     Band1    = (0.83205548471968, -5.8307661142424, 145.61574545953)
     Band2    = (0.85878080894809, -6.0792409854031, 127.99110106071)
     Band3    = (0.90156276679541, -7.7199279393793, 120.5170145403)
@@ -43,7 +43,7 @@ Object = EqualizationInformation
   # Formula: newDN = (oldDN - AVERAGE) * GAIN + AVERAGE + OFFSET
   # BandN = (GAIN, OFFSET, AVERAGE)
   Group = Normalization
-    FileName = $odyssey/testData/I50695002EDR.proj.reduced.cub
+    FileName = $ISISTESTDATA/isis/src/odyssey/unitTestData/testData/I50695002EDR.proj.reduced.cub
     Band1    = (0.61304196521891, -28.390433817194, 148.09828872294)
     Band2    = (0.63854694422858, -39.951256345725, 135.19529272481)
     Band3    = (0.69437523310386, -37.588975628767, 126.6021071024)
@@ -57,7 +57,7 @@ Object = EqualizationInformation
   # Formula: newDN = (oldDN - AVERAGE) * GAIN + AVERAGE + OFFSET
   # BandN = (GAIN, OFFSET, AVERAGE)
   Group = Normalization
-    FileName = $odyssey/testData/I51718010EDR.crop.proj.reduced.cub
+    FileName = $ISISTESTDATA/isis/src/odyssey/unitTestData/testData/I51718010EDR.crop.proj.reduced.cub
     Band1    = (0.77844407732164, -11.029286408666, 119.0013504582)
     Band2    = (0.7502459928146, -17.695216864398, 98.714611029686)
     Band3    = (0.75100278297462, -18.502621867222, 95.041772145495)
@@ -71,7 +71,7 @@ Object = EqualizationInformation
   # Formula: newDN = (oldDN - AVERAGE) * GAIN + AVERAGE + OFFSET
   # BandN = (GAIN, OFFSET, AVERAGE)
   Group = Normalization
-    FileName = $odyssey/testData/I56969027EDR.proj.reduced.cub
+    FileName = $ISISTESTDATA/isis/src/odyssey/unitTestData/testData/I56969027EDR.proj.reduced.cub
     Band1    = (2.7035522806794, 38.358774837512, 77.220361285484)
     Band2    = (2.813740891084, 57.171782941317, 32.698505929389)
     Band3    = (2.6486087068972, 59.366781405278, 25.034809470416)

diff --git a/isis/src/base/apps/equalizer/assets/fromlist.lis b/isis/src/base/apps/equalizer/assets/fromlist.lis
@@ -1,4 +1,4 @@
-$odyssey/testData/I10047011EDR.proj.reduced.cub
-$odyssey/testData/I25685003EDR.crop.proj.reduced.cub
-$odyssey/testData/I51718010EDR.crop.proj.reduced.cub
-$odyssey/testData/I56969027EDR.proj.reduced.cub
+$ISISTESTDATA/isis/src/odyssey/unitTestData/I10047011EDR.proj.reduced.cub
+$ISISTESTDATA/isis/src/odyssey/unitTestData/I25685003EDR.crop.proj.reduced.cub
+$ISISTESTDATA/isis/src/odyssey/unitTestData/I51718010EDR.crop.proj.reduced.cub
+$ISISTESTDATA/isis/src/odyssey/unitTestData/I56969027EDR.proj.reduced.cub
diff --git a/isis/src/base/apps/equalizer/assets/stats.pvl b/isis/src/base/apps/equalizer/assets/stats.pvl
@@ -10,7 +10,7 @@ Object = EqualizationInformation
   # Formula: newDN = (oldDN - AVERAGE) * GAIN + AVERAGE + OFFSET
   # BandN = (GAIN, OFFSET, AVERAGE)
   Group = Normalization
-    FileName = $odyssey/testData/I00824006RDR.lev2.cub
+    FileName = $ISISTESTDATA/isis/src/odyssey/unitTestData/I00824006RDR.lev2.cub
     Band1    = (0.80247733802282, -6.41865351231352e-05, 3.75633639030183e-04)
     Band2    = (0.79065929400895, -6.36729218508168e-05, 3.73453901670211e-04)
     Band3    = (0.78618517163023, -4.66441642261209e-05, 4.26489334143704e-04)
@@ -26,7 +26,7 @@ Object = EqualizationInformation
   # Formula: newDN = (oldDN - AVERAGE) * GAIN + AVERAGE + OFFSET
   # BandN = (GAIN, OFFSET, AVERAGE)
   Group = Normalization
-    FileName = $odyssey/testData/I01523019RDR.lev2.cub
+    FileName = $ISISTESTDATA/isis/src/odyssey/unitTestData/I01523019RDR.lev2.cub
     Band1    = (1.0, 9.58308385427109e-21, 3.09460986870763e-04)
     Band2    = (1.0, 9.58308385427109e-21, 3.08373709744676e-04)
     Band3    = (1.0, 1.91661677085422e-20, 3.91940207887308e-04)
@@ -42,7 +42,7 @@ Object = EqualizationInformation
   # Formula: newDN = (oldDN - AVERAGE) * GAIN + AVERAGE + OFFSET
   # BandN = (GAIN, OFFSET, AVERAGE)
   Group = Normalization
-    FileName = $odyssey/testData/I02609002RDR.lev2.cub
+    FileName = $ISISTESTDATA/isis/src/odyssey/unitTestData/I02609002RDR.lev2.cub
     Band1    = (1.9316157478611, 1.59619509035933e-04, 1.42658743858439e-04)
     Band2    = (1.932336336529, 1.57588763433619e-04, 1.43649318131491e-04)
     Band3    = (1.64004090444, 1.68659640333886e-04, 2.0777327887805e-04)

diff --git a/isis/src/base/apps/ringspt/ringspt.xml b/isis/src/base/apps/ringspt/ringspt.xml
@@ -20,7 +20,7 @@
     resolution.  The following is an example of the output given when campt is ran:
     <pre>
 Group = GroundPoint
-  Filename                   = /usgs/cpkgs/isis3/data/mgs/testData/ab102401.cub
+  Filename                   = $ISISDATA/base/examples/ab102401.cub
   Sample                     = 1.0
   Line                       = 1.0
   PixelValue     

diff --git a/isis/src/base/objs/AdaptiveGruen/unitTest.cpp b/isis/src/base/objs/AdaptiveGruen/unitTest.cpp
@@ -43,10 +43,10 @@ int main() {
     AutoReg *ar = AutoRegFactory::Create(pvl);
 
     Cube p;
-    p.open("$messenger/testData/EW0131770376G.equi.cub");
+    p.open("$ISISTESTDATA/isis/src/messenger/unitTestData/EW0131770376G.equi.cub");
 
     Cube s;
-    s.open("$messenger/testData/EW0131770381F.equi.cub");
+    s.open("$ISISTESTDATA/isis/src/messenger/unitTestData/EW0131770381F.equi.cub");
 
     ar->SearchChip()->TackCube(512.0, 512.0);
     ar->SearchChip()->Load(s);

diff --git a/isis/src/base/objs/AlphaCube/unitTest.cpp b/isis/src/base/objs/AlphaCube/unitTest.cpp
@@ -80,7 +80,7 @@ int main() {
   cout << endl;
 
   try {
-    Cube cube("$base/testData/isisTruth.cub", "r");
+    Cube cube("$ISISTESTDATA/isis/src/base/unitTestData/isisTruth.cub", "r");
     Pvl &lab = *cube.label();
     lab.clear();
     lab.addObject(PvlObject("IsisCube"));

diff --git a/isis/src/base/objs/AutoReg/unitTest.cpp b/isis/src/base/objs/AutoReg/unitTest.cpp
@@ -312,11 +312,11 @@ void Doit(Isis::PvlObject &obj) {
     lab.addObject(obj);
     p_ar = AutoRegFactory::Create(lab);
     Cube c;
-    c.open("$base/testData/AutoReg/search_low.cub");
+    c.open("$ISISTESTDATA/isis/src/base/unitTestData/AutoReg/search_low.cub");
     p_ar->SearchChip()->TackCube(75.0, 75.0);
     p_ar->SearchChip()->Load(c);
     Cube d;
-    d.open("$base/testData/AutoReg/pattern.cub");
+    d.open("$ISISTESTDATA/isis/src/base/unitTestData/AutoReg/pattern.cub");
     p_ar->PatternChip()->TackCube(45.0, 45.0);
     p_ar->PatternChip()->Load(d);
   }

diff --git a/isis/src/base/objs/BandManager/unitTest.cpp b/isis/src/base/objs/BandManager/unitTest.cpp
@@ -14,7 +14,7 @@ int main(int argc, char *argv[]) {
 
   Isis::Preference::Preferences(true);
 
-  QString fname = "$base/testData/isisTruth.cub";
+  QString fname = "$ISISTESTDATA/isis/src/base/unitTestData/isisTruth.cub";
   Isis::Cube cube;
   cube.open(fname);
 

diff --git a/isis/src/base/objs/Blobber/Blobber.truth b/isis/src/base/objs/Blobber/Blobber.truth
@@ -1,6 +1,6 @@
 *** Blobber unitTest ***
 
-File Source: $base/testData/blobTruth.cub
+File Source: $ISISTESTDATA/isis/src/base/unitTestData/blobTruth.cub
 
 ** Test Cube Class access...
 Blob Name:           Blobber

diff --git a/isis/src/base/objs/Blobber/unitTest.cpp b/isis/src/base/objs/Blobber/unitTest.cpp
@@ -14,7 +14,7 @@ int main(int argc, char *argv[]) {
 
     cout << "*** Blobber unitTest ***\n";
     Preference::Preferences(true);
-    QString fname = "$base/testData/blobTruth.cub";
+    QString fname = "$ISISTESTDATA/isis/src/base/unitTestData/blobTruth.cub";
     cout << "\nFile Source: " << fname << endl;
 
 // This is assumed to be Hirise cube source

diff --git a/isis/src/base/objs/BoxcarManager/unitTest.cpp b/isis/src/base/objs/BoxcarManager/unitTest.cpp
@@ -13,7 +13,7 @@ int main(int argc, char *argv[]) {
 
   Preference::Preferences(true);
 
-  QString fname = "$base/testData/isisTruth.cub";
+  QString fname = "$ISISTESTDATA/isis/src/base/unitTestData/isisTruth.cub";
   Cube cube;
   cube.open(fname);
 

diff --git a/isis/src/base/objs/BulletShapeModel/BulletShapeModel.truth b/isis/src/base/objs/BulletShapeModel/BulletShapeModel.truth
@@ -14,7 +14,7 @@ Model has normal?  false
 ----====       Construct shape model from cube       ====----
 
 
-Using:  "$hayabusa/testData/st_2391934788_v.cub"
+Using:  "$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2391934788_v.cub"
 Bullet shape model status:
   Name:  "Bullet"
   Tolerance:  0.001

diff --git a/isis/src/base/objs/BulletShapeModel/unitTest.cpp b/isis/src/base/objs/BulletShapeModel/unitTest.cpp
@@ -65,8 +65,8 @@ int main(int argc, char *argv[]) {
   try {
     Preference::Preferences(true);
 
-    QString itokawaCubeFile("$hayabusa/testData/st_2391934788_v.cub");
-    QString itokawaDskFile("$base/testData/hay_a_amica_5_itokawashape_v1_0_64q.bds");
+    QString itokawaCubeFile("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2391934788_v.cub");
+    QString itokawaDskFile("$ISISTESTDATA/isis/src/base/unitTestData/hay_a_amica_5_itokawashape_v1_0_64q.bds");
 
     qDebug() << "Unit test for BulletShapeModel";
     qDebug() << "";

diff --git a/isis/src/base/objs/BulletTargetShape/BulletTargetShape.truth b/isis/src/base/objs/BulletTargetShape/BulletTargetShape.truth
@@ -9,21 +9,21 @@ btCollisionBody pointer is valid?  false
 
 
 Testing load constructor
-Testing with  "$base/testData/hay_a_amica_5_itokawashape_v1_0_64q.bds" ...
+Testing with  "$ISISTESTDATA/isis/src/base/unitTestData/hay_a_amica_5_itokawashape_v1_0_64q.bds" ...
 
 Target name:  ""
 Maximum distance in kilometers:  0.683956
 btCollisionBody pointer is valid?  true
 
 
 Testing load constructor with cube
-Testing with  "$hayabusa/testData/st_2391934788_v.cub" ...
+Testing with  "$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2391934788_v.cub" ...
 
 Target shape pointer is valid? false
 
 
 Testing load constructor with other extension
-Testing with  "$base/testData/xmlTestLabel.xml" ...
+Testing with  "$ISISTESTDATA/isis/src/base/unitTestData/xmlTestLabel.xml" ...
 
 Target shape pointer is valid? false
 

diff --git a/isis/src/base/objs/BulletTargetShape/unitTest.cpp b/isis/src/base/objs/BulletTargetShape/unitTest.cpp
@@ -43,7 +43,7 @@ int main(int argc, char *argv[]) {
     qDebug() << endl;
 
     qDebug() << "Testing load constructor";
-    QString dskfile("$base/testData/hay_a_amica_5_itokawashape_v1_0_64q.bds");
+    QString dskfile("$ISISTESTDATA/isis/src/base/unitTestData/hay_a_amica_5_itokawashape_v1_0_64q.bds");
     qDebug() << "Testing with " << dskfile << "...";
     qDebug() << "";
     BulletTargetShape *itokawaTargetShape = BulletTargetShape::load(dskfile);
@@ -53,15 +53,15 @@ int main(int argc, char *argv[]) {
     qDebug() << endl;
 
     qDebug() << "Testing load constructor with cube";
-    QString itokawaCube = "$hayabusa/testData/st_2391934788_v.cub";
+    QString itokawaCube = "$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2391934788_v.cub";
     qDebug() << "Testing with " << itokawaCube << "...";
     qDebug() << "";
     BulletTargetShape *cubeTargetShape = BulletTargetShape::load(itokawaCube);
     qDebug() << "Target shape pointer is valid?" << (bool) cubeTargetShape;
     qDebug() << endl;
 
     qDebug() << "Testing load constructor with other extension";
-    QString otherFile = "$base/testData/xmlTestLabel.xml";
+    QString otherFile = "$ISISTESTDATA/isis/src/base/unitTestData/xmlTestLabel.xml";
     qDebug() << "Testing with " << otherFile << "...";
     qDebug() << "";
     BulletTargetShape *otherTargetShape = BulletTargetShape::load(otherFile);

diff --git a/isis/src/base/objs/BulletWorldManager/BulletWorldManager.truth b/isis/src/base/objs/BulletWorldManager/BulletWorldManager.truth
@@ -12,7 +12,7 @@ World name:  "TestWorld"
 World size:  0
 
 
-Adding  "$base/testData/hay_a_amica_5_itokawashape_v1_0_64q.bds" ...
+Adding  "$ISISTESTDATA/isis/src/base/unitTestData/hay_a_amica_5_itokawashape_v1_0_64q.bds" ...
 
 World size:  1
 

diff --git a/isis/src/base/objs/BulletWorldManager/unitTest.cpp b/isis/src/base/objs/BulletWorldManager/unitTest.cpp
@@ -50,7 +50,7 @@ int main(int argc, char *argv[]) {
     qDebug() << endl;
 
 
-    QString dskfile("$base/testData/hay_a_amica_5_itokawashape_v1_0_64q.bds");
+    QString dskfile("$ISISTESTDATA/isis/src/base/unitTestData/hay_a_amica_5_itokawashape_v1_0_64q.bds");
     qDebug() << "Adding " << dskfile << "...";
     qDebug() << "";
     BulletTargetShape *itokawaShape = BulletTargetShape::load(dskfile);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		$odyssey/testData/I01523019RDR.lev2.cub
		$ISISTESTDATA/isis/src/odyssey/unitTestData/testData/I01523019RDR.lev2.cub