Rearrange data files for tests

Author: mbtaylor

.gitignore

@@ -6,4 +6,4 @@ cdfdump.html
 tmp/
 javadocs/
 .*.swp
-data/*.cdf
+data/local/*.cdf

data/CDFLeapSeconds.txt

@@ -0,0 +1,46 @@
+; Source: <http://maia.usno.navy.mil/ser7/tai-utc.dat>
+; Updated: 20120401
+; Leap Seconds Table - used by CDF
+; Update it when a leap second(s) is added.
+; Comment lines starts with ";" at column 1.
+; Year Month Day Leap Seconds      Drift
+  1960   1    1    1.4178180  37300.0  0.001296
+  1961   1    1    1.4228180  37300.0  0.001296
+  1961   8    1    1.3728180  37300.0  0.001296
+  1962   1    1    1.8458580  37665.0  0.0011232
+  1963  11    1    1.9458580  37665.0  0.0011232
+  1964   1    1    3.2401300  38761.0  0.001296
+  1964   4    1    3.3401300  38761.0  0.001296
+  1964   9    1    3.4401300  38761.0  0.001296
+  1965   1    1    3.5401300  38761.0  0.001296
+  1965   3    1    3.6401300  38761.0  0.001296
+  1965   7    1    3.7401300  38761.0  0.001296
+  1965   9    1    3.8401300  38761.0  0.001296
+  1966   1    1    4.3131700  39126.0  0.002592
+  1968   2    1    4.2131700  39126.0  0.002592
+  1972   1    1   10.0            0.0  0.0
+  1972   7    1   11.0            0.0  0.0
+  1973   1    1   12.0            0.0  0.0
+  1974   1    1   13.0            0.0  0.0
+  1975   1    1   14.0            0.0  0.0
+  1976   1    1   15.0            0.0  0.0
+  1977   1    1   16.0            0.0  0.0
+  1978   1    1   17.0            0.0  0.0
+  1979   1    1   18.0            0.0  0.0
+  1980   1    1   19.0            0.0  0.0
+  1981   7    1   20.0            0.0  0.0
+  1982   7    1   21.0            0.0  0.0
+  1983   7    1   22.0            0.0  0.0
+  1985   7    1   23.0            0.0  0.0
+  1988   1    1   24.0            0.0  0.0
+  1990   1    1   25.0            0.0  0.0
+  1991   1    1   26.0            0.0  0.0
+  1992   7    1   27.0            0.0  0.0
+  1993   7    1   28.0            0.0  0.0
+  1994   7    1   29.0            0.0  0.0
+  1996   1    1   30.0            0.0  0.0
+  1997   7    1   31.0            0.0  0.0
+  1999   1    1   32.0            0.0  0.0
+  2006   1    1   33.0            0.0  0.0
+  2009   1    1   34.0            0.0  0.0
+  2012   7    1   35.0            0.0  0.0

data/test_badleap.cdf

@@ -11,7 +11,9 @@ WWW_FILES = $(JARFILE) javadocs index.html cdflist.html cdfdump.html
 WWW_DIR = /homeb/mbt/public_html/jcdf
 
 TEST_JARFILE = jcdf_test.jar
-TEST_CDFS = data/*.cdf
+TEST_CDFS = data/example1.cdf data/example2.cdf data/test.cdf data/local/*.cdf
+TEST_BADLEAP = data/test_badleap.cdf
+LEAPSECONDS = data/CDFLeapSeconds.txt
 CDFLIBDIR = /mbt/local/lib
 CDFJARDIR = /mbt/local/jars
 
@@ -110,9 +112,9 @@ updatewww: $(WWW_DIR)/index.html
 $(WWW_DIR)/index.html: index.html
 	cp index.html $@
 
-test: extest othertest convtest
+test: extest othertest badleaptest convtest
 
-convtest: $(JARFILE) $(TEST_JARFILE) $(TEST_CDFS)
+convtest: $(JARFILE) $(TEST_JARFILE)
 	rm -rf tmp; \
 	mkdir tmp; \
 	for f in $(TEST_CDFS); \
@@ -132,11 +134,29 @@ extest: $(JARFILE) $(TEST_JARFILE)
              data/example1.cdf data/example2.cdf data/test.cdf
 
 othertest: $(JARFILE) $(TEST_JARFILE)
+	# There is an error in the NASA java implementation at v3.6.0.3:
+	# it doesn't have the 2015 leap year in it, which means this test
+	# would fail.  So import the updated leap seconds table with the
+	# environment variable so it works.  When the NASA lib is fixed
+	# this can be removed.
 	env LD_LIBRARY_PATH=$(CDFLIBDIR) \
+            CDF_LEAPSECONDSTABLE=$(LEAPSECONDS) \
 	java -ea \
              -classpath $(JARFILE):$(TEST_JARFILE):$(CDFJARDIR)/cdfjava.jar \
              uk.ac.bristol.star.cdf.test.OtherTest
 
+badleaptest: $(JARFILE) data/test_badleap.cdf
+	# This one should run OK
+	java -classpath $(JARFILE) uk.ac.bristol.star.cdf.util.CdfDump \
+             $(TEST_BADLEAP) >/dev/null
+	# but this one should report that the file's leap seconds table
+	# is out of date and exit with a RuntimeException
+	if java -classpath $(JARFILE) \
+                uk.ac.bristol.star.cdf.util.CdfList -data \
+                $(TEST_BADLEAP) >/dev/null 2>&1; then \
+            should_have_failed; \
+        fi
+
 clean:
 	rm -rf $(JARFILE) $(TEST_JARFILE) tmp \
                index.html javadocs cdflist.html cdfdump.html