From 5a737a3aab969b120a84dbc7cd7ed351796576b3 Mon Sep 17 00:00:00 2001 From: Erick Erickson Date: Mon, 12 Jun 2017 09:40:34 -0700 Subject: [PATCH] SOLR-10857: Solr loads UNLOADed core on request, cleaned up printStackTrace --- .../handler/admin/CoreAdminHandlerTest.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java index f1770f8acbe..06c30e63421 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java @@ -320,18 +320,16 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 { req.process(client); } - try (HttpSolrClient client = getHttpSolrClient(runner.getBaseUrl() + "/corex")) { - client.setConnectionTimeout(SolrTestCaseJ4.DEFAULT_CONNECTION_TIMEOUT); - client.setSoTimeout(SolrTestCaseJ4.DEFAULT_CONNECTION_TIMEOUT*1000); - QueryResponse result = client.query(new SolrQuery("id:*")); - //assertEquals(1,result.getResults().getNumFound()); - fail("expect 404"); - }catch(Exception e){ - e.printStackTrace(); - } - finally{ - runner.stop(); - } + HttpSolrClient.RemoteSolrException rse = expectThrows(HttpSolrClient.RemoteSolrException.class, () -> { + try (HttpSolrClient client = getHttpSolrClient(runner.getBaseUrl() + "/corex")) { + client.setConnectionTimeout(SolrTestCaseJ4.DEFAULT_CONNECTION_TIMEOUT); + client.setSoTimeout(SolrTestCaseJ4.DEFAULT_CONNECTION_TIMEOUT * 1000); + client.query(new SolrQuery("id:*")); + } finally { + runner.stop(); + } + }); + assertTrue(rse.getMessage().contains("Can not find: /solr/corex/select")); } @Test