Fix test bug

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1551053 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alan Woodward 2013-12-15 20:46:27 +00:00
parent 234acf76b5
commit 507cb684b7
1 changed files with 3 additions and 6 deletions

View File

@ -21,7 +21,6 @@ import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
import org.apache.commons.codec.Charsets;
import org.apache.commons.io.FileUtils;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.ContentStreamBase;
@ -40,6 +39,8 @@ import org.junit.rules.TestRule;
import java.io.File;
import java.util.ArrayList;
import static org.junit.internal.matchers.StringContains.containsString;
public class ModifyConfFileTest extends SolrTestCaseJ4 {
private File solrHomeDirectory = new File(TEMP_DIR, this.getClass().getName());
@ -99,11 +100,7 @@ public class ModifyConfFileTest extends SolrTestCaseJ4 {
streams.add(new ContentStreamBase.StringStream(badConf));
locReq.setContentStreams(streams);
core.execute(handler, locReq, rsp);
assertTrue("should have detected an error early!",
rsp.getException().getMessage().contains("\"dataDir\""));
assertTrue("should have detected an error early!",
rsp.getException().getMessage().contains("\"</dataDir>\""));
assertThat("should have detected an error early!", rsp.getException().getMessage(), containsString("\"</dataDir>\""));
params = params("op", "test", "file", "schema.xml", "stream.body", "Testing rewrite of schema.xml file.");
locReq = new LocalSolrQueryRequest(core, params);