Unverified Commit eabc3eac authored by Kristin Berry's avatar Kristin Berry Committed by GitHub
Browse files

Update file paths for data moved into the $ISISTESTDATA area. (#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
parent f6dc6cf2

isis/src/apollo/objs/ApolloMetricCamera/unitTest.cpp

+5 −5
Original line number Diff line number Diff line
@@ -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) {

isis/src/apollo/objs/ApolloPanoramicCamera/unitTest.cpp

+6 −6
Original line number Diff line number Diff line
@@ -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);

    

  }

isis/src/base/apps/campt/campt.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

isis/src/base/apps/equalizer/assets/FromList.lst

+3 −3
Original line number Diff line number Diff line 
$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

isis/src/base/apps/equalizer/assets/HoldList.lst

+1 −1
Original line number Diff line number Diff line 
$odyssey/testData/I01523019RDR.lev2.cub
 
$ISISTESTDATA/isis/src/odyssey/unitTestData/testData/I01523019RDR.lev2.cub