Commit 35c73168 authored by Oxez's avatar Oxez
Browse files

Made pathing changes to reflect build directory being ISISROOT for unitTest

parent 8c0017d2

isis/src/base/objs/Preference/Preference.cpp

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ namespace Isis { 


      // If its a unitTest then load with the unitTest preference file

      if(unitTest) {

        p_preference->Load("$ISISROOT/src/base/objs/Preference/TestPreferences");

        p_preference->Load("$ISISROOT/TestPreferences");

      }

      // Otherwise load the Isis system and personal preferences.

      else {
@@ -134,7 +134,7 @@ namespace Isis { 
    else if(unitTest) {

      p_unitTest = unitTest;

      p_preference->clear();

      p_preference->Load("$ISISROOT/src/base/objs/Preference/TestPreferences");

      p_preference->Load("$ISISROOT/TestPreferences");

    }



    return *p_preference;

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

+155 −155
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ int main(int argc, char *argv[]) { 
  cout << "Unit test for Isis::UserInterface ..." << endl;



  QString unitTestXml = Isis::FileName("unitTest.xml").expanded();

  QString highpass = Isis::FileName("$ISISROOT/src/base/apps/highpass/highpass.xml").expanded();

  QString highpass = Isis::FileName("$ISISROOT/bin/xml/highpass.xml").expanded();

  char *myArgv[15];// = {"unitTest", "from=input.cub", "to=output.cub"};



  for (int i = 0; i < 15; i++)
@@ -299,7 +299,7 @@ int main(int argc, char *argv[]) { 
    cout << "Testing Invalid Parameter" << endl;

    try {

      int myArgc = 0;

      strcpy(myArgv[myArgc++], "$ISISROOT/src/base/apps/highpass/highpass");

      strcpy(myArgv[myArgc++], "$ISISROOT/bin/highpass/highpass");

      strcpy(myArgv[myArgc++], "bogus=parameter");



      Isis::UserInterface ui(unitTestXml, myArgc, myArgv);
@@ -887,7 +887,7 @@ int main(int argc, char *argv[]) { 
    cout << "Testing -RESTORE with invalid (non-existing) .par file" << endl;

    try {

      int myArgc = 0;

      strcpy(myArgv[myArgc++], "$ISISROOT/src/base/apps/highpass/highpass");

      strcpy(myArgv[myArgc++], "$ISISROOT/bin/highpass");

      strcpy(myArgv[myArgc++], "-restore=junk.par");



      Isis::UserInterface ui(unitTestXml, myArgc, myArgv);