svn commit: r1811986 - /jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java

[catholicon]

Author: catholicon
Date: Thu Oct 12 15:53:25 2017
New Revision: 1811986

URL: http://svn.apache.org/viewvc?rev=1811986&view=rev
Log:
OAK-6792: rep:facet not supported in xpath

fixing setup/tearDown issues leading to build failure

Modified:
    
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java?rev=1811986&r1=1811985&r2=1811986&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
 Thu Oct 12 15:53:25 2017
@@ -47,21 +47,27 @@ public class FacetTest extends AbstractQ
     @Before
     protected void setUp() throws Exception {
         super.setUp();
-        if (!superuser.itemExists(FACET_CONFING_PROP_PATH)) {
-            Node props = 
superuser.getNode("/oak:index/luceneGlobal/indexRules/nt:base/properties");
-            Node node = props.addNode("relative");
-            node.setProperty("name", "jc/text");
-            node.setProperty(LuceneIndexConstants.PROP_FACETS, true);
-            node.setProperty(LuceneIndexConstants.PROP_ANALYZED, true);
-            node = props.getNode("allProps");
-            node.setProperty(LuceneIndexConstants.PROP_FACETS, true);
-            markIndexForReindex();
-            superuser.save();
-            superuser.refresh(true);
+        if (superuser.itemExists(FACET_CONFING_PROP_PATH)) {
+            superuser.getItem(FACET_CONFING_PROP_PATH).remove();
         }
 
+        Node props = 
superuser.getNode("/oak:index/luceneGlobal/indexRules/nt:base/properties");
+        if (props.hasNode("relative")) {
+            props.getNode("relative").remove();
+        }
+
+        Node node = props.addNode("relative");
+        node.setProperty("name", "jc/text");
+        node.setProperty(LuceneIndexConstants.PROP_FACETS, true);
+        node.setProperty(LuceneIndexConstants.PROP_ANALYZED, true);
+        node = props.getNode("allProps");
+        node.setProperty(LuceneIndexConstants.PROP_FACETS, true);
+        markIndexForReindex();
+        superuser.save();
+        superuser.refresh(true);
+
         if (!superuser.nodeExists(FACET_CONFING_NODE_PATH)) {
-            Node node = superuser.getNode(INDEX_CONFING_NODE_PATH);
+            node = superuser.getNode(INDEX_CONFING_NODE_PATH);
             node.addNode(LuceneIndexConstants.FACETS);
             markIndexForReindex();
             superuser.save();