From a289689d005c768763ef6052fc5f25e840da3dc3 Mon Sep 17 00:00:00 2001 From: Yana Stamcheva Date: Mon, 5 Jul 2010 17:34:39 +0000 Subject: [PATCH] Fix sip tests. --- .../service/protocol/ProtocolProviderFactory.java | 6 +++++- .../slick/protocol/sip/TestAccountInstallation.java | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java b/src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java index e2091fb96..63b5104b9 100644 --- a/src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java +++ b/src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java @@ -601,7 +601,11 @@ public AccountID loadAccount(Map accountProperties) */ public boolean loadAccount(AccountID accountID) { - String userID = accountID.getUserID(); + // Need to obtain the original user id property, instead of calling + // accountID.getUserID(), because this method could return a modified + // version of the user id property. + String userID = accountID + .getAccountPropertyString(ProtocolProviderFactory.USER_ID); ProtocolProviderService service = createService(userID, accountID); diff --git a/test/net/java/sip/communicator/slick/protocol/sip/TestAccountInstallation.java b/test/net/java/sip/communicator/slick/protocol/sip/TestAccountInstallation.java index 25a1f12f7..7c9336ed2 100644 --- a/test/net/java/sip/communicator/slick/protocol/sip/TestAccountInstallation.java +++ b/test/net/java/sip/communicator/slick/protocol/sip/TestAccountInstallation.java @@ -102,7 +102,6 @@ public void testInstallAccount() sipAccount2Properties.get(ProtocolProviderFactory.USER_ID) , sipAccount2Properties); - //try to install one of the accounts one more time and verify that an //excepion is thrown. try{ @@ -126,7 +125,6 @@ public void testInstallAccount() //Verify protocol providers corresponding to the new account have //been properly registered with the osgi framework. - osgiFilter = "(&("+ProtocolProviderFactory.PROTOCOL +"="+ProtocolNames.SIP+")" +"(" + ProtocolProviderFactory.USER_ID @@ -146,7 +144,7 @@ public void testInstallAccount() fail(osgiFilter + "is not a valid osgi filter"); } - assertTrue("An ICQ protocol provider was apparently not installed as " + assertTrue("A SIP protocol provider was apparently not installed as " + "requested." , serRefs != null && serRefs.length > 0);