Commit 81146c75 authored by Andrew Stebenne's avatar Andrew Stebenne
Browse files

PROG: Modified ControlPoint unitTest to clarify that a file being referenced... 

PROG: Modified ControlPoint unitTest to clarify that a file being referenced on a nonexistent drive was only a dummy. Fixes #2204

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6057 41f8697f-d340-4b68-9986-7bafba869bb8
parent 766b730c

isis/src/control/objs/ControlPoint/ControlPoint.truth

+5 −5
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ Object = ControlNetwork 
    EditLock                 = True

    Ignore                   = True

    AprioriXYZSource         = Basemap

    AprioriXYZSourceFile     = /work1/tsucharski/basemap.cub

    AprioriXYZSourceFile     = ./dummy.cub

    AprioriRadiusSource      = DEM

    AprioriRadiusSourceFile  = $base/dems/molaMarsPlanetaryRadius0003.cub
@@ -88,7 +88,7 @@ Object = ControlNetwork 
    EditLock                 = True

    Ignore                   = True

    AprioriXYZSource         = Basemap

    AprioriXYZSourceFile     = /work1/tsucharski/basemap.cub

    AprioriXYZSourceFile     = ./dummy.cub

    AprioriRadiusSource      = DEM

    AprioriRadiusSourceFile  = $base/dems/molaMarsPlanetaryRadius0003.cub
@@ -177,7 +177,7 @@ Object = ControlNetwork 
    EditLock                 = True

    Ignore                   = True

    AprioriXYZSource         = Basemap

    AprioriXYZSourceFile     = /work1/tsucharski/basemap.cub

    AprioriXYZSourceFile     = ./dummy.cub

    AprioriRadiusSource      = DEM

    AprioriRadiusSourceFile  = $base/dems/molaMarsPlanetaryRadius0003.cub
@@ -262,7 +262,7 @@ Object = ControlNetwork 
    DateTime                 = 2005-05-03T00:00:00

    Ignore                   = True

    AprioriXYZSource         = Basemap

    AprioriXYZSourceFile     = /work1/tsucharski/basemap.cub

    AprioriXYZSourceFile     = ./dummy.cub

    AprioriRadiusSource      = DEM

    AprioriRadiusSourceFile  = $base/dems/molaMarsPlanetaryRadius0003.cub
@@ -348,7 +348,7 @@ Object = ControlNetwork 
    EditLock                 = True

    Ignore                   = True

    AprioriXYZSource         = Basemap

    AprioriXYZSourceFile     = /work1/tsucharski/basemap.cub

    AprioriXYZSourceFile     = ./dummy.cub

    AprioriRadiusSource      = DEM

    AprioriRadiusSourceFile  = $base/dems/molaMarsPlanetaryRadius0003.cub

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

+6 −3
Original line number Diff line number Diff line 
#include <string>

#include <iostream>



#include "boost/numeric/ublas/symmetric.hpp"

#include <boost/numeric/ublas/symmetric.hpp>



#include "ControlMeasure.h"

#include "ControlNet.h"
@@ -29,7 +29,9 @@ void printPoint(ControlPoint &p); 
  * @history 2011-06-07 Debbie A. Cook and Tracie Sucharski - Modified point types

  *                         Ground ------> Fixed

  *                         Tie----------> Free

  *

  * @history 2015-02-17  Andrew Stebenne, changed a reference to a local filesystem to a dummy file 

  *                         (dummy.cub) to make it clearer that the .cub file being referenced

  *                         wasn't necessary.

  */

int main() {

  Preference::Preferences(true);
@@ -41,7 +43,8 @@ int main() { 
  cp.SetType(ControlPoint::Fixed);

  cp.SetIgnored(true);

  cp.SetAprioriSurfacePointSource(ControlPoint::SurfacePointSource::Basemap);

  cp.SetAprioriSurfacePointSourceFile("/work1/tsucharski/basemap.cub");

  // dummy.cub does not exist: reference provided for testing.

  cp.SetAprioriSurfacePointSourceFile("./dummy.cub");

  cp.SetAprioriRadiusSource(ControlPoint::RadiusSource::DEM);

  cp.SetAprioriRadiusSourceFile("$base/dems/molaMarsPlanetaryRadius0003.cub");