Skip to content
Snippets Groups Projects
Unverified Commit 3bdcef86 authored by Stuart Sides's avatar Stuart Sides Committed by GitHub
Browse files

Updated unit tests to use data from ISISTESTDATA instead of ISISDATA (#4293) 

* Moved location of unitTest data file to ISISTESTDATA

* Moved unit test data to ISISTESTDATA/../testDataLocal

* fixed bad path

* fixed path to test files

* updated to use non mission dir data files
parent 0898712b
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 166 additions and 74 deletions
isis/src/base/apps/blend/tsts/default/Makefile
+ 3
− 1
View file @ 3bdcef86
......@@ -7,10 +7,12 @@ I02609002RDR.lev2.blend.cub.TOLERANCE = 0.001
include $(ISISROOT)/make/isismake.tsts
commands:
$(APPNAME) fromlist=$(INPUT)/fromlist.lis \
$(LS) $(INPUT)/*.cub > fromlist.lis;
$(APPNAME) fromlist=fromlist.lis \
tolist=$(INPUT)/tolist.lis \
stop=200 \
> /dev/null;
$(MV) I00824006RDR.lev2.blend.cub $(OUTPUT)/I00824006RDR.lev2.blend.cub;
$(MV) I01523019RDR.lev2.blend.cub $(OUTPUT)/I01523019RDR.lev2.blend.cub;
$(MV) I02609002RDR.lev2.blend.cub $(OUTPUT)/I02609002RDR.lev2.blend.cub;
$(RM) fromlist.lis;
isis/src/base/apps/blend/tsts/themis/Makefile
+ 1
− 1
View file @ 3bdcef86
......@@ -6,7 +6,7 @@ I23851018.blend.cub.TOLERANCE = .00001
include $(ISISROOT)/make/isismake.tsts
commands:
$(LS) -r $(INPUT)/*.cub > fromlist.lis
$(LS) -r $(INPUT)/*.cub > fromlist.lis;
$(APPNAME) fromlist=fromlist.lis \
tolist=$(INPUT)/tolist.lis \
stop=200 \
......
isis/src/base/apps/cubeit/tsts/badinputs/Makefile
+ 5
− 1
View file @ 3bdcef86
......@@ -7,8 +7,10 @@ include $(ISISROOT)/make/isismake.tsts
commands:
# TEST A: pass in a list of cubes with different sizes
echo -e "Different sized cubes:" > $(OUTPUT)/error_temp.txt;
$(LS) -r $(INPUT)/isisTruth.cub $(INPUT)/f319b18.cub >> $(OUTPUT)/tmp.lis;
$(CAT) $(OUTPUT)/tmp.lis | $(SED) 's/isisTruth.cub/isisTruth.cub+1/' > $(OUTPUT)/input.lis;
if [ `$(APPNAME) \
fromlist=$(INPUT)/input.lis \
fromlist=$(OUTPUT)/input.lis \
to=$(OUTPUT)/error.cub \
2>> $(OUTPUT)/error_temp.txt > /dev/null` ]; \
then true; \
......@@ -40,6 +42,8 @@ commands:
$(SED) 's+\[/.*/output/+\[output/+' $(OUTPUT)/error_temp3.txt > $(OUTPUT)/error.txt;
# Cleanup
$(RM) $(OUTPUT)/tmp.lis;
$(RM) $(OUTPUT)/input.lis;
$(RM) $(OUTPUT)/error_temp.txt;
$(RM) $(OUTPUT)/error_temp2.txt;
$(RM) $(OUTPUT)/error_temp3.txt;
......
isis/src/base/apps/cubeit/tsts/default/Makefile
+ 5
− 1
View file @ 3bdcef86
......@@ -3,5 +3,9 @@ APPNAME = cubeit
include $(ISISROOT)/make/isismake.tsts
commands:
$(APPNAME) fromlist=$(INPUT)/inputList.lis \
$(ECHO) $(INPUT)/isisTruth.cub+2 > $(OUTPUT)/inputList.lis;
$(ECHO) $(INPUT)/isisTruth.cub >> $(OUTPUT)/inputList.lis;
$(ECHO) $(INPUT)/isisTruth.cub+1 >> $(OUTPUT)/inputList.lis;
$(APPNAME) fromlist=$(OUTPUT)/inputList.lis \
to=$(OUTPUT)/cubeitTruth1.cub > /dev/null;
$(RM) $(OUTPUT)/inputList.lis;
isis/src/base/apps/equalizer/tsts/apply/Makefile
+ 7
− 2
View file @ 3bdcef86
......@@ -3,10 +3,15 @@ APPNAME = equalizer
include $(ISISROOT)/make/isismake.tsts
commands:
$(APPNAME) fromlist=$(INPUT)/FromList.lst \
$(LS) -r $(INPUT)/*.cub > $(OUTPUT)/Fromlist.lst;
$(CAT) $(INPUT)/instats.pvl | $(SED) "s|FileName = .*odyssey/testData/|FileName = $(INPUT)/|" > $(OUTPUT)/instats.pvl;
$(APPNAME) fromlist=$(OUTPUT)/FromList.lst \
tolist=$(INPUT)/ToList.lst \
instats=$(INPUT)/instats.pvl \
instats=$(OUTPUT)/instats.pvl \
process=apply \
> /dev/null;
$(MV) I00824006RDR.lev2.equ.cub $(OUTPUT)/equalizerTruth1.cub;
$(MV) I01523019RDR.lev2.equ.cub $(OUTPUT)/equalizerTruth2.cub;
$(RM) $(OUTPUT)/FromList.lst;
$(RM) $(OUTPUT)/instats.pvl;
isis/src/base/apps/equalizer/tsts/default/Makefile
+ 8
− 3
View file @ 3bdcef86
......@@ -3,11 +3,16 @@ APPNAME = equalizer
include $(ISISROOT)/make/isismake.tsts
commands:
$(APPNAME) fromlist=$(INPUT)/FromList.lst \
holdlist=$(INPUT)/HoldList.lst \
$(LS) $(INPUT)/*.cub > $(OUTPUT)/Fromlist.lst;
$(ECHO) $(INPUT)/I01523019RDR.lev2.cub > $(OUTPUT)/HoldList.lst;
$(APPNAME) fromlist=$(OUTPUT)/FromList.lst \
holdlist=$(OUTPUT)/HoldList.lst \
tolist=$(INPUT)/ToList.lst \
solvemethod=qrd \
> /dev/null;
$(MV) I00824006RDR.lev2.equ.cub $(OUTPUT)/equalizerTruth1.cub;
$(MV) I01523019RDR.lev2.equ.cub $(OUTPUT)/equalizerTruth2.cub;
$(MV) I02609002RDR.lev2.equ.cub $(OUTPUT)/equalizerTruth3.cub;
$(RM) $(OUTPUT)/FromList.lst;
$(RM) $(OUTPUT)/HoldList.lst;
isis/src/base/apps/equalizer/tsts/gain/Makefile
+ 7
− 2
View file @ 3bdcef86
......@@ -6,8 +6,10 @@ APPNAME = equalizer
include $(ISISROOT)/make/isismake.tsts
commands:
$(APPNAME) fromlist=$(INPUT)/FromList.lst \
holdlist=$(INPUT)/HoldList.lst \
$(LS) $(INPUT)/I0*.cub > $(OUTPUT)/Fromlist.lst;
$(ECHO) $(INPUT)/I01523019RDR.lev2.cub > $(OUTPUT)/HoldList.lst;
$(APPNAME) fromlist=$(OUTPUT)/FromList.lst \
holdlist=$(OUTPUT)/HoldList.lst \
tolist=$(INPUT)/ToList.lst \
solvemethod=qrd adjust=gain \
> /dev/null;
......@@ -22,3 +24,6 @@ commands:
$(APPNAME) fromlist=$(OUTPUT)/files.lis holdlist=$(OUTPUT)/hold.lis \
adjust=gain tolist=$(OUTPUT)/tolist.lis > /dev/null;
$(RM) $(OUTPUT)/files.lis $(OUTPUT)/hold.lis $(OUTPUT)/tolist.lis;
$(RM) $(OUTPUT)/FromList.lst;
$(RM) $(OUTPUT)/HoldList.lst;
isis/src/base/apps/equalizer/tsts/holdBothCalculateAndApply/Makefile
+ 17
− 10
View file @ 3bdcef86
......@@ -9,17 +9,24 @@ APPNAME = equalizer
include $(ISISROOT)/make/isismake.tsts
commands:
$(APPNAME) fromlist=$(INPUT)/FromList.lst \
holdlist=$(INPUT)/HoldList.lst \
$(LS) $(INPUT)/I0*.cub > $(OUTPUT)/Fromlist.lst;
$(ECHO) $(INPUT)/I01523019RDR.lev2.cub > $(OUTPUT)/HoldList.lst;
$(APPNAME) fromlist=$(OUTPUT)/FromList.lst \
holdlist=$(OUTPUT)/HoldList.lst \
tolist=$(INPUT)/ToList.lst \
solvemethod=qrd \
> /dev/null;
$(APPNAME) fromlist=$(INPUT)/FromList.lst \
holdlist=$(INPUT)/HoldList.lst \
$(APPNAME) fromlist=$(OUTPUT)/FromList.lst \
holdlist=$(OUTPUT)/HoldList.lst \
tolist=$(INPUT)/ToList.lst \
outstats=$(OUTPUT)/outstats.pvl \
outstats=$(OUTPUT)/outstatstmp.pvl \
solvemethod=qrd \
> /dev/null;
$(CAT) $(OUTPUT)/outstatstmp.pvl | $(SED) "s|FileName = .*/I0|FileName = I0|" > $(OUTPUT)/outstats.pvl;
$(RM) $(OUTPUT)/outstatstmp.pvl;
$(MV) I00824006RDR.lev2.equ.cub $(OUTPUT)/equalizerTruth1.cub;
$(MV) I01523019RDR.lev2.equ.cub $(OUTPUT)/equalizerTruth2.cub;
$(MV) I02609002RDR.lev2.equ.cub $(OUTPUT)/equalizerTruth3.cub;
$(RM) $(OUTPUT)/FromList.lst;
$(RM) $(OUTPUT)/HoldList.lst;
isis/src/base/apps/equalizer/tsts/holdCalculateStats/Makefile
+ 13
− 8
View file @ 3bdcef86
......@@ -7,23 +7,28 @@ APPNAME = equalizer
include $(ISISROOT)/make/isismake.tsts
commands:
$(APPNAME) fromlist=$(INPUT)/FromList.lst \
holdlist=$(INPUT)/HoldList.lst \
$(LS) $(INPUT)/I0*.cub > $(OUTPUT)/Fromlist.lst;
$(ECHO) $(INPUT)/I01523019RDR.lev2.cub > $(OUTPUT)/HoldList.lst;
$(APPNAME) fromlist=$(OUTPUT)/FromList.lst \
holdlist=$(OUTPUT)/HoldList.lst \
outstats=$(OUTPUT)/outstats_contrast.pvl \
process=calculate \
adjust=contrast \
solvemethod=qrd \
> /dev/null;
$(APPNAME) fromlist=$(INPUT)/FromList.lst \
holdlist=$(INPUT)/HoldList.lst \
$(APPNAME) fromlist=$(OUTPUT)/FromList.lst \
holdlist=$(OUTPUT)/HoldList.lst \
outstats=$(OUTPUT)/outstats_brightness.pvl \
process=calculate \
adjust=brightness \
solvemethod=qrd \
> /dev/null;
$(APPNAME) fromlist=$(INPUT)/FromList.lst \
holdlist=$(INPUT)/HoldList.lst \
$(APPNAME) fromlist=$(OUTPUT)/FromList.lst \
holdlist=$(OUTPUT)/HoldList.lst \
outstats=$(OUTPUT)/outstats_both.pvl \
process=calculate \
solvemethod=qrd \
> /dev/null;
$(RM) $(OUTPUT)/FromList.lst;
$(RM) $(OUTPUT)/HoldList.lst;
isis/src/base/apps/equalizer/tsts/noHoldApplyInputStats/Makefile
+ 7
− 3
View file @ 3bdcef86
......@@ -5,10 +5,14 @@ APPNAME = equalizer
include $(ISISROOT)/make/isismake.tsts
commands:
$(APPNAME) fromlist=$(INPUT)/FromList.lst \
$(LS) -r $(INPUT)/I0*.cub > $(OUTPUT)/Fromlist.lst;
$(CAT) $(INPUT)/instats.pvl | $(SED) "s|FileName = .*odyssey/testData/|FileName = $(INPUT)/|" > $(OUTPUT)/instats.pvl;
$(APPNAME) fromlist=$(OUTPUT)/FromList.lst \
tolist=$(INPUT)/ToList.lst \
instats=$(INPUT)/instats.pvl \
instats=$(OUTPUT)/instats.pvl \
process=apply \
> /dev/null;
$(MV) I00824006RDR.lev2.equ.cub $(OUTPUT)/equalizerTruth1.cub;
$(MV) I01523019RDR.lev2.equ.cub $(OUTPUT)/equalizerTruth2.cub;
$(RM) $(OUTPUT)/FromList.lst;
$(RM) $(OUTPUT)/instats.pvl;
isis/src/base/apps/equalizer/tsts/nonOverlapApplyFixedStats/Makefile
+ 11
− 3
View file @ 3bdcef86
......@@ -8,9 +8,17 @@ commands:
#$(LS) $(INPUT)/*cub > $(OUTPUT)/overlapping.lis;
#@$(SED) -e 's#$(INPUT)\(.*\)cub#$(OUTPUT)/\1\equ\.cub#g' $(OUTPUT)/overlapping.lis \
# > $(OUTPUT)/tolist.lis;
$(APPNAME) fromlist=$(INPUT)/fixed.lis \
$(LS) $(INPUT)/I10047011EDR.proj.reduced.cub > $(OUTPUT)/fixed.lis;
$(LS) $(INPUT)/I25685003EDR.crop.proj.reduced.cub >> $(OUTPUT)/fixed.lis;
$(LS) $(INPUT)/I51718010EDR.crop.proj.reduced.cub >> $(OUTPUT)/fixed.lis;
$(LS) $(INPUT)/I56969027EDR.proj.reduced.cub >> $(OUTPUT)/fixed.lis;
$(LS) $(INPUT)/I50695002EDR.proj.reduced.cub >> $(OUTPUT)/fixed.lis;
$(CAT) $(INPUT)/recalculatedStats.pvl | $(SED) "s|FileName = .*odyssey/testData/|FileName = $(INPUT)/|" > $(OUTPUT)/recalculatedStats.pvl;
$(APPNAME) fromlist=$(OUTPUT)/fixed.lis \
tolist=$(INPUT)/toList.lis \
instats=$(INPUT)/recalculatedStats.pvl \
instats=$(OUTPUT)/recalculatedStats.pvl \
process=apply \
> /dev/null;
$(MV) *cub $(OUTPUT);
$(RM) $(OUTPUT)/fixed.lis;
$(RM) $(OUTPUT)/recalculatedStats.pvl;
isis/src/base/apps/equalizer/tsts/nonOverlapRecalculate/Makefile
+ 25
− 6
View file @ 3bdcef86
......@@ -19,8 +19,12 @@ include $(ISISROOT)/make/isismake.tsts
commands:
# Handle the exception: "There are input images that do not overlap..."
$(LS) $(INPUT)/I10047011EDR.proj.reduced.cub > $(OUTPUT)/nonOverlap.lis;
$(LS) $(INPUT)/I25685003EDR.crop.proj.reduced.cub >> $(OUTPUT)/nonOverlap.lis;
$(LS) $(INPUT)/I51718010EDR.crop.proj.reduced.cub >> $(OUTPUT)/nonOverlap.lis;
$(LS) $(INPUT)/I56969027EDR.proj.reduced.cub >> $(OUTPUT)/nonOverlap.lis;
if [[ `$(APPNAME) \
fromlist=$(INPUT)/nonOverlap.lis \
fromlist=$(OUTPUT)/nonOverlap.lis \
outstats=$(OUTPUT)/nonOverlapStats.pvl \
process=CALCULATE \
2>> $(OUTPUT)/nonOverlapError.txt \
......@@ -29,14 +33,29 @@ commands:
true; \
fi;
# A)
$(APPNAME) fromlist=$(INPUT)/fixed.lis \
$(LS) $(INPUT)/I10047011EDR.proj.reduced.cub > $(OUTPUT)/fixed.lis;
$(LS) $(INPUT)/I25685003EDR.crop.proj.reduced.cub >> $(OUTPUT)/fixed.lis;
$(LS) $(INPUT)/I51718010EDR.crop.proj.reduced.cub >> $(OUTPUT)/fixed.lis;
$(LS) $(INPUT)/I56969027EDR.proj.reduced.cub >> $(OUTPUT)/fixed.lis;
$(LS) $(INPUT)/I50695002EDR.proj.reduced.cub >> $(OUTPUT)/fixed.lis;
# $(CAT) $(INPUT)/nonOverlapStats.pvl | $(SED) "s|FileName = .*odyssey/testData/|FileName = $(INPUT)/|" > $(OUTPUT)/nonOverlapStats.pvl;
$(APPNAME) fromlist=$(OUTPUT)/fixed.lis \
instats=$(OUTPUT)/nonOverlapStats.pvl \
outstats=$(OUTPUT)/recalculatedStats.pvl \
process=RECALCULATE \
> /dev/null;
# B)
$(APPNAME) fromlist=$(INPUT)/fixedDiffOrder.lis \
$(LS) $(INPUT)/I25685003EDR.crop.proj.reduced.cub > $(OUTPUT)/fixedDiffOrder.lis;
$(LS) $(INPUT)/I50695002EDR.proj.reduced.cub >> $(OUTPUT)/fixedDiffOrder.lis;
$(LS) $(INPUT)/I56969027EDR.proj.reduced.cub >> $(OUTPUT)/fixedDiffOrder.lis;
$(LS) $(INPUT)/I51718010EDR.crop.proj.reduced.cub >> $(OUTPUT)/fixedDiffOrder.lis;
$(LS) $(INPUT)/I10047011EDR.proj.reduced.cub >> $(OUTPUT)/fixedDiffOrder.lis;
$(APPNAME) fromlist=$(OUTPUT)/fixedDiffOrder.lis \
instats=$(OUTPUT)/nonOverlapStats.pvl \
outstats=$(OUTPUT)/recalculatedStatsDiffOrder.pvl \
process=RECALCULATE \
> /dev/null;
$(RM) $(OUTPUT)/fixed.lis;
$(RM) $(OUTPUT)/nonOverlap.lis;
$(RM) $(OUTPUT)/fixedDiffOrder.lis;
isis/src/base/apps/equalizer/tsts/nonOverlapRetryBoth/Makefile
+ 14
− 2
View file @ 3bdcef86
......@@ -13,8 +13,12 @@ include $(ISISROOT)/make/isismake.tsts
commands:
# Handle the exception: "There are input images that do not overlap..."
$(LS) $(INPUT)/I10047011EDR.proj.reduced.cub > $(OUTPUT)/nonOverlap.lis;
$(LS) $(INPUT)/I25685003EDR.crop.proj.reduced.cub >> $(OUTPUT)/nonOverlap.lis;
$(LS) $(INPUT)/I51718010EDR.crop.proj.reduced.cub >> $(OUTPUT)/nonOverlap.lis;
$(LS) $(INPUT)/I56969027EDR.proj.reduced.cub >> $(OUTPUT)/nonOverlap.lis;
if [[ `$(APPNAME) \
fromlist=$(INPUT)/nonOverlap.lis \
fromlist=$(OUTPUT)/nonOverlap.lis \
outstats=$(OUTPUT)/nonOverlapStats.pvl \
process=CALCULATE \
2>> $(OUTPUT)/nonOverlapError.txt \
......@@ -22,10 +26,18 @@ commands:
then \
true; \
fi
$(APPNAME) fromlist=$(INPUT)/fixed.lis \
$(LS) $(INPUT)/I10047011EDR.proj.reduced.cub > $(OUTPUT)/fixed.lis;
$(LS) $(INPUT)/I25685003EDR.crop.proj.reduced.cub >> $(OUTPUT)/fixed.lis;
$(LS) $(INPUT)/I51718010EDR.crop.proj.reduced.cub >> $(OUTPUT)/fixed.lis;
$(LS) $(INPUT)/I56969027EDR.proj.reduced.cub >> $(OUTPUT)/fixed.lis;
$(LS) $(INPUT)/I50695002EDR.proj.reduced.cub >> $(OUTPUT)/fixed.lis;
$(APPNAME) fromlist=$(OUTPUT)/fixed.lis \
tolist=$(INPUT)/toList.lis \
instats=$(OUTPUT)/nonOverlapStats.pvl \
outstats=$(OUTPUT)/recalculatedStats.pvl \
process=RETRYBOTH \
> /dev/null;
$(MV) *.cub $(OUTPUT);
$(RM) $(OUTPUT)/fixed.lis;
$(RM) $(OUTPUT)/nonOverlap.lis;
isis/src/base/apps/fx/tsts/filelistattributes/Makefile
+ 4
− 1
View file @ 3bdcef86
......@@ -3,7 +3,10 @@ APPNAME = fx
include $(ISISROOT)/make/isismake.tsts
commands:
$(APPNAME) fromlist=$(INPUT)/vims.lis \
$(ECHO) $(INPUT)/vims1+1 > $(OUTPUT)/vims.lis;
$(ECHO) $(INPUT)/vims2+100 >> $(OUTPUT)/vims.lis;
$(APPNAME) fromlist=$(OUTPUT)/vims.lis \
mode=list \
equation=f1*f2 \
to=$(OUTPUT)/f1Multf2.cub > /dev/null;
$(RM) $(OUTPUT)/vims.lis
isis/src/base/apps/makeflat/tsts/framing/Makefile
+ 4
− 1
View file @ 3bdcef86
......@@ -3,6 +3,9 @@ APPNAME = makeflat
include $(ISISROOT)/make/isismake.tsts
commands:
$(APPNAME) fromlist=$(INPUT)/fromList.lis \
$(ECHO) $(INPUT)/ctx_pmoi_i_00003.bottom.cub > $(OUTPUT)/fromList.lis;
$(ECHO) $(INPUT)/ctx_pmoi_i_00003.top.cub >> $(OUTPUT)/fromList.lis;
$(APPNAME) fromlist=$(OUTPUT)/fromList.lis \
to=$(OUTPUT)/framingFlatTruth.cub STDEV=190 \
IMAGETYPE=FRAMING EXCLUDE=$(OUTPUT)/framingFlatTruth.txt> /dev/null;
$(RM) $(OUTPUT)/fromList.lis
isis/src/base/apps/makeflat/tsts/linescan/Makefile
+ 4
− 1
View file @ 3bdcef86
......@@ -5,7 +5,10 @@ linescanFlatTruth.cub.TOLERANCE = 0.0000002
include $(ISISROOT)/make/isismake.tsts
commands:
$(APPNAME) fromlist=$(INPUT)/fromList.lis \
$(ECHO) $(INPUT)/ctx_pmoi_i_00003.bottom.cub > $(OUTPUT)/fromList.lis;
$(ECHO) $(INPUT)/ctx_pmoi_i_00003.top.cub >> $(OUTPUT)/fromList.lis;
$(APPNAME) fromlist=$(OUTPUT)/fromList.lis \
to=$(OUTPUT)/linescanFlatTruth.cub STDEV=190 \
IMAGETYPE=LINESCAN NUMLINES=10 \
EXCLUDE=$(OUTPUT)/linescanFlatTruth.txt > /dev/null;
$(RM) $(OUTPUT)/fromList.lis
isis/src/base/apps/makeflat/tsts/pushframe/Makefile
+ 5
− 2
View file @ 3bdcef86
......@@ -3,7 +3,10 @@ APPNAME = makeflat
include $(ISISROOT)/make/isismake.tsts
commands:
$(APPNAME) fromlist=$(INPUT)/fromList.lis \
$(ECHO) $(INPUT)/ctx_pmoi_i_00003.bottom.cub > $(OUTPUT)/fromList.lis;
$(ECHO) $(INPUT)/ctx_pmoi_i_00003.top.cub >> $(OUTPUT)/fromList.lis;
$(APPNAME) fromlist=$(OUTPUT)/fromList.lis \
to=$(OUTPUT)/pushFrameFlatTruth.cub STDEV=150 \
IMAGETYPE=PUSHFRAME FRAMELETHEIGHT=50 EXCLUDE=$(OUTPUT)/pushFrame.txt \
IMAGETYPE=PUSHFRAME FRAMELETHEIGHT=50 EXCLUDE=$(OUTPUT)/pushFrame.pvl \
> /dev/null;
$(RM) $(OUTPUT)/fromList.lis
isis/src/base/objs/RollingShutterCamera/unitTest.cpp
+ 2
− 2
View file @ 3bdcef86
......@@ -73,7 +73,7 @@ int main() {
//NOTE: The following cube is not from a framing camera. The test returns
//true for framing camera type since MyCamera is a child class of FramingCamera
try {
Cube cube("$clipper/testData/simulated_clipper_eis_nac_rolling_shutter.cub", "r");
Cube cube("$ISISTESTDATA/isis/src/base/unitTestData/simulated_clipper_eis_nac_rolling_shutter.cub", "r");
TestRollingShutterCamera cam(cube);
// test camera type
......
isis/src/clipper/objs/ClipperWacFcCamera/unitTest.cpp
+ 3
− 3
View file @ 3bdcef86
......@@ -62,7 +62,7 @@ int main(void) {
double knownLon = 0;
qDebug() << "Testing with test image...";
Cube c("$clipper/testData/simulated_clipper_eis_wac_rolling_shutter.cub", "r");
Cube c("$ISISTESTDATA/isis/src/clipper/unitTestData/simulated_clipper_eis_wac_rolling_shutter.cub", "r");
ClipperWacFcCamera *cam = (ClipperWacFcCamera *) CameraFactory::Create(c);
qDebug() << "FileName: " << FileName(c.fileName()).name();
qDebug() << "CK Frame: " << cam->instrumentRotation()->Frame();
......
isis/src/osirisrex/objs/OsirisRexOcamsCamera/unitTest.cpp
+ 21
− 21
View file @ 3bdcef86
......@@ -59,14 +59,14 @@ int main(void) {
try {
cout << "\nTesting PolyCam (backwards compatibility)..." << endl;
Cube polyCamCube("$osirisrex/testData/2019-01-13T23_36_05.000_PCAM_L2b_V001.cub", "r");
Cube polyCamCube("$ISISTESTDATA/isis/src/osirisrex/unitTestData/2019-01-13T23_36_05.000_PCAM_L2b_V001.cub", "r");
double knownLat = 13.9465663689936950;
double knownLon = 349.0213035062322433;
double sample = 512.0;
double line = 512.0;
testCamera(polyCamCube, sample, line, knownLat, knownLon);
cout << "\nTesting PolyCam (with PolyCamFocusPositionNaifId keyword)..." << endl;
Cube polyCamCube2("$osirisrex/testData/20190113T191852S740_pol_iofL2pan_V001.cub", "r");
Cube polyCamCube2("$ISISTESTDATA/isis/src/osirisrex/unitTestData/20190113T191852S740_pol_iofL2pan_V001.cub", "r");
knownLat = -5.5191879351483450;
knownLon = 349.6939492565607566;
sample = 512.0;
......@@ -75,14 +75,14 @@ int main(void) {
cout << "============================================================================" << endl;
cout << "\nTesting MapCam (backwards compatibility)..." << endl;
Cube mapCamCube("$osirisrex/testData/D19030320000.cub", "r");
Cube mapCamCube("$ISISTESTDATA/isis/src/osirisrex/unitTestData/D19030320000.cub", "r");
knownLat = 73.9976065262802933;
knownLon = 149.3814386120742768;
sample = 512.0;
line = 512.0;
testCamera(mapCamCube, sample, line, knownLat, knownLon);
cout << "\nTesting MapCam (with PolyCamFocusPositionNaifId keyword)..." << endl;
Cube mapCamCube2("$osirisrex/testData/20190303T100344S990_map_iofL2pan_V001.cub", "r");
Cube mapCamCube2("$ISISTESTDATA/isis/src/osirisrex/unitTestData/20190303T100344S990_map_iofL2pan_V001.cub", "r");
knownLat = -19.2946930665326732;
knownLon = 145.9510736765638512;
sample = 512.0;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment