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 2011/01/13 14:37:27 UTC
svn commit: r1058547 - in /lucene/dev/trunk/solr:
contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
src/test/org/apache/solr/search/TestIndexSearcher.java
Author: simonw
Date: Thu Jan 13 13:37:26 2011
New Revision: 1058547
URL: http://svn.apache.org/viewvc?rev=1058547&view=rev
Log:
fixed testcases which failed with -Dtests.multiplier > 1
Modified:
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestIndexSearcher.java
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java?rev=1058547&r1=1058546&r2=1058547&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java Thu Jan 13 13:37:26 2011
@@ -62,7 +62,7 @@ public class TestJdbcDataSource extends
super.setUp();
System.setProperty("java.naming.factory.initial",
MockInitialContextFactory.class.getName());
-
+
mockControl = EasyMock.createStrictControl();
driver = mockControl.createMock(Driver.class);
dataSource = mockControl.createMock(DataSource.class);
@@ -77,6 +77,7 @@ public class TestJdbcDataSource extends
System.setProperty("java.naming.factory.initial", sysProp);
}
super.tearDown();
+ mockControl.reset();
}
@Test
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestIndexSearcher.java?rev=1058547&r1=1058546&r2=1058547&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestIndexSearcher.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestIndexSearcher.java Thu Jan 13 13:37:26 2011
@@ -35,6 +35,13 @@ public class TestIndexSearcher extends S
public static void beforeClass() throws Exception {
initCore("solrconfig.xml","schema.xml");
}
+
+ public void tearDown() throws Exception {
+ super.tearDown();
+ assertU(delQ("*:*"));
+ optimize();
+ assertU((commit()));
+ }
private String getStringVal(SolrQueryRequest sqr, String field, int doc) throws IOException {
SchemaField sf = sqr.getSchema().getField(field);