You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2013/12/15 21:46:27 UTC
svn commit: r1551053 -
/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java
Author: romseygeek
Date: Sun Dec 15 20:46:27 2013
New Revision: 1551053
URL: http://svn.apache.org/r1551053
Log:
Fix test bug
Modified:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java?rev=1551053&r1=1551052&r2=1551053&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java Sun Dec 15 20:46:27 2013
@@ -21,7 +21,6 @@ import com.carrotsearch.randomizedtestin
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
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);