Commit b1df2992 authored by chrisryancombs's avatar chrisryancombs
Browse files

Merge branch 'cmake' of https://github.com/USGS-Astrogeology/ISIS3 into cmake

parents 00652c18 01a75108

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

+3 −3
Original line number Diff line number Diff line
@@ -411,19 +411,19 @@ int main() { 
  try {

    AtmosModel::Ei(0.0); // require x > 0

  }

  catch(IException e) {

  catch(IException &e) {

    e.print();

  }

  try {

    AtmosModel::En(1, 0.0); // require (n>=0 & x>0) or (n>1 & x>=0)

  }

  catch(IException e) {

  catch(IException &e) {

    e.print();

  }

  try {

    AtmosModel::En(0, -1.0); // require (n>=0 & x>0) or (n>1 & x>=0)

  }

  catch(IException e) {

  catch(IException &e) {

    e.print();

  }

isis/src/base/objs/BulletShapeModel/BulletShapeModel.truth

+0 −2
Original line number Diff line number Diff line 
Unit test for BulletShapeModel

  MaxTriangles:  134217728

  MaxBodyParts:  16





----====        Construct default shape model        ====----

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

+9 −8
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ void testGroundPointToCamera(Latitude &lat, 
 *

 * @internal

 *   @history 2017-03-19 Kris Becker

 *   @history 2018-08-07 Adam Goins - Removed qDebut() output of maxnumtriangles and maxnumparts

 *                           because they are values grabbed from Bullet so we don't need to be

 *                           testing them.

 *

 */

int main(int argc, char *argv[]) {
@@ -66,8 +69,6 @@ int main(int argc, char *argv[]) { 
    QString itokawaDskFile("$base/testData/hay_a_amica_5_itokawashape_v1_0_64q.bds");



    qDebug() << "Unit test for BulletShapeModel";

    qDebug() << "  MaxTriangles: " << bt_MaxTriangles();

    qDebug() << "  MaxBodyParts: " << bt_MaxBodyParts();

    qDebug() << "";

    qDebug() << "";

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

+24 −24
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ int main() { 
  try {

    FunctionTools::brentsRootFinder(func,point1,point2,1e-6,100,root);

  }

  catch (IException e) {

  catch (IException &e) {

    e.print();

  }
@@ -261,7 +261,7 @@ int main() { 
  try {

    FunctionTools::brentsRootFinder(errorFunc,point1,point2,1e-6,100,root);

  }

  catch (IException e) {

  catch (IException &e) {

    e.print();

  }
@@ -279,7 +279,7 @@ int main() { 
  try {

    FunctionTools::brentsRootFinder(func,point1,point2,1e-6,100,root);

  }

  catch (IException e) {

  catch (IException &e) {

    e.print();

  }

  cerr << "Root Found: " << root << endl;

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

+11 −11
Original line number Diff line number Diff line
@@ -105,13 +105,13 @@ int main(void) { 
    // Test kernel ID messages

    cout << "Kernel ID error messages: " << endl;

    try{ cam->CkFrameId(); }

    catch (IException e){ e.print(); }

    catch (IException &e){ e.print(); }

    try{ cam->CkReferenceId(); }

    catch (IException e){ e.print(); }

    catch (IException &e){ e.print(); }

    try{ cam->SpkTargetId(); }

    catch (IException e){ e.print(); }

    catch (IException &e){ e.print(); }

    try{ cam->SpkReferenceId(); }

    catch (IException e){ e.print(); }

    catch (IException &e){ e.print(); }

    delete cam;

  }

  catch(IException &e) {