From 507cb684b7ae8430bdb7423be6cd034683277082 Mon Sep 17 00:00:00 2001 From: Alan Woodward Date: Sun, 15 Dec 2013 20:46:27 +0000 Subject: [PATCH] Fix test bug git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1551053 13f79535-47bb-0310-9956-ffa450edef68 --- .../test/org/apache/solr/schema/ModifyConfFileTest.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java b/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java index 7d04a4d12a7..23bc5d5bf75 100644 --- a/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java +++ b/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java @@ -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("\"\"")); + assertThat("should have detected an error early!", rsp.getException().getMessage(), containsString("\"\"")); params = params("op", "test", "file", "schema.xml", "stream.body", "Testing rewrite of schema.xml file."); locReq = new LocalSolrQueryRequest(core, params);