Commit d2616269 authored by Adam Goins's avatar Adam Goins Committed by Makayla Shepherd
Browse files

Changed QString command to use networkFileName.expanded() instead of fileName... 

Changed QString command to use networkFileName.expanded() instead of fileName to reference the path to the network in the test area.
parent a210924b

isis/src/control/objs/ControlNetVersioner/unitTest.cpp

+8 −8
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ int main(int argc, char *argv[]) { 
  TestNetwork("$control/testData/unitTest_ControlNetVersioner_oldNetwork_PvlV0001.net");         // Another set of odd keywords

  TestNetwork("$control/testData/unitTest_ControlNetVersioner_oldNetwork2_ProtoV0001.net");      // Binary V1

  TestNetwork("$control/testData/unitTest_ControlNetVersioner_badNetwork_ProtoV0001.net");       // Corrupted (based off of oldNetwork2.net)

  TestNetwork("$control/testData/unitTest_ControlNetVersioner_semilarge_ProtoV0002.net", false);

  TestNetwork("$control/testData/unitTest_ControlNetVersioner_smallPvlTest_PvlV0003.pvl", true, true); // network with rejected jigsaw points

  TestNetwork("$control/testData/unitTest_ControlNetVersioner_semilarge_ProtoV0002.net", false); // Binary V2

  TestNetwork("$control/testData/unitTest_ControlNetVersioner_smallPvlTest_PvlV0003.pvl", true, true); // Network with rejected jigsaw points

}



void TestNetwork(const QString &filename, bool printNetwork, bool pvlInput) {
@@ -118,7 +118,7 @@ void TestNetwork(const QString &filename, bool printNetwork, bool pvlInput) { 
      cNet2->write( FileName("./tmpCNet2") );



      //if there are differences between the pvls.

      QString cmd = "diff -EbB --suppress-common-lines " + filename + " ./tmp.pvl";

      QString cmd = "diff -EbB --suppress-common-lines " + networkFileName.expanded() + " ./tmp.pvl";

      if(system(cmd.toStdString().c_str())) {



        //if the binary files are different.