From c70aae725cff8abc6d14b8364eba869107e20f79 Mon Sep 17 00:00:00 2001 From: agazzarini Date: Mon, 27 Jan 2020 12:50:30 +0100 Subject: [PATCH] [ SEARCH-1687 ] TestFolder isolation: class name + timestamp --- .../org/alfresco/solr/AdminHandlerDistributedIT.java | 6 +++--- .../solr/CoresCreateUpdateDistributedIT.java | 12 +++++------- .../java/org/alfresco/solr/SolrITInitializer.java | 10 +++++++--- .../org/alfresco/solr/TemplatesDistributedIT.java | 2 +- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AdminHandlerDistributedIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AdminHandlerDistributedIT.java index 6e939bd16..e8d8d8285 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AdminHandlerDistributedIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AdminHandlerDistributedIT.java @@ -39,13 +39,13 @@ import static org.alfresco.solr.AlfrescoSolrUtils.*; @SolrTestCaseJ4.SuppressSSL public class AdminHandlerDistributedIT extends AbstractAlfrescoDistributedIT { - final static String JETTY_SERVER_ID = getSimpleClassName(); + static String testFolder; static final String CORE_NAME = "newcoretesting"; @BeforeClass public static void initData() throws Throwable { - initSolrServers(2, JETTY_SERVER_ID, null); + testFolder = initSolrServers(2, AdminHandlerDistributedIT.class.getSimpleName(), null); } @AfterClass @@ -58,7 +58,7 @@ public class AdminHandlerDistributedIT extends AbstractAlfrescoDistributedIT @Test public void newCoreUsingAdminHandler() throws Exception { - CoreContainer coreContainer = jettyContainers.get(JETTY_SERVER_ID).getCoreContainer(); + CoreContainer coreContainer = jettyContainers.get(testFolder).getCoreContainer(); //Create the new core AlfrescoCoreAdminHandler coreAdminHandler = (AlfrescoCoreAdminHandler) coreContainer.getMultiCoreHandler(); diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/CoresCreateUpdateDistributedIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/CoresCreateUpdateDistributedIT.java index 5fd8a4e23..9ca0ffeda 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/CoresCreateUpdateDistributedIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/CoresCreateUpdateDistributedIT.java @@ -19,7 +19,6 @@ package org.alfresco.solr; import org.alfresco.service.cmr.repository.StoreRef; -import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.SolrException; import org.apache.solr.common.params.CoreAdminParams; @@ -52,13 +51,12 @@ import static org.alfresco.solr.AlfrescoSolrUtils.getCore; @SolrTestCaseJ4.SuppressSSL public class CoresCreateUpdateDistributedIT extends AbstractAlfrescoDistributedIT { - private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - final static String JETTY_SERVER_ID = CoresCreateUpdateDistributedIT.class.getSimpleName(); + static String testFolder; @Before public void initData() throws Throwable { - initSolrServers(0, JETTY_SERVER_ID , null); + testFolder = initSolrServers(0, CoresCreateUpdateDistributedIT.class.getSimpleName(), null); } @After @@ -70,7 +68,7 @@ public class CoresCreateUpdateDistributedIT extends AbstractAlfrescoDistributedI @Test public void newCoreUsingAllDefaults() throws Exception { - CoreContainer coreContainer = jettyContainers.get(JETTY_SERVER_ID).getCoreContainer(); + CoreContainer coreContainer = jettyContainers.get(testFolder).getCoreContainer(); //Now create the new core with AlfrescoCoreAdminHandler coreAdminHandler = (AlfrescoCoreAdminHandler) coreContainer.getMultiCoreHandler(); @@ -91,7 +89,7 @@ public class CoresCreateUpdateDistributedIT extends AbstractAlfrescoDistributedI @Test public void newCoreWithUpdateSharedProperties() throws Exception { - CoreContainer coreContainer = jettyContainers.get(JETTY_SERVER_ID).getCoreContainer(); + CoreContainer coreContainer = jettyContainers.get(testFolder).getCoreContainer(); //Now create the new core with AlfrescoCoreAdminHandler coreAdminHandler = (AlfrescoCoreAdminHandler) coreContainer.getMultiCoreHandler(); @@ -131,7 +129,7 @@ public class CoresCreateUpdateDistributedIT extends AbstractAlfrescoDistributedI @Test public void newCoreUsingArchiveStore() throws Exception { - CoreContainer coreContainer = jettyContainers.get(JETTY_SERVER_ID).getCoreContainer(); + CoreContainer coreContainer = jettyContainers.get(testFolder).getCoreContainer(); //Now create the new core with AlfrescoCoreAdminHandler coreAdminHandler = (AlfrescoCoreAdminHandler) coreContainer.getMultiCoreHandler(); diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java index 77adb26e9..1d560af8b 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java @@ -67,7 +67,6 @@ import java.util.concurrent.atomic.AtomicInteger; * @since solr 1.5 * @author Michael Suzuki */ -@ThreadLeakLingering(linger = 5000) public abstract class SolrITInitializer extends SolrTestCaseJ4 { private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); @@ -116,8 +115,11 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 testDir = new File(System.getProperty("user.dir") + "/target/jettys"); } - - public static void initSolrServers(int numShards, String testClassName, Properties solrcoreProperties) throws Throwable + + /** + * Initialises the Solr infrastructure and returns back the test folder used. + */ + public static String initSolrServers(int numShards, String testClassName, Properties solrcoreProperties) throws Throwable { testClassName = testClassName + "_" + System.currentTimeMillis(); @@ -140,6 +142,8 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 createServers(testClassName, coreNames, numShards, solrcoreProperties); System.setProperty("solr.solr.home", testDir.toPath().resolve(testClassName).toString()); + + return testClassName; } private static Properties addExplicitShardingProperty(Properties solrcoreProperties) diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/TemplatesDistributedIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/TemplatesDistributedIT.java index b0a36f453..89038928b 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/TemplatesDistributedIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/TemplatesDistributedIT.java @@ -37,7 +37,7 @@ import org.junit.Test; @SolrTestCaseJ4.SuppressSSL public class TemplatesDistributedIT extends AbstractAlfrescoDistributedIT { - final static String JETTY_SERVER_ID = getSimpleClassName(); + final static String JETTY_SERVER_ID = TemplatesDistributedIT.class.getSimpleName(); @BeforeClass public static void initData() throws Throwable