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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
77117: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73330: ACE-1690: SOLR 4 - Index nodes with bulk fetch for metadata
         - Added factory test and property exposer
         - Used exposed properties in CoreWatcherJob 
         - TODO: MetadataTracker


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77967 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-23 15:29:09 +00:00
parent 3fe12973dd
commit 800322d439
2 changed files with 107 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
search-services/alfresco-solrclient-lib/pom.xml
View File

@@ -36,6 +36,15 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
</dependencies>
<build>

98
search-services/alfresco-solrclient-lib/source/test-java/org/alfresco/solr/client/SOLRAPIClientFactoryTest.java Normal file
View File

@@ -0,0 +1,98 @@
/*
* Copyright (C) 2005-2014 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.solr.client;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.mockito.Mockito.when;
import java.util.Properties;
import org.alfresco.encryption.KeyResourceLoader;
import org.alfresco.repo.dictionary.NamespaceDAO;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.solr.client.SOLRAPIClient;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
public class SOLRAPIClientFactoryTest
{
@Mock
private Properties props;
@Mock
private KeyResourceLoader keyResourceLoader;
@Mock
private DictionaryService dictionaryService;
@Mock
private NamespaceDAO namespaceDAO;
private SOLRAPIClientFactory factory;
@Before
public void setUp() throws Exception
{
when(props.getProperty("alfresco.host", "localhost")).thenReturn("localhost");
when(props.getProperty("alfresco.port", "8080")).thenReturn("8080");
when(props.getProperty("alfresco.port.ssl", "8443")).thenReturn("8443");
when(props.getProperty("alfresco.maxTotalConnections", "40")).thenReturn("40");
when(props.getProperty("alfresco.maxHostConnections", "40")).thenReturn("40");
when(props.getProperty("alfresco.socketTimeout", "0")).thenReturn("0");
when(props.getProperty("alfresco.secureComms", "https")).thenReturn("none");
when(props.getProperty("alfresco.encryption.ssl.keystore.location",
"ssl.repo.client.keystore")).thenReturn("ssl.repo.client.keystore");
when(props.getProperty("alfresco.encryption.ssl.truststore.location",
"ssl.repo.client.truststore")).thenReturn("ssl.repo.client.truststore");
this.factory = new SOLRAPIClientFactory();
}
@Test
public void getsSameSOLRAPIClientForSameAlfresco()
{
SOLRAPIClient solrapiClient = factory.getSOLRAPIClient(props, keyResourceLoader, dictionaryService,
namespaceDAO);
assertNotNull(solrapiClient);
SOLRAPIClient solrapiClient2 = factory.getSOLRAPIClient(props, keyResourceLoader, dictionaryService,
namespaceDAO);
assertNotNull(solrapiClient2);
assertSame(solrapiClient, solrapiClient2);
}
@Test
public void getsDifferentSOLRAPIClientForDifferentAlfresco()
{
SOLRAPIClient solrapiClient = factory.getSOLRAPIClient(props, keyResourceLoader, dictionaryService,
namespaceDAO);
assertNotNull(solrapiClient);
when(props.getProperty("alfresco.port.ssl", "8443")).thenReturn("8444");
SOLRAPIClient solrapiClient2 = factory.getSOLRAPIClient(props, keyResourceLoader, dictionaryService,
namespaceDAO);
assertNotNull(solrapiClient2);
assertNotSame(solrapiClient, solrapiClient2);
}
}