You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2010/10/21 09:09:39 UTC

svn commit: r1025859 - /lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java

Author: simonw
Date: Thu Oct 21 07:09:39 2010
New Revision: 1025859

URL: http://svn.apache.org/viewvc?rev=1025859&view=rev
Log:
Merged from trunk due to SOLR-2185: QueryElevationComponentTest depends on execution order - failed on Hudson only on this branch

Modified:
    lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java   (contents, props changed)

Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java?rev=1025859&r1=1025858&r2=1025859&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java Thu Oct 21 07:09:39 2010
@@ -49,6 +49,15 @@ public class QueryElevationComponentTest
   public static void beforeClass() throws Exception {
     initCore("solrconfig-elevate.xml","schema12.xml");
   }
+
+  @Before
+  @Override
+  public void setUp() throws Exception{
+    super.setUp();
+    clearIndex();
+    assertU(commit());
+    assertU(optimize());
+  }
   
   @Test
   public void testInterface() throws Exception

Propchange: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 21 07:09:39 2010
@@ -0,0 +1,9 @@
+/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java:949730,961612,979161,980654,982195,987811,988512
+/lucene/dev/branches/preflexfixes/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java:967125-979432
+/lucene/dev/trunk/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java:1021634-1025711,1025858
+/lucene/java/branches/lucene_2_4/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java:748824
+/lucene/java/branches/lucene_2_9/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java:817269-818600,825998,829134,829881,831036,896850,909334
+/lucene/java/branches/lucene_2_9_back_compat_tests/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java:818601-821336
+/lucene/java/branches/lucene_3_0/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java:880793,896906
+/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java:924462
+/lucene/solr/trunk/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java:922950-923910,923912-925091