inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-10-08 14:51:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up formatting

Browse Source
This commit is contained in:
Michael Suzuki
2016-08-16 10:53:54 +01:00
parent ccfe13076a
commit 30a2eca092
2 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
search-services/alfresco-solr/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedTest.java
View File

@@ -256,7 +256,8 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
* @param waitMillis
* @throws Exception
*/
public void waitForDocCountAllCores(Query query, int count, long waitMillis) throws Exception {
public void waitForDocCountAllCores(Query query, int count, long waitMillis) throws Exception
{
List<SolrCore> cores = getJettyCores(jettyContainers.values());
cores.addAll(getJettyCores(jettyShards));
@@ -273,10 +274,9 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
* @param waitMillis
* @throws Exception
*/
public void waitForDocCount(Query query, int count, long waitMillis) throws Exception {
public void waitForDocCount(Query query, int count, long waitMillis) throws Exception
{
long begin = System.currentTimeMillis();
List<SolrCore> cores = getJettyCores(jettyContainers.values());
//TODO: Support multiple cores per jetty
SolrCore controlCore = cores.get(0); //Get the first one
@@ -292,7 +292,8 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
* @param start
* @throws Exception
*/
public void waitForShardsCount(Query query, int count, long waitMillis, long start) throws Exception {
public void waitForShardsCount(Query query, int count, long waitMillis, long start) throws Exception
{
List<SolrCore> cores = getJettyCores(jettyShards);
long timeOut = start+waitMillis;
int totalCount = 0;
@@ -323,7 +324,8 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
protected List<SolrCore> getJettyCores(Collection<JettySolrRunner> runners)
{
List<SolrCore> cores = new ArrayList();
for (JettySolrRunner jettySolrRunner : runners) {
for (JettySolrRunner jettySolrRunner : runners)
{
jettySolrRunner.getCoreContainer().getCores().forEach(aCore -> cores.add(aCore));
}
return cores;
@@ -338,19 +340,25 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
return jettyClients.get(DEFAULT_TEST_CORENAME);
}
public void assertNodesPerShardGreaterThan(int count) throws Exception {
public void assertNodesPerShardGreaterThan(int count) throws Exception
{
List<SolrCore> cores = getJettyCores(jettyShards);
Query query = new TermQuery(new Term(FIELD_DOC_TYPE, SolrInformationServer.DOC_TYPE_NODE));
for (SolrCore core : cores) {
for (SolrCore core : cores)
{
RefCounted<SolrIndexSearcher> refCounted = null;
try {
try
{
refCounted = core.getSearcher();
SolrIndexSearcher searcher = refCounted.get();
TopDocs topDocs = searcher.search(query, 10);
if(topDocs.totalHits < count) {
if(topDocs.totalHits < count)
{
throw new Exception("Expected nodes per shard greater than "+count+" found "+topDocs.totalHits+" : "+query.toString());
}
} finally {
}
finally
{
refCounted.decref();
}
}
@@ -469,7 +477,8 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
JettySolrRunner jsr = createJetty(jettyKey);
jettyContainers.put(jettyKey, jsr);
for (int i = 0; i < coreNames.length; i++) {
for (int i = 0; i < coreNames.length; i++)
{
addCoreToJetty(jettyKey, coreNames[i], coreNames[i], additionalProperties);
}
@@ -477,7 +486,8 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
startJetty(jsr);
int jettyPort = jsr.getLocalPort();
for (int i = 0; i < coreNames.length; i++) {
for (int i = 0; i < coreNames.length; i++)
{
String url = buildUrl(jettyPort) + "/" + coreNames[i];
log.info(url);
jettyClients.put(coreNames[i], createNewSolrClient(url));

4
search-services/alfresco-solr/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerTest.java
View File

@@ -116,14 +116,14 @@ public class DistributedAclIdAlfrescoSolrTrackerTest extends AbstractAlfrescoDis
}
}
protected ShardMethodEnum getShardMethod() {
protected ShardMethodEnum getShardMethod()
{
Random random = random();
List<ShardMethodEnum> methods = new ArrayList();
methods.add(ShardMethodEnum.ACL_ID);
methods.add(ShardMethodEnum.MOD_ACL_ID);
Collections.shuffle(methods, random);
return methods.get(0);
}
}