Commit 6f8e1d5c authored by Andrew Stebenne's avatar Andrew Stebenne
Browse files

PROG: Update the unitTest for Pipeline, which previously depended on an error... 

PROG: Update the unitTest for Pipeline, which previously depended on an error in mask which was fixed in rev. 6194. Reference Redmine #898

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

isis/src/base/objs/Pipeline/Pipeline.truth

+14 −11
Original line number Diff line number Diff line
@@ -453,24 +453,27 @@ PIPELINE -------> unitTest5 <------- PIPELINE 
*** Continue option ***

input=$ISIS3DATA/odyssey/testData/I00831002RDR.cub

PIPELINE -------> unitTest6 <------- PIPELINE

mask FROM="$ISIS3DATA/mro/testData/PSP_001446_1790_BG12_0.cub" TO="./out.mask.cub" MINIMUM="-3.40282245226481e+38" MAXIMUM="3.40282346638529e+38" PRESERVE="INSIDE" SPIXELS="NONE"

lowpass FROM="./out.mask.cub" TO="./out.cub" SAMPLES="3" LINES="3"

rm ./out.mask.cub

noisefilter FROM="$ISIS3DATA/mro/testData/PSP_001446_1790_BG12_0.cub" TO="./out.cub" SAMPLES="0" LINES="0"

lowpass FROM="$ISIS3DATA/mro/testData/PSP_001446_1790_BG12_0.cub" TO="./out.cub" SAMPLES="3" LINES="3"

PIPELINE -------> unitTest6 <------- PIPELINE



unittest: unitTest6

**ERROR** Running Isis program [mask] failed with return status [2].

**USER ERROR** No mask was performed-the output file is the same as the input file.

0% Processedunittest: Running noisefilter

0% Processed**ERROR** Running Isis program [noisefilter] failed with return status [2].

**USER ERROR** Parameter [SAMPLES] must be greater than or equal to [1].

Continuing ......

unittest: Running lowpass



0% Processed

*** Application level continue option ***

PIPELINE -------> unitTest7 <------- PIPELINE

mask FROM="$ISIS3DATA/mro/testData/PSP_001446_1790_BG12_0.cub" TO="./out.mask1.cub" MINIMUM="-3.40282245226481e+38" MAXIMUM="3.40282346638529e+38" PRESERVE="INSIDE" SPIXELS="NONE"

lowpass FROM="./out.mask1.cub" TO="./out.cub" SAMPLES="3" LINES="3"

rm ./out.mask1.cub

noisefilter FROM="$ISIS3DATA/mro/testData/PSP_001446_1790_BG12_0.cub" TO="./out.cub" SAMPLES="0" LINES="0"

lowpass FROM="$ISIS3DATA/mro/testData/PSP_001446_1790_BG12_0.cub" TO="./out.cub" SAMPLES="3" LINES="3"

PIPELINE -------> unitTest7 <------- PIPELINE



unittest: unitTest7

**ERROR** Running Isis program [mask] failed with return status [2].

**USER ERROR** No mask was performed-the output file is the same as the input file.

0% Processedunittest: Running noisefilter

0% Processed**ERROR** Running Isis program [noisefilter] failed with return status [2].

**USER ERROR** Parameter [SAMPLES] must be greater than or equal to [1].

Continuing ......

unittest: Running lowpass

0% Processed
 
 No newline at end of file

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

+15 −18
Original line number Diff line number Diff line
@@ -341,14 +341,12 @@ void PipeContinue(void) 
  pc1.SetContinue(true);

  pc1.KeepTemporaryFiles(false);

  

  pc1.AddToPipeline("mask");

  //p.Application("mask").SetContinue(true);

  pc1.Application("mask").SetInputParameter("FROM",     false);

  pc1.Application("mask").SetOutputParameter("TO",      "mask");

  pc1.Application("mask").AddConstParameter("MINIMUM",  toString(VALID_MIN4));

  pc1.Application("mask").AddConstParameter("MAXIMUM",  toString(VALID_MAX4));

  pc1.Application("mask").AddConstParameter("PRESERVE", "INSIDE");

  pc1.Application("mask").AddConstParameter("SPIXELS",  "NONE");

  pc1.AddToPipeline("noisefilter");

  // Intentionally broken parameters

  pc1.Application("noisefilter").SetInputParameter("FROM",     false);

  pc1.Application("noisefilter").SetOutputParameter("TO",      "");

  pc1.Application("noisefilter").AddConstParameter("SAMPLES",  "0");

  pc1.Application("noisefilter").AddConstParameter("LINES",    "0");

  

  pc1.AddToPipeline("lowpass");

  pc1.Application("lowpass").SetInputParameter ("FROM", false);
@@ -356,7 +354,7 @@ void PipeContinue(void) 
  pc1.Application("lowpass").AddConstParameter ("SAMPLES", "3");

  pc1.Application("lowpass").AddConstParameter ("LINES", "3");

  

  cout << pc1;

  cout << pc1 << endl;

  

  pc1.Run();
@@ -368,14 +366,13 @@ void PipeContinue(void) 
  pc2.SetOutputFile("TO");

  pc2.KeepTemporaryFiles(false);



  pc2.AddToPipeline("mask", "mask1");

  pc2.Application("mask1").SetContinue(true);

  pc2.Application("mask1").SetInputParameter("FROM",     false);

  pc2.Application("mask1").SetOutputParameter("TO",      "mask1");

  pc2.Application("mask1").AddConstParameter("MINIMUM",  toString(VALID_MIN4));

  pc2.Application("mask1").AddConstParameter("MAXIMUM",  toString(VALID_MAX4));

  pc2.Application("mask1").AddConstParameter("PRESERVE", "INSIDE");

  pc2.Application("mask1").AddConstParameter("SPIXELS",  "NONE");

  pc2.AddToPipeline("noisefilter", "nf1");

  pc2.Application("nf1").SetContinue(true);

  // Intentionally broken parameters

  pc2.Application("nf1").SetInputParameter("FROM",     false);

  pc2.Application("nf1").SetOutputParameter("TO",      "");

  pc2.Application("nf1").AddConstParameter("SAMPLES",  "0");

  pc2.Application("nf1").AddConstParameter("LINES",    "0");

  

  pc2.AddToPipeline("lowpass", "lpf1");

  pc2.Application("lpf1").SetInputParameter ("FROM", false);
@@ -383,7 +380,7 @@ void PipeContinue(void) 
  pc2.Application("lpf1").AddConstParameter ("SAMPLES", "3");

  pc2.Application("lpf1").AddConstParameter ("LINES", "3");

  

  cout << pc2;

  cout << pc2 << endl;

  

  pc2.Run();

  remove("./out.cub");