Author: tommaso
Date: Sat Mar 29 16:08:40 2014
New Revision: 1583014
URL: http://svn.apache.org/r1583014
Log:
OAK-1638 - cleaning up index when solr server is started
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java?rev=1583014&r1=1583013&r2=1583014&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
Sat Mar 29 16:08:40 2014
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr;
+import java.io.File;
+
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.CommitPolicy;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration;
@@ -26,6 +28,8 @@ import org.apache.solr.client.solrj.Solr
import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
import org.apache.solr.core.CoreContainer;
+import static org.junit.Assert.assertTrue;
+
/**
* Utility class for tests
*/
@@ -42,9 +46,24 @@ public class TestUtils
} catch (Exception e) {
throw new IllegalStateException(e);
}
- return new EmbeddedSolrServer(coreContainer, "oak");
+ EmbeddedSolrServer server = new EmbeddedSolrServer(coreContainer,
"oak");
+ try {
+ server.deleteByQuery("*:*");
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ return server;
}
+ public static void cleanDataDir() {
+ String path = TestUtils.class.getResource("/solr/oak/data").getFile();
+ File file = new File(path);
+ System.err.println("checking data dir");
+ if (file.exists()) {
+ System.err.println("deleting data dir");
+ assertTrue(file.delete());
+ }
+ }
public static OakSolrConfiguration getTestConfiguration() {
return new OakSolrConfiguration() {
