inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Search-1634 addtional tests for master slave mode

Browse Source
This commit is contained in:
unknown
2019-05-02 08:37:35 +01:00
parent f774cff0e8
commit 525f722422
4 changed files with 63 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e-test/pom.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<properties>
<tas.rest.api.version>6.0.0.3</tas.rest.api.version>
<tas.cmis.api.version>6.0.0.0</tas.cmis.api.version>
<tas.utility.version>2.0.1</tas.utility.version>
<tas.utility.version>2.0.9-SNAPSHOT</tas.utility.version>
<rm.version>2.6.0</rm.version>
<suiteXmlFile>src/test/resources/SearchSuite.xml</suiteXmlFile>
<test.exclude></test.exclude>
e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/AbstractSearchServicesE2ETest.java
+1 -1
View File
@@ -187,4 +187,4 @@ public abstract class AbstractSearchServicesE2ETest extends AbstractE2EFunctiona
return resultAsExpected;
}
}
}
e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchHighLightTest.java
+3
View File
@@ -28,6 +28,7 @@ import org.alfresco.rest.search.RestRequestQueryModel;
import org.alfresco.rest.search.SearchResponse;
import org.alfresco.utility.model.TestGroup;
import org.alfresco.utility.report.Bug;
import org.testng.Assert;
import org.testng.annotations.Test;
/**
@@ -56,7 +57,9 @@ public class SearchHighLightTest extends AbstractSearchServicesE2ETest
highlight.setFields(fields);
SearchResponse nodes = query(queryReq, highlight);
nodes.assertThat().entriesListIsNotEmpty();
Assert.assertNotNull(nodes.getEntryByIndex(0).getSearch());
ResponseHighLightModel hl = nodes.getEntryByIndex(0).getSearch().getHighlight().get(0);
Assert.assertNotNull(nodes.getEntryByIndex(0).getSearch());
hl.assertThat().field("snippets").contains( "The landrover discovery is not a sports ¿car?");
}
e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java
+58 -16
View File
@@ -18,6 +18,8 @@
*/
package org.alfresco.test.search.functional.searchServices.search;
import org.testng.annotations.Test;
import org.testng.AssertJUnit;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
@@ -33,7 +35,6 @@ import org.alfresco.rest.search.RestShardInfoModelCollection;
import org.alfresco.rest.search.RestShardModel;
import org.alfresco.utility.model.TestGroup;
import org.springframework.http.HttpStatus;
import org.testng.annotations.Test;
/**
* Shard info end point REST API test.
@@ -42,13 +43,13 @@ import org.testng.annotations.Test;
*/
public class ShardInfoTest extends AbstractSearchServicesE2ETest
{
@Test(groups={TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ACS_60n})
@Test(groups={TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ACS_60n, TestGroup.ASS_MASTER})
public void getShardInfoWithAdminAuthority() throws JsonProcessingException
{
RestShardInfoModelCollection info = restClient.authenticateUser(dataUser.getAdminUser()).withShardInfoAPI().getInfo();
restClient.assertStatusCodeIs(HttpStatus.OK);
info.assertThat().entriesListIsNotEmpty();
assertEquals(info.getPagination().getTotalItems().intValue(), 2);
AssertJUnit.assertEquals(info.getPagination().getTotalItems().intValue(), 2);
List<String> stores = Arrays.asList("workspace://SpacesStore", "archive://SpacesStore");
List<String> baseUrls = Arrays.asList("/solr/alfresco", "/solr/archive");
@@ -57,32 +58,73 @@ public class ShardInfoTest extends AbstractSearchServicesE2ETest
for (RestShardInfoModel shardInfoModel : entries)
{
RestShardInfoModel model = shardInfoModel.getModel();
assertEquals(model.getTemplate(), "rerank");
assertEquals(model.getMode(), "MASTER");
assertEquals(model.getShardMethod(), "DB_ID");
AssertJUnit.assertEquals(model.getTemplate(), "rerank");
AssertJUnit.assertEquals(model.getMode(), "MASTER");
AssertJUnit.assertEquals(model.getShardMethod(), "DB_ID");
assertTrue(model.getHasContent());
assertTrue(stores.contains(model.getStores()));
AssertJUnit.assertTrue(stores.contains(model.getStores()));
List<RestShardModel> shards = model.getShards();
assertNotNull(shards);
AssertJUnit.assertNotNull(shards);
RestShardModel shard = shards.iterator().next();
assertNotNull(shard);
AssertJUnit.assertNotNull(shard);
List<RestInstanceModel> instances = shard.getInstances();
assertNotNull(instances);
AssertJUnit.assertNotNull(instances);
RestInstanceModel instance = instances.iterator().next();
assertNotNull(instance);
AssertJUnit.assertNotNull(instance);
assertTrue(baseUrls.contains(instance.getBaseUrl()));
AssertJUnit.assertTrue(baseUrls.contains(instance.getBaseUrl()));
// TODO: Ideally Solr Host and Port should be Parameterised
assertEquals(instance.getHost(), "search");
assertEquals(instance.getPort().intValue(), 8983);
assertEquals(instance.getState(), "ACTIVE");
assertEquals(instance.getMode(), "MASTER");
AssertJUnit.assertEquals(instance.getHost(), "search");
AssertJUnit.assertEquals(instance.getPort().intValue(), 8983);
AssertJUnit.assertEquals(instance.getState(), "ACTIVE");
AssertJUnit.assertEquals(instance.getMode(), "MASTER");
}
}
@Test(groups={TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ACS_60n, TestGroup.ASS_MASTER_SLAVE})
public void getShardInfoWithAdminAuthorityMasterSlaveConfig() throws JsonProcessingException
{
RestShardInfoModelCollection info = restClient.authenticateUser(dataUser.getAdminUser()).withShardInfoAPI().getInfo();
restClient.assertStatusCodeIs(HttpStatus.OK);
info.assertThat().entriesListIsNotEmpty();
AssertJUnit.assertEquals(info.getPagination().getTotalItems().intValue(), 2);
List<String> stores = Arrays.asList("workspace://SpacesStore", "archive://SpacesStore");
List<String> baseUrls = Arrays.asList("/solr/alfresco", "/solr/archive");
List<RestShardInfoModel> entries = info.getEntries();
for (RestShardInfoModel shardInfoModel : entries)
{
RestShardInfoModel model = shardInfoModel.getModel();
AssertJUnit.assertEquals(model.getTemplate(), "rerank");
AssertJUnit.assertEquals(model.getMode(), "MIXED");
AssertJUnit.assertEquals(model.getShardMethod(), "DB_ID");
assertTrue(model.getHasContent());
AssertJUnit.assertTrue(stores.contains(model.getStores()));
List<RestShardModel> shards = model.getShards();
AssertJUnit.assertNotNull(shards);
RestShardModel shard = shards.iterator().next();
AssertJUnit.assertNotNull(shard);
List<RestInstanceModel> instances = shard.getInstances();
AssertJUnit.assertNotNull(instances);
RestInstanceModel instance = instances.iterator().next();
AssertJUnit.assertNotNull(instance);
AssertJUnit.assertTrue(baseUrls.contains(instance.getBaseUrl()));
AssertJUnit.assertEquals(instance.getHost(), "search");
AssertJUnit.assertEquals(instance.getState(), "ACTIVE");
AssertJUnit.assertEquals(instance.getMode(), "MIXED");
}
}
@Test(groups={TestGroup.SEARCH, TestGroup.REST_API, TestGroup.ACS_60n})
public void getShardInfoWithoutAdminAuthority() throws Exception
{