From a3511a258f551dfb34ac91b06183de98a9a4fecd Mon Sep 17 00:00:00 2001
From: Gethin James <gethin.james@alfresco.com>
Date: Fri, 28 Jul 2017 14:24:33 +0200
Subject: [PATCH] SEARCH-492: Giving each test its own namespace

---
 .../solr/AbstractAlfrescoDistributedTest.java      | 14 +++++++++++++-
 .../DistributedAlfrescoSolrFingerPrintTest.java    |  2 +-
 .../DistributedAlfrescoSolrSpellcheckerTest.java   |  2 +-
 .../DistributedAlfrescoSolrTrackerTest.java        |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedTest.java
index d61e77a04..9b4abb92a 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedTest.java
@@ -1695,13 +1695,25 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
          * Creates the jetty servers with the specified number of shards and sensible defaults.
          * @param numShards
          */
-        public JettyServerRule(int numShards)
+        private JettyServerRule(int numShards)
         {
             this.serverName = DEFAULT_TEST_CORENAME;
             coreNames = new String[]{DEFAULT_TEST_CORENAME};
             this.numShards = numShards;
             this.solrcoreProperties = new Properties();
         }
+
+        /**
+         * Creates the jetty servers with the specified number of shards and sensible defaults.
+         * @param numShards
+         */
+        public JettyServerRule(int numShards, AbstractAlfrescoDistributedTest testClass)
+        {
+            this.serverName = testClass.getClass().getSimpleName();
+            coreNames = new String[]{DEFAULT_TEST_CORENAME};
+            this.numShards = numShards;
+            this.solrcoreProperties = new Properties();
+        }
         /**
          * Creates the jetty servers with the specified number of shards and sensible defaults.
          * @param numShards
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFingerPrintTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFingerPrintTest.java
index 80aee71bb..e43e09db6 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFingerPrintTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFingerPrintTest.java
@@ -69,7 +69,7 @@ import org.junit.Test;
 public class DistributedAlfrescoSolrFingerPrintTest extends AbstractAlfrescoDistributedTest
 {
     @Rule
-    public JettyServerRule jetty = new JettyServerRule(2);
+    public JettyServerRule jetty = new JettyServerRule(2, this);
 
     @Test
     public void testFingerPrint() throws Exception
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrSpellcheckerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrSpellcheckerTest.java
index 3842a900c..1f6415517 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrSpellcheckerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrSpellcheckerTest.java
@@ -61,7 +61,7 @@ import org.junit.Test;
 public class DistributedAlfrescoSolrSpellcheckerTest extends AbstractAlfrescoDistributedTest
 {
     @Rule
-    public JettyServerRule jetty = new JettyServerRule(2);
+    public JettyServerRule jetty = new JettyServerRule(2, this);
 
     @Test
     public void testSpellcheckerOutputFormat() throws Exception
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerTest.java
index a5a03c9ec..213e42246 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerTest.java
@@ -47,7 +47,7 @@ public class DistributedAlfrescoSolrTrackerTest extends AbstractAlfrescoDistribu
 {
 
     @Rule
-    public JettyServerRule jetty = new JettyServerRule(2);
+    public JettyServerRule jetty = new JettyServerRule(2, this);
 
     @Test
     public void testTracker() throws Exception