You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/12/29 21:21:58 UTC
svn commit: r1554061 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/contrib/
solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java
Author: markrmiller
Date: Sun Dec 29 20:21:58 2013
New Revision: 1554061
URL: http://svn.apache.org/r1554061
Log:
tests: improve this test
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java?rev=1554061&r1=1554060&r2=1554061&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java Sun Dec 29 20:21:58 2013
@@ -17,9 +17,19 @@ package org.apache.solr.handler.dataimpo
* limitations under the License.
*/
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+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;
@@ -29,20 +39,13 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
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 exte
"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 exte
@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