From d7870d6b43374d2b550cc87ec3fa0c9d08e20352 Mon Sep 17 00:00:00 2001 From: Gethin James Date: Fri, 4 Aug 2017 10:25:19 +0200 Subject: [PATCH] SEARCH-492: Giving tests their own namespace --- .../org/alfresco/solr/AbstractAlfrescoDistributedTest.java | 4 ++-- .../solr/tracker/DistributedAclIdAlfrescoSolrTrackerTest.java | 2 +- .../tracker/DistributedDbidRangeAlfrescoSolrTrackerTest.java | 2 +- 3 files changed, 4 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 37ca8da8b..3925a5d16 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 @@ -1722,9 +1722,9 @@ 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, Properties solrcoreProperties) + public JettyServerRule(int numShards, AbstractAlfrescoDistributedTest testClass, Properties solrcoreProperties) { - this.serverName = DEFAULT_TEST_CORENAME; + this.serverName = testClass.getClass().getSimpleName(); coreNames = new String[]{DEFAULT_TEST_CORENAME}; this.numShards = numShards; this.solrcoreProperties = solrcoreProperties; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerTest.java index f791fb09c..56287d52e 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerTest.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerTest.java @@ -59,7 +59,7 @@ import org.junit.Test; public class DistributedAclIdAlfrescoSolrTrackerTest extends AbstractAlfrescoDistributedTest { @Rule - public JettyServerRule jetty = new JettyServerRule(2,getShardMethod()); + public JettyServerRule jetty = new JettyServerRule(2,this, getShardMethod()); @Test public void testAclId() throws Exception diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDbidRangeAlfrescoSolrTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDbidRangeAlfrescoSolrTrackerTest.java index a3c9e392f..1ce3aeabe 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDbidRangeAlfrescoSolrTrackerTest.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDbidRangeAlfrescoSolrTrackerTest.java @@ -60,7 +60,7 @@ import org.junit.Test; public class DistributedDbidRangeAlfrescoSolrTrackerTest extends AbstractAlfrescoDistributedTest { @Rule - public JettyServerRule jetty = new JettyServerRule(2,getShardMethod()); + public JettyServerRule jetty = new JettyServerRule(2,this, getShardMethod()); @Test public void testDbIdRange() throws Exception