From 6268b22a2f10b07f062d8d7dc49c135864c35658 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Thu, 23 Jan 2020 16:23:14 +0000 Subject: [PATCH] SEARCH-1949 Rename some integration tests as we can still have cascading without the tracker. --- ...rackerIntegrationTest.java => CascadingIntegrationTest.java} | 2 +- .../solr/tracker/{CascadeTrackerIT.java => CascadingIT.java} | 2 +- ...stributedCascadeTrackerIT.java => DistributedCascadeIT.java} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/{CascadingTrackerIntegrationTest.java => CascadingIntegrationTest.java} (99%) rename search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/{CascadeTrackerIT.java => CascadingIT.java} (99%) rename search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/{DistributedCascadeTrackerIT.java => DistributedCascadeIT.java} (98%) diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingTrackerIntegrationTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingIntegrationTest.java similarity index 99% rename from e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingTrackerIntegrationTest.java rename to e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingIntegrationTest.java index 3d66f1922..a61e2dc63 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingTrackerIntegrationTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/tracker/CascadingIntegrationTest.java @@ -31,7 +31,7 @@ import static org.testng.Assert.assertTrue; * @author Alessandro Benedetti * @author Meenal Bhave */ -public class CascadingTrackerIntegrationTest extends AbstractE2EFunctionalTest +public class CascadingIntegrationTest extends AbstractE2EFunctionalTest { @Autowired protected DataContent dataContent; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadeTrackerIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadingIT.java similarity index 99% rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadeTrackerIT.java rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadingIT.java index 00c34cfa4..7d1e145a9 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadeTrackerIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadingIT.java @@ -52,7 +52,7 @@ import java.util.List; @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"}) @SolrTestCaseJ4.SuppressSSL -public class CascadeTrackerIT extends AbstractAlfrescoSolrIT +public class CascadingIT extends AbstractAlfrescoSolrIT { private static long MAX_WAIT_TIME = 80000; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedCascadeTrackerIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedCascadeIT.java similarity index 98% rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedCascadeTrackerIT.java rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedCascadeIT.java index 6e5fbe39f..3d1415bb4 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedCascadeTrackerIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedCascadeIT.java @@ -55,7 +55,7 @@ import java.util.Properties; */ @SolrTestCaseJ4.SuppressSSL @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"}) -public class DistributedCascadeTrackerIT extends AbstractAlfrescoDistributedIT +public class DistributedCascadeIT extends AbstractAlfrescoDistributedIT { private Node parentFolder; private NodeMetaData parentFolderMetadata;