Author: nick
Date: Sat Aug 1 20:07:03 2015
New Revision: 1693753
URL: http://svn.apache.org/r1693753
Log:
Move AbstractTikaConfigTest to Core, and use that to shorten TikaConfigTest
TIKA-1700
Added:
tika/trunk/tika-core/src/test/java/org/apache/tika/config/AbstractTikaConfigTest.java
- copied, changed from r1693710,
tika/trunk/tika-parsers/src/test/java/org/apache/tika/config/AbstractTikaConfigTest.java
Removed:
tika/trunk/tika-parsers/src/test/java/org/apache/tika/config/AbstractTikaConfigTest.java
Modified:
tika/trunk/tika-core/src/test/java/org/apache/tika/config/TikaConfigTest.java
Copied:
tika/trunk/tika-core/src/test/java/org/apache/tika/config/AbstractTikaConfigTest.java
(from r1693710,
tika/trunk/tika-parsers/src/test/java/org/apache/tika/config/AbstractTikaConfigTest.java)
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/test/java/org/apache/tika/config/AbstractTikaConfigTest.java?p2=tika/trunk/tika-core/src/test/java/org/apache/tika/config/AbstractTikaConfigTest.java&p1=tika/trunk/tika-parsers/src/test/java/org/apache/tika/config/AbstractTikaConfigTest.java&r1=1693710&r2=1693753&rev=1693753&view=diff
==============================================================================
---
tika/trunk/tika-parsers/src/test/java/org/apache/tika/config/AbstractTikaConfigTest.java
(original)
+++
tika/trunk/tika-core/src/test/java/org/apache/tika/config/AbstractTikaConfigTest.java
Sat Aug 1 20:07:03 2015
@@ -22,8 +22,9 @@ import org.apache.tika.parser.ParseConte
import org.junit.After;
/**
- * Parent of Junit test classes for {@link TikaConfig}, which cover
- * things that {@link TikaConfigTest} can't do due to a need for the
+ * Parent of Junit test classes for {@link TikaConfig}, including
+ * Tika Core based ones, and ones in Tika Parsers that do things
+ * that {@link TikaConfigTest} can't, do due to a need for the
* full set of "real" classes of parsers / detectors
*/
public abstract class AbstractTikaConfigTest {
Modified:
tika/trunk/tika-core/src/test/java/org/apache/tika/config/TikaConfigTest.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/test/java/org/apache/tika/config/TikaConfigTest.java?rev=1693753&r1=1693752&r2=1693753&view=diff
==============================================================================
---
tika/trunk/tika-core/src/test/java/org/apache/tika/config/TikaConfigTest.java
(original)
+++
tika/trunk/tika-core/src/test/java/org/apache/tika/config/TikaConfigTest.java
Sat Aug 1 20:07:03 2015
@@ -43,8 +43,7 @@ import static org.junit.Assert.fail;
* over in the Tika Parsers project, which do further Tika Config
* testing using real parsers and detectors.
*/
-public class TikaConfigTest {
-
+public class TikaConfigTest extends AbstractTikaConfigTest {
/**
* Make sure that a configuration file can't reference the
* {@link AutoDetectParser} class a <parser> configuration element.
@@ -53,15 +52,20 @@ public class TikaConfigTest {
*/
@Test
public void withInvalidParser() throws Exception {
- URL url = TikaConfigTest.class.getResource("TIKA-866-invalid.xml");
- System.setProperty("tika.config", url.toExternalForm());
try {
- new TikaConfig();
+ getConfig("TIKA-866-invalid.xml");
fail("AutoDetectParser allowed in a <parser> element");
- } catch (TikaException expected) {
- } finally {
- System.clearProperty("tika.config");
- }
+ } catch (TikaException expected) {}
+ }
+
+ /**
+ * Make sure that with a service loader given, we can
+ * get different configurable behaviour on parser classes
+ * which can't be found.
+ */
+ @Test
+ public void testUnknownParser() throws Exception {
+ // TODO
}
/**
@@ -73,14 +77,10 @@ public class TikaConfigTest {
*/
@Test
public void asCompositeParser() throws Exception {
- URL url = TikaConfigTest.class.getResource("TIKA-866-composite.xml");
- System.setProperty("tika.config", url.toExternalForm());
try {
- new TikaConfig();
+ getConfig("TIKA-866-composite.xml");
} catch (TikaException e) {
fail("Unexpected TikaException: " + e);
- } finally {
- System.clearProperty("tika.config");
}
}
@@ -92,14 +92,10 @@ public class TikaConfigTest {
*/
@Test
public void onlyValidParser() throws Exception {
- URL url = TikaConfigTest.class.getResource("TIKA-866-valid.xml");
- System.setProperty("tika.config", url.toExternalForm());
try {
- new TikaConfig();
+ getConfig("TIKA-866-valid.xml");
} catch (TikaException e) {
fail("Unexpected TikaException: " + e);
- } finally {
- System.clearProperty("tika.config");
}
}
@@ -149,10 +145,8 @@ public class TikaConfigTest {
*/
@Test
public void defaultParserWithExcludes() throws Exception {
- URL url =
TikaConfigTest.class.getResource("TIKA-1445-default-except.xml");
- System.setProperty("tika.config", url.toExternalForm());
try {
- TikaConfig config = new TikaConfig();
+ TikaConfig config = getConfig("TIKA-1445-default-except.xml");
CompositeParser cp = (CompositeParser)config.getParser();
List<Parser> parsers = cp.getAllComponentParsers();
@@ -180,8 +174,6 @@ public class TikaConfigTest {
assertEquals("fail/world",
p.getSupportedTypes(null).iterator().next().toString());
} catch (TikaException e) {
fail("Unexpected TikaException: " + e);
- } finally {
- System.clearProperty("tika.config");
}
}
@@ -191,10 +183,8 @@ public class TikaConfigTest {
*/
@Test
public void parserWithChildParsers() throws Exception {
- URL url = TikaConfigTest.class.getResource("TIKA-1653-norepeat.xml");
- System.setProperty("tika.config", url.toExternalForm());
try {
- TikaConfig config = new TikaConfig();
+ TikaConfig config = getConfig("TIKA-1653-norepeat.xml");
CompositeParser cp = (CompositeParser)config.getParser();
List<Parser> parsers = cp.getAllComponentParsers();
@@ -215,8 +205,6 @@ public class TikaConfigTest {
assertEquals("hello/world",
p.getSupportedTypes(null).iterator().next().toString());
} catch (TikaException e) {
fail("Unexpected TikaException: " + e);
- } finally {
- System.clearProperty("tika.config");
}
}
}
\ No newline at end of file
