You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/07/14 01:41:58 UTC
svn commit: r963906 - in /lucene/dev/trunk/solr/src/test:
org/apache/solr/core/TestSolrDeletionPolicy1.java
test-files/solr/conf/solrconfig-delpolicy1.xml
Author: rmuir
Date: Tue Jul 13 23:41:57 2010
New Revision: 963906
URL: http://svn.apache.org/viewvc?rev=963906&view=rev
Log:
speed up test
Modified:
lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java?rev=963906&r1=963905&r2=963906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java Tue Jul 13 23:41:57 2010
@@ -17,26 +17,31 @@
package org.apache.solr.core;
import org.apache.lucene.index.IndexCommit;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.SolrTestCaseJ4;
+import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
+import static org.junit.Assert.*;
+
import java.util.Map;
/**
* @version $Id$
*/
-public class TestSolrDeletionPolicy1 extends AbstractSolrTestCase {
+public class TestSolrDeletionPolicy1 extends SolrTestCaseJ4 {
- @Override
- public String getSchemaFile() {
- return "schema.xml";
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ initCore("solrconfig-delpolicy1.xml","schema.xml");
}
- @Override
- public String getSolrConfigFile() {
- return "solrconfig-delpolicy1.xml";
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ clearIndex();
}
-
+
private void addDocs() {
assertU(adoc("id", String.valueOf(1),
@@ -110,7 +115,7 @@ public class TestSolrDeletionPolicy1 ext
Map<Long, IndexCommit> commits = delPolicy.getCommits();
IndexCommit ic = delPolicy.getLatestCommit();
String agestr = ((SolrDeletionPolicy) (delPolicy.getWrappedDeletionPolicy())).getMaxCommitAge().replaceAll("[a-zA-Z]", "").replaceAll("-", "");
- long age = Long.parseLong(agestr) * 1000;
+ long age = Long.parseLong(agestr);
Thread.sleep(age);
assertU(adoc("id", String.valueOf(6),
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml?rev=963906&r1=963905&r2=963906&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml Tue Jul 13 23:41:57 2010
@@ -97,7 +97,7 @@
<str name="keepOptimizedOnly">true</str>
<str name="maxCommitsToKeep">3</str>
- <str name="maxCommitAge">5SECONDS</str>
+ <str name="maxCommitAge">100MILLISECONDS</str>
</deletionPolicy>