Author: tpalsulich
Date: Wed Dec 24 08:07:28 2014
New Revision: 1647742
URL: http://svn.apache.org/r1647742
Log:
TIKA-1503. Don't run the GDAL FITS test if FITS files aren't supported by the
installed version of gdalinfo.
Modified:
tika/trunk/CHANGES.txt
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/gdal/TestGDALParser.java
Modified: tika/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/tika/trunk/CHANGES.txt?rev=1647742&r1=1647741&r2=1647742&view=diff
==============================================================================
--- tika/trunk/CHANGES.txt (original)
+++ tika/trunk/CHANGES.txt Wed Dec 24 08:07:28 2014
@@ -34,7 +34,8 @@ Release 1.7 - Current Development
of RecursiveParserWrapper (TIKA-1451).
* Tika now integrates the Geospatial Data Abstraction Library
- (GDAL) for parsing hundreds of geospatial formats (TIKA-605).
+ (GDAL) for parsing hundreds of geospatial formats (TIKA-605,
+ TIKA-1503).
* ExternalParsers can now use Regexs to specify dynamic keys
(TIKA-1441).
Modified:
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/gdal/TestGDALParser.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/gdal/TestGDALParser.java?rev=1647742&r1=1647741&r2=1647742&view=diff
==============================================================================
---
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/gdal/TestGDALParser.java
(original)
+++
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/gdal/TestGDALParser.java
Wed Dec 24 08:07:28 2014
@@ -135,7 +135,13 @@ public class TestGDALParser extends Tika
@Test
public void testParseFITS() {
+ String fitsFilename = "/test-documents/WFPC2u5780205r_c0fx.fits";
+
assumeTrue(canRun());
+ // If the exit code is 1 (meaning FITS isn't supported by the
installed version of gdalinfo, don't run this test.
+ String[] fitsCommand = { "gdalinfo",
TestGDALParser.class.getResource(fitsFilename).getPath() };
+ assumeTrue(ExternalParser.check(fitsCommand, 1));
+
String expectedAllgMin = "-7.319537E1";
String expectedAtodcorr = "COMPLETE";
String expectedAtodfile = "uref$dbu1405iu.r1h";
@@ -144,7 +150,7 @@ public class TestGDALParser extends Tika
GDALParser parser = new GDALParser();
InputStream stream = TestGDALParser.class
-
.getResourceAsStream("/test-documents/WFPC2u5780205r_c0fx.fits");
+ .getResourceAsStream(fitsFilename);
Metadata met = new Metadata();
BodyContentHandler handler = new BodyContentHandler();
try {
