Commit 3c046700 authored by Christopher Combs's avatar Christopher Combs
Browse files

Fixed tests that fail when not using the default data area. Fixes #4738

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@7729 41f8697f-d340-4b68-9986-7bafba869bb8
parent d259fdd8
Loading
Loading
Loading
Loading
+18 −14
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@
     <change name="Kristin Berry" date="2015-07-22">
       Modified so that tracking information in the input cubes is not propagated to the output cube.
     </change>
     <change name="Christopher Combs" date="2017-05-19">
       Modified Makefile of badinputs app test to truncate paths before data directory. Allows tests
       to pass when not using the default data area. Fixes #4783.
     </change>
     </history>

  <groups>
+9 −9
Original line number Diff line number Diff line
@@ -35,13 +35,13 @@ commands:
	fi;

#    Remove Paths
	$(SED) 's+\[/.*/input/+\[input/+' $(OUTPUT)/error_temp.txt > $(OUTPUT)/error_temp2.txt;
	$(SED) 's+\[/.*/output/+\[output/+' $(OUTPUT)/error_temp2.txt > $(OUTPUT)/error.txt;
	$(SED) "s/\/.*\/data/data/" $(OUTPUT)/error_temp.txt > $(OUTPUT)/error_temp2.txt;
	$(SED) 's+\[/.*/input/+\[input/+' $(OUTPUT)/error_temp2.txt > $(OUTPUT)/error_temp3.txt;
	$(SED) 's+\[/.*/output/+\[output/+' $(OUTPUT)/error_temp3.txt > $(OUTPUT)/error.txt;

#    Cleanup
	$(RM) $(OUTPUT)/error_temp.txt;
	$(RM) $(OUTPUT)/error_temp2.txt;
	$(RM) $(OUTPUT)/error_temp3.txt;
	$(RM) $(OUTPUT)/tracking.lis;
	$(RM) $(OUTPUT)/broken.lis;

+25 −21
Original line number Diff line number Diff line
@@ -242,6 +242,10 @@
      in the input image list and recalculate statistics for any new images in the input list,
      reusing previously calculated statistics for the rest of the images. Fixes #2282.
    </change>
    <change name="Christopher Combs" date="2017-05-19">
      Changed pvl.DIFF of input for app tests nonOverlapRecalculate and nonOverlapRetryBoth to
      ignore file names. Allows test to pass when not using default data area. Fixes #4738.
    </change>
  </history>

  <groups>
+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ namespace Isis {
   *                           now return the normal vector to an ellipsoid.  All references
   *                           to ShapeModel::calculateEllipsoidalSurfaceNormal have been
   *                           removed.  References #1028.
   *   @history 2017-05-19 Christopher Combs - Modified unitTest.cpp: Removed path of output in
   *                           testDemCube() to allow the test to pass when not using the standard
   *                           data areas. Fixes #4738.
   *
   */
  class DemShape : public ShapeModel {
+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ Begin testing Dem Shape Model class....
    The map scale of the dem file is 128 pixels/degree

  Testing protected methods demCube ...
    Using dem cube file = /usgs/cpkgs/isis3/data/base/dems/molaMarsPlanetaryRadius0004.cub
    Using dem cube file = molaMarsPlanetaryRadius0004.cub

  Testing input of dem file with keyword ElevationModel

Loading