Fix sip tests.

src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java

@@ -601,7 +601,11 @@ public AccountID loadAccount(Map<String, String> 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);
 

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);