sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Store parent provider by actual type.

Browse Source
fix-message-formatting
Danny van Heumen 11 years ago
parent 2b73fd1ad3
commit 1d44622699
2 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File

15
src/net/java/sip/communicator/impl/protocol/irc/ChatRoomMemberIrcImpl.java
Unescape View File

@ -40,7 +40,7 @@ public class ChatRoomMemberIrcImpl
/**
* The provider that created us.
*/
private final ProtocolProviderService parentProvider;
private final ProtocolProviderServiceIrcImpl parentProvider;
/**
* Set of active roles.
@ -61,7 +61,8 @@ public class ChatRoomMemberIrcImpl
* @param chatRoomMemberRole the role that this member has in the
* corresponding chat room
*/
public ChatRoomMemberIrcImpl(final ProtocolProviderService parentProvider,
public ChatRoomMemberIrcImpl(
final ProtocolProviderServiceIrcImpl parentProvider,
final ChatRoom chatRoom, final String contactID,
final ChatRoomMemberRole chatRoomMemberRole)
{
@ -207,16 +208,14 @@ public byte[] getAvatar()
}
/**
* Returns null to indicate that there's no contact corresponding to the
* IRC member.
* Get the corresponding contact for a chat room member if it exists.
*
* @return null
* @return Contact instance if it exists, or null otherwise.
*/
public Contact getContact()
{
// FIXME look up contact via Persistent Presence OS. It might already
// exist.
return null;
return this.parentProvider.getPersistentPresence().findContactByID(
this.contactID);
}
/**

95
test/net/java/sip/communicator/impl/protocol/irc/ChatRoomMemberIrcImplTest.java
Unescape View File

@ -31,8 +31,8 @@ public void testConstructorNullProvider()
public void testConstructorNullChatRoom()
{
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
try
{
new ChatRoomMemberIrcImpl(provider, null, "user",
@ -48,8 +48,8 @@ public void testConstructorNullChatRoom()
public void testConstructorNullContactId()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
try
{
new ChatRoomMemberIrcImpl(provider, chatroom, null,
@ -65,8 +65,8 @@ public void testConstructorNullContactId()
public void testConstructorNullRole()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
try
{
new ChatRoomMemberIrcImpl(provider, chatroom, "user", null);
@ -81,8 +81,8 @@ public void testConstructorNullRole()
public void testConstructorSuccessful()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
Assert.assertNotNull(new ChatRoomMemberIrcImpl(provider, chatroom,
"user", ChatRoomMemberRole.SILENT_MEMBER));
}
@ -90,8 +90,8 @@ public void testConstructorSuccessful()
public void testCheckGetters()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
ChatRoomMemberIrcImpl member = new ChatRoomMemberIrcImpl(provider, chatroom,
"user", ChatRoomMemberRole.SILENT_MEMBER);
Assert.assertEquals(provider, member.getProtocolProvider());
@ -104,8 +104,8 @@ public void testCheckGetters()
public void testNameNull()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
ChatRoomMemberIrcImpl member =
new ChatRoomMemberIrcImpl(provider, chatroom, "user",
ChatRoomMemberRole.SILENT_MEMBER);
@ -125,8 +125,8 @@ public void testNameNull()
public void testNameChange()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
ChatRoomMemberIrcImpl member = new ChatRoomMemberIrcImpl(provider, chatroom,
"user", ChatRoomMemberRole.SILENT_MEMBER);
Assert.assertEquals("user", member.getContactAddress());
@ -139,8 +139,8 @@ public void testNameChange()
public void testRoleNull()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
ChatRoomMemberIrcImpl member =
new ChatRoomMemberIrcImpl(provider, chatroom, "user",
ChatRoomMemberRole.SILENT_MEMBER);
@ -150,8 +150,8 @@ public void testRoleNull()
public void testRoleUnchange()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
ChatRoomMemberIrcImpl member = new ChatRoomMemberIrcImpl(provider, chatroom,
"user", ChatRoomMemberRole.SILENT_MEMBER);
Assert.assertSame(ChatRoomMemberRole.SILENT_MEMBER, member.getRole());
@ -162,8 +162,8 @@ public void testRoleUnchange()
public void testAddSignificantRole()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
ChatRoomMemberIrcImpl member =
new ChatRoomMemberIrcImpl(provider, chatroom, "user",
ChatRoomMemberRole.SILENT_MEMBER);
@ -175,8 +175,8 @@ public void testAddSignificantRole()
public void testRemoveSignificantRole()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
ChatRoomMemberIrcImpl member =
new ChatRoomMemberIrcImpl(provider, chatroom, "user",
ChatRoomMemberRole.SILENT_MEMBER);
@ -189,8 +189,8 @@ public void testRemoveSignificantRole()
public void testAddInsignificantRole()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
ChatRoomMemberIrcImpl member =
new ChatRoomMemberIrcImpl(provider, chatroom, "user",
ChatRoomMemberRole.ADMINISTRATOR);
@ -202,8 +202,8 @@ public void testAddInsignificantRole()
public void testRemoveInsignificantRole()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
ChatRoomMemberIrcImpl member =
new ChatRoomMemberIrcImpl(provider, chatroom, "user",
ChatRoomMemberRole.ADMINISTRATOR);
@ -216,8 +216,11 @@ public void testRemoveInsignificantRole()
public void testGetContact()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
OperationSetPersistentPresenceIrcImpl pp = EasyMock.createMock(OperationSetPersistentPresenceIrcImpl.class);
EasyMock.expect(provider.getPersistentPresence()).andReturn(pp);
EasyMock.replay(provider);
ChatRoomMemberIrcImpl member = new ChatRoomMemberIrcImpl(provider, chatroom,
"user", ChatRoomMemberRole.SILENT_MEMBER);
Assert.assertNull(member.getContact());
@ -226,8 +229,8 @@ public void testGetContact()
public void testGetAvatar()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
ChatRoomMemberIrcImpl member = new ChatRoomMemberIrcImpl(provider, chatroom,
"user", ChatRoomMemberRole.SILENT_MEMBER);
Assert.assertNull(member.getAvatar());
@ -236,8 +239,8 @@ public void testGetAvatar()
public void testEqualsSame()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
ChatRoomMemberIrcImpl member = new ChatRoomMemberIrcImpl(provider, chatroom,
"user", ChatRoomMemberRole.SILENT_MEMBER);
Assert.assertTrue(member.equals(member));
@ -246,8 +249,8 @@ public void testEqualsSame()
public void testEqualsNull()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
ChatRoomMemberIrcImpl member = new ChatRoomMemberIrcImpl(provider, chatroom,
"user", ChatRoomMemberRole.SILENT_MEMBER);
Assert.assertFalse(member.equals(null));
@ -256,8 +259,8 @@ public void testEqualsNull()
public void testEqualsObject()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
ChatRoomMemberIrcImpl member = new ChatRoomMemberIrcImpl(provider, chatroom,
"user", ChatRoomMemberRole.SILENT_MEMBER);
Assert.assertFalse(member.equals(new Object()));
@ -266,12 +269,12 @@ public void testEqualsObject()
public void testEqualsSameUserDifferentProvider()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
ChatRoomMemberIrcImpl member1 = new ChatRoomMemberIrcImpl(provider, chatroom,
"user", ChatRoomMemberRole.SILENT_MEMBER);
ProtocolProviderService provider2 =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider2 =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
ChatRoomMemberIrcImpl member2 = new ChatRoomMemberIrcImpl(provider2, chatroom,
"user", ChatRoomMemberRole.SILENT_MEMBER);
Assert.assertFalse(member1.equals(member2));
@ -280,8 +283,8 @@ public void testEqualsSameUserDifferentProvider()
public void testEqualsSameProviderDifferentUser()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
ChatRoomMemberIrcImpl member1 = new ChatRoomMemberIrcImpl(provider, chatroom,
"user", ChatRoomMemberRole.SILENT_MEMBER);
ChatRoomMemberIrcImpl member2 = new ChatRoomMemberIrcImpl(provider, chatroom,
@ -292,8 +295,8 @@ public void testEqualsSameProviderDifferentUser()
public void testEqualsTrue()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
ChatRoomMemberIrcImpl member1 = new ChatRoomMemberIrcImpl(provider, chatroom,
"susy", ChatRoomMemberRole.SILENT_MEMBER);
ChatRoomMemberIrcImpl member2 = new ChatRoomMemberIrcImpl(provider, chatroom,
@ -304,8 +307,8 @@ public void testEqualsTrue()
public void testHashcodeNotFailing()
{
ChatRoom chatroom = EasyMock.createMock(ChatRoom.class);
ProtocolProviderService provider =
EasyMock.createMock(ProtocolProviderService.class);
ProtocolProviderServiceIrcImpl provider =
EasyMock.createMock(ProtocolProviderServiceIrcImpl.class);
ChatRoomMemberIrcImpl member =
new ChatRoomMemberIrcImpl(provider, chatroom, "ET",
ChatRoomMemberRole.ADMINISTRATOR);

Write Preview
Loading…
Cancel
Save