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

Fixed floating semicolons and toStdString() references pursuant to comments in PR #67

parent 99431bdc

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

+20 −20
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ int main() { 
  QList< QStringList > printableMeasureData = m.PrintableClassData();

  QStringList nameValuePair;

  foreach(nameValuePair, printableMeasureData) {

    qDebug() << nameValuePair.at(0).toStdString() << "=" <<

        nameValuePair.at(1).toStdString();

    qDebug() << nameValuePair.at(0).toLatin1().data() << "=" <<

        nameValuePair.at(1).toLatin1().data();

  }



  qDebug() << "Test 8";

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

+9 −11
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ void TestNetwork(const QString &filename, bool printNetwork, bool pvlInput) { 
      throw;

    }



    qDebug() << "After reading and writing to a binary form does Pvl match?"

        ;

    qDebug() << "After reading and writing to a binary form does Pvl match?";

    

    if(printNetwork) {

      Pvl pvlVersion2(test2->toPvl());

      pvlVersion2.write("./tmp2.pvl");
@@ -80,8 +80,7 @@ void TestNetwork(const QString &filename, bool printNetwork, bool pvlInput) { 


    ControlNetVersioner::Write(FileName("./tmp2"), *test2);

    if(system("cmp ./tmp ./tmp2")) {

      qDebug() << "Reading/Writing control network results in binary differences!"

          ;

      qDebug() << "Reading/Writing control network results in binary differences!";

    }

    else {

      qDebug() << "Reading/Writing control network is consistent";
@@ -164,4 +163,3 @@ void TestNetwork(const QString &filename, bool printNetwork, bool pvlInput) { 


  qDebug();

}

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

+5 −5
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ int main() { 
  printPoint(assignment);



  // Should be successful

  qDebug() << "Deleting ControlMeasure with cube serial number [" << cp.getCubeSerialNumbers().at(0).toStdString() << "]";

  qDebug() << "Deleting ControlMeasure with cube serial number [" << cp.getCubeSerialNumbers().at(0).toLatin1().data() << "]";

  qDebug() << "Measure type: " << ControlMeasure::MeasureTypeToString(cp.GetMeasure(0)->GetType());

  cp.Delete(0);

  printPoint(cp);