Unverified Commit 8f638460 authored by Kaitlyn Lee's avatar Kaitlyn Lee Committed by GitHub
Browse files

Added campt tests and removed old Makefile tests (#3687) 

* Abstracted campt app.

* Revert "Merge branch 'campt' of https://github.com/kaitlyndlee/ISIS3

 into dev"

This reverts commit 521dd44a6831b488052aa0e21e65ca3c5f40f7f1, reversing
changes made to 2874acf6.

* Added more tests.

* Removed old Makfile tests.

* Updated CAMPT_XML to APP_XML.

* adds CoordList and AllowOutside test cases

Co-authored-by: default avatarpaarongiroux <47163875+paarongiroux@users.noreply.github.com>
parent af638552

isis/src/base/apps/campt/tsts/Makefile

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
BLANKS = "%-6s"    

LENGTH = "%-40s"



include $(ISISROOT)/make/isismake.tststree

isis/src/base/apps/campt/tsts/default/Makefile

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
APPNAME = campt



include $(ISISROOT)/make/isismake.tsts



commands:

	cp $(INPUT)/output.txt $(OUTPUT)/camptTruth1.pvl;

	$(APPNAME) \

	from=$(INPUT)/ab102401.cub \

	to=$(OUTPUT)/camptTruth1.pvl \

	> /dev/null;

isis/src/base/apps/campt/tsts/errors/Makefile

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
# test for exceptions thrown

# the coordinate list is invalid if number of rows and columns don't match

# the coordinate list is invalid if there are not 2 columns

# no output file is provided when specifying the FORMAT as FLAT

APPNAME = campt



include $(ISISROOT)/make/isismake.tsts



commands:

	-$(APPNAME) from=$(INPUT)/ab102401.cub \

	to=$(OUTPUT)/output.pvl \

	coordlist=$(INPUT)/badlist.csv \

	coordtype=IMAGE 2> $(OUTPUT)/errorsTruth.txt > /dev/null;

	-$(APPNAME) from=$(INPUT)/ab102401.cub \

	to=$(OUTPUT)/output.pvl \

	coordlist=$(INPUT)/badcolumns.csv \

	coordtype=IMAGE 2>> $(OUTPUT)/errorsTruth.txt > /dev/null;

	-$(APPNAME) from=$(INPUT)/ab102401.cub \

	format=FLAT 2>> $(OUTPUT)/errorsTruth.txt > /dev/null;

isis/src/base/apps/campt/tsts/flat/Makefile

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
APPNAME = campt



include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) from= $(INPUT)/ab102401.cub \

	to=$(OUTPUT)/camptTruthTemp.txt \

	format=FLAT \

	type=ground \

	latitude=34.444196777709 \

	longitude=223.84999971295 > /dev/null;

	cut -d , -f 2- $(OUTPUT)/camptTruthTemp.txt >& $(OUTPUT)/camptTruth2.txt;

	rm $(OUTPUT)/camptTruthTemp.txt;

	cat $(OUTPUT)/camptTruth2.txt | \

	sed 's/\([0-9]*\.[0-9]\{7\}\)[0-9]*/\1/g' \

	> $(OUTPUT)/camptTruth3.txt;

	$(MV) $(OUTPUT)/camptTruth3.txt $(OUTPUT)/camptTruth2.txt;

isis/src/base/apps/campt/tsts/no_sample_line/Makefile

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
# test for not providing a sample or line value (defaults to center)

# also tests for not providing a value to the TO parameter

APPNAME = campt



include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) from=$(INPUT)/ab102401.cub \

	> $(OUTPUT)/noSampleLineTruth.txt;

	cat $(OUTPUT)/noSampleLineTruth.txt | \

	$(SED) 's/\([0-9]*\.[0-9]\{5\}\)[0-9]*/\1/g' | \

	$(SED) '/Filename.*/ { N; N; N; N; s/-\n[ ]*//g; }' | \

	$(SED) 's/\(.*= \).*\(ab102401.cub\)/\1\2/' \

	>& $(OUTPUT)/noSampleLineTruthtmp.txt;

	$(MV) $(OUTPUT)/noSampleLineTruthtmp.txt \

	$(OUTPUT)/noSampleLineTruth.txt;