Author: tallison
Date: Fri Jul 24 18:22:47 2015
New Revision: 1692564
URL: http://svn.apache.org/r1692564
Log:
TIKA-1689: revert mistakenly flipped sort order of parsers from r1677328
Added:
tika/trunk/tika-parsers/src/test/java/org/apache/tika/utils/
tika/trunk/tika-parsers/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
Modified:
tika/trunk/tika-core/src/main/java/org/apache/tika/utils/ServiceLoaderUtils.java
Modified:
tika/trunk/tika-core/src/main/java/org/apache/tika/utils/ServiceLoaderUtils.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/utils/ServiceLoaderUtils.java?rev=1692564&r1=1692563&r2=1692564&view=diff
==============================================================================
---
tika/trunk/tika-core/src/main/java/org/apache/tika/utils/ServiceLoaderUtils.java
(original)
+++
tika/trunk/tika-core/src/main/java/org/apache/tika/utils/ServiceLoaderUtils.java
Fri Jul 24 18:22:47 2015
@@ -38,9 +38,9 @@ public class ServiceLoaderUtils {
if (t1 == t2) {
return n1.compareTo(n2);
} else if (t1) {
- return 1;
- } else {
return -1;
+ } else {
+ return 1;
}
}
});
Added:
tika/trunk/tika-parsers/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java?rev=1692564&view=auto
==============================================================================
---
tika/trunk/tika-parsers/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
(added)
+++
tika/trunk/tika-parsers/src/test/java/org/apache/tika/utils/ServiceLoaderUtilsTest.java
Fri Jul 24 18:22:47 2015
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tika.utils;
+
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.tika.TikaTest;
+import org.apache.tika.parser.DefaultParser;
+import org.apache.tika.parser.Parser;
+import org.junit.Test;
+
+public class ServiceLoaderUtilsTest extends TikaTest {
+ @Test
+ public void testOrdering() throws Exception {
+ //make sure that non Tika parsers come last
+ //which means that they'll overwrite Tika parsers and
+ //be preferred.
+ DefaultParser defaultParser = new DefaultParser();
+ int vorbisIndex = -1;
+ int fictIndex = -1;
+ int dcxmlIndex = -1;
+ int i = 0;
+ for (Parser p : defaultParser.getAllComponentParsers()) {
+ if ("class
org.gagravarr.tika.VorbisParser".equals(p.getClass().toString())) {
+ vorbisIndex = i;
+ }
+ if ("class
org.apache.tika.parser.xml.FictionBookParser".equals(p.getClass().toString())) {
+ fictIndex = i;
+ }
+ if ("class
org.apache.tika.parser.xml.DcXMLParser".equals(p.getClass().toString())) {
+ dcxmlIndex = i;
+ }
+ i++;
+ }
+
+ assertNotEquals(vorbisIndex, fictIndex);
+ assertNotEquals(fictIndex, dcxmlIndex);
+ assertTrue(vorbisIndex > fictIndex);
+ assertTrue(fictIndex > dcxmlIndex);
+ }
+}
