From 89ea939a4a8c09cc406c1ca88adea5749a0a7bb9 Mon Sep 17 00:00:00 2001 From: Erick Erickson Date: Sun, 7 Jul 2013 02:25:49 +0000 Subject: [PATCH] Fix broken test checked in with SOLR-4982 git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1500354 13f79535-47bb-0310-9956-ffa450edef68 --- .../solr/handler/admin/CoreAdminCreateDiscoverTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java index 8167f43e987..a49a1df6bb4 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java @@ -40,13 +40,12 @@ public class CoreAdminCreateDiscoverTest extends SolrTestCaseJ4 { 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 extends SolrTestCaseJ4 { } @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); }