From 9b988a73a1acbdcf7120dcc3b11dd1f6b2e03234 Mon Sep 17 00:00:00 2001 From: Keerat Date: Tue, 18 Feb 2020 08:49:50 +0000 Subject: [PATCH 1/5] SEARCH-2078 fix for getShardInfoWithAdminAuthority --- .../functional/searchServices/search/ShardInfoTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java index 8e6ccc940..3e5cca579 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java @@ -62,7 +62,9 @@ public class ShardInfoTest extends AbstractE2EFunctionalTest RestShardInfoModel model = shardInfoModel.getModel(); assertEquals(model.getTemplate(), "rerank"); assertEquals(model.getMode(), "MASTER"); - assertEquals(model.getShardMethod(), "DB_ID"); + List shardingMethods = Arrays.asList("DB_ID", "DB_ID_RANGE", "EXPLICIT_ID", "ACL_ID", "MOD_ACL_ID", "DATE", "PROPERTY"); + String shardingMethod = model.getShardMethod(); + assertTrue(shardingMethods.contains(shardingMethod), "Unexpected Sharding Method Found: " + shardingMethod); assertTrue(model.getHasContent()); assertTrue(stores.contains(model.getStores())); @@ -79,7 +81,7 @@ public class ShardInfoTest extends AbstractE2EFunctionalTest assertTrue(baseUrls.contains(instance.getBaseUrl())); // TODO: Ideally Solr Host and Port should be Parameterised - assertEquals(instance.getHost(), "search"); + assertEquals(instance.getHost(), "solr6secondary"); assertEquals(instance.getPort().intValue(), 8983); assertEquals(instance.getState(), "ACTIVE"); assertEquals(instance.getMode(), "MASTER"); From ecc67b28474dc52c4c5c62322fea1add7f03393b Mon Sep 17 00:00:00 2001 From: Keerat Date: Tue, 18 Feb 2020 09:38:31 +0000 Subject: [PATCH 2/5] SEARCH-2078 fix for getShardInfoWithAdminAuthority --- .../search/functional/searchServices/search/ShardInfoTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java index 3e5cca579..e61d0c088 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java @@ -81,7 +81,7 @@ public class ShardInfoTest extends AbstractE2EFunctionalTest assertTrue(baseUrls.contains(instance.getBaseUrl())); // TODO: Ideally Solr Host and Port should be Parameterised - assertEquals(instance.getHost(), "solr6secondary"); + assertEquals(instance.getHost(), "search"); assertEquals(instance.getPort().intValue(), 8983); assertEquals(instance.getState(), "ACTIVE"); assertEquals(instance.getMode(), "MASTER"); From 1e271559ca9728b7d1e4fb8c625592a83c2f05a2 Mon Sep 17 00:00:00 2001 From: Keerat Date: Mon, 24 Feb 2020 08:21:53 +0000 Subject: [PATCH 3/5] SEARCH-1681 Tests fixes when in a sharded mode --- .../search/functional/searchServices/search/ShardInfoTest.java | 2 +- .../functional/searchServices/search/StatsSearchTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java index e61d0c088..0d28bbb77 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java @@ -81,7 +81,7 @@ public class ShardInfoTest extends AbstractE2EFunctionalTest assertTrue(baseUrls.contains(instance.getBaseUrl())); // TODO: Ideally Solr Host and Port should be Parameterised - assertEquals(instance.getHost(), "search"); + assertNotNull(instance.getHost()); assertEquals(instance.getPort().intValue(), 8983); assertEquals(instance.getState(), "ACTIVE"); assertEquals(instance.getMode(), "MASTER"); diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java index fc48b425f..e998d5b4c 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java @@ -322,7 +322,7 @@ public class StatsSearchTest extends AbstractSearchServicesE2ETest response.getContext().assertThat().field("facets").isNotEmpty(); RestGenericFacetResponseModel facetResponseModel = response.getContext().getFacets().get(0); facetResponseModel.assertThat().field("type").is("stats"); - facetResponseModel.assertThat().field("label").is(label); + facetResponseModel.assertThat().field("label").contains(label); RestGenericBucketModel bucket = facetResponseModel.getBuckets().get(0); List metrics = bucket.getMetrics(); assertEquals(metrics.size(),metricsCount); From a0db4a2e311e64f948beef708d61f0ca7b43a614 Mon Sep 17 00:00:00 2001 From: Keerat Date: Tue, 25 Feb 2020 15:17:15 +0000 Subject: [PATCH 4/5] SEARCH-1681 Tests fixes when in a sharded mode --- .../functional/searchServices/search/FacetedSearchTest.java | 5 +++++ .../functional/searchServices/search/ShardInfoTest.java | 2 +- .../functional/searchServices/search/StatsSearchTest.java | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java index ce389980d..2244cfdb9 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java @@ -125,8 +125,13 @@ public class FacetedSearchTest extends AbstractSearchServicesE2ETest SearchResponse response = query(query); + waitForContentIndexing(file4.getContent(), true); + response.assertThat().entriesListIsNotEmpty(); response.getContext().assertThat().field("facetQueries").isNotEmpty(); + Assert.assertTrue(waitForContentIndexing("small", true)); + Assert.assertTrue(waitForContentIndexing("medium", true)); + Assert.assertTrue(waitForContentIndexing("large", true)); FacetFieldBucket facet = response.getContext().getFacetQueries().get(0); facet.assertThat().field("label").contains("small").and().field("count").isGreaterThan(0); diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java index 0d28bbb77..573af0ae3 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java @@ -81,7 +81,7 @@ public class ShardInfoTest extends AbstractE2EFunctionalTest assertTrue(baseUrls.contains(instance.getBaseUrl())); // TODO: Ideally Solr Host and Port should be Parameterised - assertNotNull(instance.getHost()); + assertNotNull(instance.getHost(), "The solr host is not present"); assertEquals(instance.getPort().intValue(), 8983); assertEquals(instance.getState(), "ACTIVE"); assertEquals(instance.getMode(), "MASTER"); diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java index e998d5b4c..c2b39fb4f 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java @@ -322,7 +322,9 @@ public class StatsSearchTest extends AbstractSearchServicesE2ETest response.getContext().assertThat().field("facets").isNotEmpty(); RestGenericFacetResponseModel facetResponseModel = response.getContext().getFacets().get(0); facetResponseModel.assertThat().field("type").is("stats"); - facetResponseModel.assertThat().field("label").contains(label); + // TODO : Change back to facetResponseModel.assertThat().field("label").is(label); + // when https://issues.alfresco.com/jira/browse/SEARCH-2125 is fixed + facetResponseModel.assertThat().field("label").is(label); RestGenericBucketModel bucket = facetResponseModel.getBuckets().get(0); List metrics = bucket.getMetrics(); assertEquals(metrics.size(),metricsCount); From c4dbd97cf631a9215fa7c48573822340f60c40ec Mon Sep 17 00:00:00 2001 From: Keerat Date: Tue, 25 Feb 2020 15:19:00 +0000 Subject: [PATCH 5/5] SEARCH-1681 Removing additinal comments --- .../functional/searchServices/search/FacetedSearchTest.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java index 2244cfdb9..ce389980d 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java @@ -125,13 +125,8 @@ public class FacetedSearchTest extends AbstractSearchServicesE2ETest SearchResponse response = query(query); - waitForContentIndexing(file4.getContent(), true); - response.assertThat().entriesListIsNotEmpty(); response.getContext().assertThat().field("facetQueries").isNotEmpty(); - Assert.assertTrue(waitForContentIndexing("small", true)); - Assert.assertTrue(waitForContentIndexing("medium", true)); - Assert.assertTrue(waitForContentIndexing("large", true)); FacetFieldBucket facet = response.getContext().getFacetQueries().get(0); facet.assertThat().field("label").contains("small").and().field("count").isGreaterThan(0);