svn commit: r1601786 - in /jackrabbit/oak/branches/1.0: ./ oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTest.java

[ju...@apache.org]

Author: jukka
Date: Tue Jun 10 22:46:16 2014
New Revision: 1601786

URL: http://svn.apache.org/r1601786
Log:
1.0: Merged revision 1598302 (OAK-1819) to disable failing tests on Java 8

Modified:
    jackrabbit/oak/branches/1.0/   (props changed)
    jackrabbit/oak/branches/1.0/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTest.java

Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
  Merged /jackrabbit/oak/trunk:r1598302

Modified: jackrabbit/oak/branches/1.0/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTest.java?rev=1601786&r1=1601785&r2=1601786&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTest.java Tue Jun 10 22:46:16 2014
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.plugin
 import java.util.Iterator;
 
 import com.google.common.collect.ImmutableList;
+
 import org.apache.jackrabbit.oak.Oak;
 import org.apache.jackrabbit.oak.api.ContentRepository;
 import org.apache.jackrabbit.oak.api.Tree;
@@ -34,6 +35,7 @@ import org.apache.jackrabbit.oak.spi.que
 import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
 import org.apache.solr.client.solrj.SolrServer;
 import org.junit.After;
+import org.junit.Assume;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -42,6 +44,7 @@ import static junit.framework.Assert.ass
 import static org.apache.jackrabbit.oak.api.Type.STRINGS;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
 
 /**
  * General query extensive testcase for {@link SolrQueryIndex}
@@ -236,6 +239,9 @@ public class SolrIndexQueryTest extends 
 
     @Test
     public void testNativeMLTQuery() throws Exception {
+        // TODO: OAK-1819
+        assumeTrue(!System.getProperty("java.version").startsWith("1.8"));
+
         String nativeQueryString = "select [jcr:path] from [nt:base] where native('solr', 'mlt?q=name:World&mlt.fl=name&mlt.mindf=0&mlt.mintf=0')";
 
         Tree tree = root.getTree("/");
@@ -255,6 +261,9 @@ public class SolrIndexQueryTest extends 
 
     @Test
     public void testNativeMLTQueryWithStream() throws Exception {
+        // TODO: OAK-1819
+        assumeTrue(!System.getProperty("java.version").startsWith("1.8"));
+
         String nativeQueryString = "select [jcr:path] from [nt:base] where native('solr', 'mlt?stream.body=world is nice today&mlt.fl=name&mlt.mindf=0&mlt.mintf=0')";
 
         Tree tree = root.getTree("/");