You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2018/02/02 15:02:07 UTC
svn commit: r1822970 - in /jackrabbit/branches/2.16: ./
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/
jackrabbit-core/src/test/resources/org/apache/tika/
Author: reschke
Date: Fri Feb 2 15:02:07 2018
New Revision: 1822970
URL: http://svn.apache.org/viewvc?rev=1822970&view=rev
Log:
CR-4240: IndexingQueueTest relies on Tika behavior that is changed in Tika 1.17 (ported to 2.16)
Changed test to use an actual payload (and parse that), adding tika config to detect the custom type. (Thanks to tallison@apache.org for the proposed fix!)
Added:
jackrabbit/branches/2.16/jackrabbit-core/src/test/resources/org/apache/tika/
- copied from r1819849, jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/tika/
Modified:
jackrabbit/branches/2.16/ (props changed)
jackrabbit/branches/2.16/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/BlockingParser.java
jackrabbit/branches/2.16/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/IndexingQueueTest.java
Propchange: jackrabbit/branches/2.16/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 2 15:02:07 2018
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1816227,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817341,1817373,1817377,1818586,1820119,1820133,1821597
+/jackrabbit/trunk:1816227,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817341,1817373,1817377,1818586,1819849,1820119,1820133,1821597
Modified: jackrabbit/branches/2.16/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/BlockingParser.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/BlockingParser.java?rev=1822970&r1=1822969&r2=1822970&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/BlockingParser.java (original)
+++ jackrabbit/branches/2.16/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/BlockingParser.java Fri Feb 2 15:02:07 2018
@@ -16,16 +16,22 @@
*/
package org.apache.jackrabbit.core.query.lucene;
+import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
import java.util.Set;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.EmptyParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.sax.XHTMLContentHandler;
+import org.w3c.dom.Document;
import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
public class BlockingParser extends EmptyParser {
@@ -76,10 +82,19 @@ public class BlockingParser extends Empt
Metadata metadata, ParseContext context)
throws SAXException {
waitIfBlocked();
- XHTMLContentHandler xhtml = new XHTMLContentHandler(handler, metadata);
- xhtml.startDocument();
- xhtml.element("p", "The quick brown fox jumped over the lazy dog.");
- xhtml.endDocument();
+ try {
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ Document doc = dbf.newDocumentBuilder().parse(new InputSource(stream));
+ String contents = doc.getDocumentElement().getTextContent();
+ XHTMLContentHandler xhtml = new XHTMLContentHandler(handler, metadata);
+ xhtml.startDocument();
+ xhtml.element("p", contents);
+ xhtml.endDocument();
+ } catch (ParserConfigurationException ex) {
+ throw new SAXException(ex);
+ } catch (IOException ex) {
+ throw new SAXException(ex);
+ }
}
}
Modified: jackrabbit/branches/2.16/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/IndexingQueueTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/IndexingQueueTest.java?rev=1822970&r1=1822969&r2=1822970&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/IndexingQueueTest.java (original)
+++ jackrabbit/branches/2.16/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/IndexingQueueTest.java Fri Feb 2 15:02:07 2018
@@ -42,6 +42,8 @@ public class IndexingQueueTest extends A
private static final File TEMP_DIR =
new File(System.getProperty("java.io.tmpdir"));
+ private static final String TESTCONTENT = "<?xml version='1.0'?>\n<blocked>The quick brown fox jumps over the lazy dog.</blocked>";
+
public void testQueue() throws Exception {
SearchIndex index = getSearchIndex();
IndexingQueue queue = index.getIndex().getIndexingQueue();
@@ -50,7 +52,7 @@ public class IndexingQueueTest extends A
assertEquals(0, queue.getNumPendingDocuments());
Node resource = testRootNode.addNode(nodeName1, "nt:resource");
- resource.setProperty("jcr:data", "", PropertyType.BINARY);
+ resource.setProperty("jcr:data", TESTCONTENT, PropertyType.BINARY);
resource.setProperty("jcr:lastModified", Calendar.getInstance());
resource.setProperty("jcr:mimeType", BlockingParser.TYPE.toString());
session.save();
@@ -169,7 +171,7 @@ public class IndexingQueueTest extends A
// create files
Node file = folder.addNode("file" + i, "nt:file");
Node resource = file.addNode("jcr:content", "nt:resource");
- resource.setProperty("jcr:data", "", PropertyType.BINARY);
+ resource.setProperty("jcr:data", TESTCONTENT, PropertyType.BINARY);
resource.setProperty("jcr:lastModified", Calendar.getInstance());
resource.setProperty("jcr:mimeType", BlockingParser.TYPE.toString());
count++;