You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2014/02/28 18:40:38 UTC
svn commit: r1573019 - in
/lucene/dev/trunk/solr/core/src/test/org/apache/solr: handler/component/
update/processor/
Author: hossman
Date: Fri Feb 28 17:40:37 2014
New Revision: 1573019
URL: http://svn.apache.org/r1573019
Log:
SOLR-5793, SOLR-5792, SOLR-5791: switch to using Constants.JAVA_VENDOR in assume
Modified:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java?rev=1573019&r1=1573018&r2=1573019&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java Fri Feb 28 17:40:37 2014
@@ -19,6 +19,8 @@ package org.apache.solr.handler.componen
import java.io.File;
+import org.apache.lucene.util.Constants;
+
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.CommonParams;
@@ -32,8 +34,8 @@ public class DistributedQueryElevationCo
@BeforeClass
public static void betterNotBeJ9() {
- assumeFalse("FIXME: SOLR-5791: This test fails under J9",
- System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+ assumeFalse("FIXME: SOLR-5791: This test fails under IBM J9",
+ Constants.JAVA_VENDOR.startsWith("IBM"));
}
public DistributedQueryElevationComponentTest() {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java?rev=1573019&r1=1573018&r2=1573019&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java Fri Feb 28 17:40:37 2014
@@ -17,6 +17,8 @@
package org.apache.solr.handler.component;
+import org.apache.lucene.util.Constants;
+
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.common.params.TermVectorParams;
import org.junit.BeforeClass;
@@ -24,8 +26,8 @@ import org.junit.BeforeClass;
public class TermVectorComponentDistributedTest extends BaseDistributedSearchTestCase {
@BeforeClass
public static void betterNotBeJ9() {
- assumeFalse("FIXME: SOLR-5792: This test fails under J9",
- System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+ assumeFalse("FIXME: SOLR-5792: This test fails under IBM J9",
+ Constants.JAVA_VENDOR.startsWith("IBM"));
}
@Override
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java?rev=1573019&r1=1573018&r2=1573019&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java Fri Feb 28 17:40:37 2014
@@ -21,6 +21,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.util.Constants;
+
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.impl.BinaryRequestWriter;
import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -49,8 +51,8 @@ public class SignatureUpdateProcessorFac
@BeforeClass
public static void betterNotBeJ9() {
- assumeFalse("FIXME: SOLR-5793: This test fails under J9",
- System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+ assumeFalse("FIXME: SOLR-5793: This test fails under IBM J9",
+ Constants.JAVA_VENDOR.startsWith("IBM"));
}