Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-5211: fix test

This commit is contained in:
David Smiley 2018-11-27 07:50:01 -08:00
parent 6728f0c4f4
commit 1534bbe4ae
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
solr/core/src/test/org/apache/solr/update/RootFieldTest.java
View File

@ -17,8 +17,6 @@
package org.apache.solr.update; package org.apache.solr.update;
import java.util.List;
import org.apache.solr.SolrJettyTestBase; import org.apache.solr.SolrJettyTestBase;
import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrQuery;
@ -28,14 +26,12 @@ import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.CommonParams;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
@Ignore("pending SOLR-5211 moshe fixing")
public class RootFieldTest extends SolrJettyTestBase { public class RootFieldTest extends SolrJettyTestBase {
private static boolean useRootSchema; private static boolean useRootSchema;
private static final String MESSAGE = "Update handler should create and process _root_ field " + private static final String MESSAGE = "Update handler should create and process _root_ field " +
@ -51,8 +47,8 @@ public class RootFieldTest extends SolrJettyTestBase {
@BeforeClass @BeforeClass
public static void beforeTest() throws Exception { public static void beforeTest() throws Exception {
useRootSchema = random().nextBoolean(); useRootSchema = random().nextBoolean();
// schema.xml declares _root_ field while schema15.xml does not. // schema15.xml declares _root_ field, while schema-rest.xml does not.
String schema = useRootSchema ? "schema.xml" : "schema15.xml"; String schema = useRootSchema ? "schema15.xml" : "schema-rest.xml";
initCore("solrconfig.xml", schema); initCore("solrconfig.xml", schema);
} }
@ -96,7 +92,7 @@ public class RootFieldTest extends SolrJettyTestBase {
// Check updated field values // Check updated field values
assertThat(foundDoc.getFieldValue( "id" ), is(docId)); assertThat(foundDoc.getFieldValue( "id" ), is(docId));
assertThat( ((List)foundDoc.getFieldValue( "name" )).get(0), is("updated doc")); assertThat(foundDoc.getFieldValue( "name" ), is("updated doc"));
assertThat(MESSAGE, foundDoc.getFieldValue( "_root_" ), is(expectedRootValue)); assertThat(MESSAGE, foundDoc.getFieldValue( "_root_" ), is(expectedRootValue));
} }