inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/DEV/mward/cifs_hazelcast_conf to HEAD:

Browse Source 
36614: ALF-13822: Renamed JGroupsKeepAliveHeartbeatReceiver.
   36615: ALF-13822: renamed JGroupsKeepAliveHeartbeatSender.
   36616: ALF-13822: renamed JGroupsRMICacheManagerPeerProvider.
   36626: ALF-13822: renamed package from jgroups to cluster.
   36642: ALF-13822: remove jgroupsChannelFactory from bootstrap-context.xml, exchange for Hazelcast.
   36648: ALF-13822: remove jgroups references from RMICacheManagerPeerProvider.
   36649: ALF-13822: Replaced jgroups with hazelcast in ehcache testing context.
   36650: ALF-13822: Renamed ehcache test context and config so that jgroups not in name.
   36651: ALF-13822: renamed jgroups package to ehcache.
   36652: ALF-13822: Fix broken test from XML file renames.
   36653: ALF-13822: rename file so that it doesn't have jgroups in the name.
   36667: ALF-13822: removed some commented out jgroups code.
   36679: ALF-13822: reimplemented membership change logging for KeepAliveHeartbeatReceiver.
   36680: ALF-13822: remove redundant JGroups properties from clusterPropertySetter
   36681: ALF-13822: remove redundant properties from repository.properties.
   36682: ALF-13822: remove jgroups configuration files.
   36683: ALF-13822: remove jgroups messenger abstraction classes.
   36684: ALF-13822: removed jgroups test XML
   36685: ALF-13822: remove AlfrescoJGroupsChannelFactory.
   36686: ALF-13822: updated comment to include word hazelcast rather than jgroups.
   36687: ALF-13822: removed jgroups from comment
   36688: ALF-13822: removed jgroups from comment
   36689: ALF-13822: removed jgroups comment as no longer relavent
   36697: ALF-13822: removed jgroups from ant build files.
   36704: ALF-13822: removed jgroups libraries.
   36707: ALF-13822: removed jgroups source zip.
   36708: ALF-13822: removed jgroups form installer license file.
   36710: ALF-13822: removed jgroups lib from 3rd-party eclipse project's classpath.
   36731: ALF-13822: removed mentions of jgroups from JLAN.
   36761: ALF-13822: fixed hazelcast TCP config - removed ever-present loopback interface.
   36762: ALF-13822: improved logging of KeepAliveHeartbeatReceiver and added toString() for HazelcastMessenger.
   36990: ALF-13822: fixed AWS placeholder properties and added interface binding properties.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@37008 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2012-05-25 15:11:50 +00:00
parent 1236e1ef84
commit 18ad785d32
31 changed files with 233 additions and 3837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/repo/cluster/HazelcastMessengerFactoryTest.java
View File

@@ -19,7 +19,7 @@
package org.alfresco.repo.cluster;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.mockito.Mockito.when;
@@ -31,8 +31,6 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import com.hazelcast.config.Config;
import com.hazelcast.config.GroupConfig;
import com.hazelcast.core.Cluster;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.core.ITopic;
@@ -48,19 +46,20 @@ import com.hazelcast.core.Member;
public class HazelcastMessengerFactoryTest
{
private HazelcastMessengerFactory factory;
private GroupConfig groupConfig;
private @Mock HazelcastInstance hazelcast;
private @Mock Member member;
private @Mock Cluster cluster;
private @Mock ITopic<String> topic;
private @Mock Config config;
private @Mock HazelcastInstanceFactory hazelcastInstanceFactory;
@Before
public void setUp()
{
factory = new HazelcastMessengerFactory();
factory.setHazelcast(hazelcast);
groupConfig = new GroupConfig();
factory.setHazelcastInstanceFactory(hazelcastInstanceFactory);
when(hazelcastInstanceFactory.isClusteringEnabled()).thenReturn(true);
when(hazelcastInstanceFactory.getInstance()).thenReturn(hazelcast);
}
@Test
@@ -80,13 +79,9 @@ public class HazelcastMessengerFactoryTest
@Test
public void canCheckClusterIsActive()
{
when(hazelcast.getConfig()).thenReturn(config);
when(config.getGroupConfig()).thenReturn(groupConfig);
groupConfig.setName("my-cluster-name");
assertEquals(true, factory.isClusterActive());
groupConfig.setName("");
when(hazelcastInstanceFactory.isClusteringEnabled()).thenReturn(false);
assertEquals(false, factory.isClusterActive());
}
}