svn commit: r963873 [2/2] - in /lucene/dev/trunk/solr: contrib/dataimporthandler/ contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/ contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ contrib/dat...

[rm...@apache.org]

Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=963873&r1=963872&r2=963873&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java Tue Jul 13 21:45:31 2010
@@ -616,6 +616,7 @@ public class TestReplicationHandler exte
     }
 
     public void setUp() throws Exception {
+      super.setUp();
       System.setProperty("solr.test.sys.prop1", "propone");
       System.setProperty("solr.test.sys.prop2", "proptwo");
 

Copied: lucene/dev/trunk/solr/src/test/org/apache/solr/util/AbstractSolrTestCase.java (from r963718, lucene/dev/trunk/solr/src/java/org/apache/solr/util/AbstractSolrTestCase.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/util/AbstractSolrTestCase.java?p2=lucene/dev/trunk/solr/src/test/org/apache/solr/util/AbstractSolrTestCase.java&p1=lucene/dev/trunk/solr/src/java/org/apache/solr/util/AbstractSolrTestCase.java&r1=963718&r2=963873&rev=963873&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/util/AbstractSolrTestCase.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/util/AbstractSolrTestCase.java Tue Jul 13 21:45:31 2010
@@ -19,6 +19,7 @@
 package org.apache.solr.util;
 
 
+import org.apache.lucene.util.LuceneTestCase;
 import org.apache.solr.core.SolrConfig;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrInputDocument;
@@ -30,7 +31,6 @@ import org.apache.solr.util.TestHarness;
 import org.xml.sax.SAXException;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
-import junit.framework.TestCase;
 import javax.xml.xpath.XPathExpressionException;
 
 import java.io.*;
@@ -51,7 +51,7 @@ import java.util.ArrayList;
  * @see #setUp
  * @see #tearDown
  */
-public abstract class AbstractSolrTestCase extends TestCase {
+public abstract class AbstractSolrTestCase extends LuceneTestCase {
     protected SolrConfig solrConfig;
   /**
    * Harness initialized by initTestHarness.
@@ -103,6 +103,7 @@ public abstract class AbstractSolrTestCa
 
   private String factoryProp;
   public void setUp() throws Exception {
+    super.setUp();
     log.info("####SETUP_START " + getName());
     ignoreException("ignore_exception");
     factoryProp = System.getProperty("solr.directoryFactory");
@@ -178,6 +179,7 @@ public abstract class AbstractSolrTestCa
     }
 
     resetExceptionIgnores();  
+    super.tearDown();
   }
 
   /** Validates an update XML String is successful