svn commit: r1358002 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/core/ solr/core/src/test/org/apache/solr/core/SolrCoreTest.java

[ma...@apache.org]

Author: markrmiller
Date: Thu Jul  5 23:59:44 2012
New Revision: 1358002

URL: http://svn.apache.org/viewvc?rev=1358002&view=rev
Log:
SOLR-2225: merge back additional test around default core handling

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/core/   (props changed)
    lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java

Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java?rev=1358002&r1=1358001&r2=1358002&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java Thu Jul  5 23:59:44 2012
@@ -27,9 +27,12 @@ import org.apache.solr.response.SolrQuer
 import org.apache.solr.util.plugin.SolrCoreAware;
 import org.junit.Test;
 
+import java.io.File;
 import java.util.concurrent.*;
 import java.util.*;
 public class SolrCoreTest extends SolrTestCaseJ4 {
+  private static final String COLLECTION1 = "collection1";
+  
   @Override
   public void setUp() throws Exception {
     super.setUp();
@@ -41,6 +44,37 @@ public class SolrCoreTest extends SolrTe
     deleteCore();
     super.tearDown();
   }
+  
+  @Test
+  public void testRemoveThenAddDefaultCore() throws Exception {
+    final CoreContainer cores = h.getCoreContainer();
+    SolrCore core = cores.getCore("");
+    assertEquals(COLLECTION1, cores.getDefaultCoreName());
+    
+    cores.remove("");
+    core.close();
+    core.close();
+    
+    
+    SolrCore newCore = new SolrCore(COLLECTION1, dataDir + File.separator
+        + "datadir2", new SolrConfig("solr/collection1", "solrconfig.xml", null), h.getCore().getSchema(),
+        new CoreDescriptor(cores, COLLECTION1, "solr/collection1"));
+    
+    cores.register(newCore, false);
+    
+    assertEquals(COLLECTION1, cores.getDefaultCoreName());
+    
+    // so we should be able to get a core with collection1
+    core = cores.getCore(COLLECTION1);
+    assertNotNull(core);
+    core.close();
+    
+    // and with ""
+    core = cores.getCore("");
+    assertNotNull(core);
+    
+    core.close();
+  }
 
   @Test
   public void testRequestHandlerRegistry() {