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

tests: improve this test 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1554060 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2013-12-29 20:21:03 +00:00
parent 8fcdf1d85a
commit 54c0b2e946
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java
View File

@ -17,18 +17,6 @@ package org.apache.solr.handler.dataimport;
* limitations under the License.
*/
import org.apache.solr.cloud.AbstractZkTestCase;
import org.apache.solr.cloud.ZkTestServer;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@ -38,11 +26,26 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import org.apache.solr.cloud.AbstractZkTestCase;
import org.apache.solr.cloud.ZkTestServer;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
public class TestZKPropertiesWriter extends AbstractDataImportHandlerTestCase {
protected static ZkTestServer zkServer;
protected static String zkDir;
private static CoreContainer cc;
private String dateFormat = "yyyy-MM-dd HH:mm:ss.SSSSSS";
@BeforeClass
@ -61,13 +64,12 @@ public class TestZKPropertiesWriter extends AbstractDataImportHandlerTestCase {
"dataimport-solrconfig.xml", "dataimport-schema.xml");
//initCore("solrconfig.xml", "schema.xml", getFile("dih/solr").getAbsolutePath());
createDefaultCoreContainer(getFile("dih/solr").getAbsolutePath());
cc = createDefaultCoreContainer(getFile("dih/solr").getAbsolutePath());
}
@Before
public void beforeDihZKTest() throws Exception {
clearIndex();
assertU(commit());
}
@After
@ -78,13 +80,12 @@ public class TestZKPropertiesWriter extends AbstractDataImportHandlerTestCase {
@AfterClass
public static void dihZk_afterClass() throws Exception {
cc.shutdown();
zkServer.shutdown();
zkServer = null;
zkDir = null;
// wait just a bit for any zk client threads to outlast timeout
Thread.sleep(2000);
}
@Test