svn commit: r1500354 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java

[er...@apache.org]

Author: erick
Date: Sun Jul  7 02:25:49 2013
New Revision: 1500354

URL: http://svn.apache.org/r1500354
Log:
Fix broken test checked in with SOLR-4982

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java?rev=1500354&r1=1500353&r2=1500354&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java Sun Jul  7 02:25:49 2013
@@ -40,13 +40,12 @@ public class CoreAdminCreateDiscoverTest
   private static File solrHomeDirectory = null;
 
   private static CoreAdminHandler admin = null;
-//  private static CoreContainer cc = null;
 
   private static String coreNormal = "normal";
   private static String coreSysProps = "sys_props";
 
   @BeforeClass
-  public static void before() throws Exception {
+  public static void beforeClass() throws Exception {
     useFactory(null); // I require FS-based indexes for this test.
 
     solrHomeDirectory = new File(TEMP_DIR, "solrHome/" + CoreAdminCreateDiscoverTest.getClassName());
@@ -61,8 +60,8 @@ public class CoreAdminCreateDiscoverTest
   }
 
   @AfterClass
-  public static void after() throws Exception {
-    h.close();
+  public static void afterClass() throws Exception {
+    admin = null; // Release it or the test harness complains.
     if (solrHomeDirectory.exists()) {
       FileUtils.deleteDirectory(solrHomeDirectory);
     }