From bfb5f3a8eb08db001e611254fa300c107d27d50b Mon Sep 17 00:00:00 2001 From: Danny van Heumen Date: Sat, 2 Aug 2014 01:07:19 +0200 Subject: [PATCH] Specialized hashCode(), includes test. --- .../impl/protocol/irc/ChatRoomMemberIrcImpl.java | 7 ++----- .../impl/protocol/irc/ChatRoomMemberIrcImplTest.java | 11 +++++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/net/java/sip/communicator/impl/protocol/irc/ChatRoomMemberIrcImpl.java b/src/net/java/sip/communicator/impl/protocol/irc/ChatRoomMemberIrcImpl.java index ab872bd22..3f233c70d 100644 --- a/src/net/java/sip/communicator/impl/protocol/irc/ChatRoomMemberIrcImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/irc/ChatRoomMemberIrcImpl.java @@ -225,11 +225,8 @@ public int hashCode() { final int prime = 31; int result = 1; - result = - prime * result + ((contactID == null) ? 0 : contactID.hashCode()); - result = - prime * result - + ((parentProvider == null) ? 0 : parentProvider.hashCode()); + result = prime * result + contactID.hashCode(); + result = prime * result + parentProvider.hashCode(); return result; } diff --git a/test/net/java/sip/communicator/impl/protocol/irc/ChatRoomMemberIrcImplTest.java b/test/net/java/sip/communicator/impl/protocol/irc/ChatRoomMemberIrcImplTest.java index 2761f9dc1..20a931bd9 100644 --- a/test/net/java/sip/communicator/impl/protocol/irc/ChatRoomMemberIrcImplTest.java +++ b/test/net/java/sip/communicator/impl/protocol/irc/ChatRoomMemberIrcImplTest.java @@ -300,4 +300,15 @@ public void testEqualsTrue() "susy", ChatRoomMemberRole.SILENT_MEMBER); Assert.assertTrue(member1.equals(member2)); } + + public void testHashcodeNotFailing() + { + ChatRoom chatroom = EasyMock.createMock(ChatRoom.class); + ProtocolProviderService provider = + EasyMock.createMock(ProtocolProviderService.class); + ChatRoomMemberIrcImpl member = + new ChatRoomMemberIrcImpl(provider, chatroom, "ET", + ChatRoomMemberRole.ADMINISTRATOR); + member.hashCode(); + } }