Unverified Commit 4c3e60bc authored by Makayla Shepherd's avatar Makayla Shepherd Committed by GitHub
Browse files

Merge pull request #9 from ihumphrey-usgs/fix-ProcessImport-imgs 

PROG Fix process import imgs
parents efb1c186 21ae836d

isis/src/base/objs/ProcessImportPds/unitTest.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -15,6 +15,8 @@ using namespace Isis; 
 * @internal

 * @internal

 *   @history 2012-05-08 Tracie Sucharski - Moved test data to /usgs/cpks/mer/testData and

 *   @history 2012-05-08 Tracie Sucharski - Moved test data to /usgs/cpks/mer/testData and

 *                         /usgs/cpkgs/clementine1/testData.  Added test for invalid label.z

 *                         /usgs/cpkgs/clementine1/testData.  Added test for invalid label.z

 *   @history 2018-01-25 Ian Humphrey - Moved .img file out of ISIS tree (since we are not

 *                           storing .img's on GitHub).

 */

 */

void IsisMain() {

void IsisMain() {
@@ -111,7 +113,8 @@ void IsisMain() { 
    cout << "Testing PDS file containing an ^IMAGE pointer and ^TABLE pointer" << endl;

    cout << "Testing PDS file containing an ^IMAGE pointer and ^TABLE pointer" << endl;

    Isis::ProcessImportPds p;

    Isis::ProcessImportPds p;

    Isis::Pvl plab;

    Isis::Pvl plab;

    p.SetPdsFile("data/pdsImageWithTables.lbl", "data/pdsImageWithTables.img", plab);

    p.SetPdsFile("data/pdsImageWithTables.lbl",

                 "$ISIS3TESTDATA/isis/src/base/objs/ProcessImportPds/pdsImageWithTables.img", plab);

    p.SetOutputCube("TO");

    p.SetOutputCube("TO");

    p.ImportTable("SUN_POSITION_TABLE");

    p.ImportTable("SUN_POSITION_TABLE");

    p.StartProcess();

    p.StartProcess();

isis/src/base/objs/ProcessImportVicar/unitTest.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include "ProcessImportVicar.h"

#include "ProcessImportVicar.h"

#include "Application.h"

#include "Application.h"

#include "Cube.h"

#include "Cube.h"

#include "FileName.h"

#include "Statistics.h"

#include "Statistics.h"





using namespace Isis;

using namespace Isis;
@@ -16,7 +17,7 @@ void IsisMain() { 




  ProcessImportVicar p;

  ProcessImportVicar p;

  Pvl vlab;

  Pvl vlab;

  p.SetVicarFile("unitTest.img", vlab);

  p.SetVicarFile(FileName("$ISIS3TESTDATA/isis/src/base/objs/ProcessImportVicar/unitTest.img").expanded(), vlab);

  p.SetOutputCube("TO");

  p.SetOutputCube("TO");

  p.StartProcess();

  p.StartProcess();

  p.EndProcess();

  p.EndProcess();