Commit 23f993ea authored by acpaquette's avatar acpaquette Committed by Kristin
Browse files

Pipeline Test Update (#3321) 

* Updated pipeline to use TestPreferences where necessary

* Updated pipeline truth data

* Made preference parameter position consistant

* Updated pipeline truth data again
parent 88b1bd31

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

+2 −6
Original line number Diff line number Diff line
@@ -454,23 +454,19 @@ PIPELINE -------> unitTest5 <------- PIPELINE 
input=$ISIS3DATA/odyssey/testData/I00831002RDR.cub

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

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"

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

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



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

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

Continuing ......

unittest: Working

0% Processed
10% Processed
20% Processed
30% Processed
40% Processed
50% Processed
60% Processed
70% Processed
80% Processed
90% Processed
100% Processed



*** Application level continue option ***

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

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"

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

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



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

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

Continuing ......
 
unittest: Working

0% Processed
10% Processed
20% Processed
30% Processed
40% Processed
50% Processed
60% Processed
70% Processed
80% Processed
90% Processed
100% Processed

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

+25 −24
Original line number Diff line number Diff line
@@ -356,12 +356,12 @@ void PipeContinue(void) 
  pc1.Application("lowpass").SetOutputParameter("TO", "lowpass");

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

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

  pc1.Application("lowpass").AddConstParameter("-PREFERENCE", "$ISISROOT/TestPreferences");



  cerr << pc1 << endl;



  pc1.Run();





  cerr << "\n*** Application level continue option ***\n";

  Pipeline pc2("unitTest7");
@@ -382,6 +382,7 @@ void PipeContinue(void) 
  pc2.Application("lpf1").SetOutputParameter("TO", "lpf1");

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

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

  pc2.Application("lpf1").AddConstParameter("-PREFERENCE", "$ISISROOT/TestPreferences");



  cerr << pc2 << endl;