From ae7a91d0c8c66dda83025a8c93049954ccb5216f Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Fri, 29 Sep 2006 11:11:01 +0000
Subject: Add use of SERVER_ADDRESS and SERVER_PORT

---
 .../protocol/jabber/TestAccountInstallation.java   | 46 ++++++----------------
 1 file changed, 12 insertions(+), 34 deletions(-)

(limited to 'test')

diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/TestAccountInstallation.java b/test/net/java/sip/communicator/slick/protocol/jabber/TestAccountInstallation.java
index 076fc1f..105a190 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/TestAccountInstallation.java
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/TestAccountInstallation.java
@@ -198,41 +198,19 @@ public class TestAccountInstallation
 
         table.put(ProtocolProviderFactory.PASSWORD, passwd);
 
-//        String serverAddress = System.getProperty(
-//            accountPrefix + ProtocolProviderFactory.SERVER_ADDRESS, null );
-//
-//        assertNotNull(
-//            "The system property named "
-//            + accountPrefix + ProtocolProviderFactory.SERVER_ADDRESS
-//            +" has to contain a valid server address to use for testing."
-//            , serverAddress);
-//
-//        table.put(ProtocolProviderFactory.SERVER_ADDRESS, serverAddress);
-//
-//        String serverPort = System.getProperty(
-//            accountPrefix + ProtocolProviderFactory.SERVER_PORT, null );
-//
-//        if(serverPort != null)
-//        {
-//            table.put(ProtocolProviderFactory.SERVER_PORT, serverPort);
-//        }
-//
-//        String proxyAddress = System.getProperty(
-//            accountPrefix + ProtocolProviderFactory.PROXY_ADDRESS, null );
-//
-//        if(serverPort != null)
-//        {
-//            table.put(ProtocolProviderFactory.PROXY_ADDRESS, proxyAddress);
-//
-//            String proxyPort = System.getProperty(
-//            accountPrefix + ProtocolProviderFactory.PROXY_PORT, null );
-//
-//            if(proxyPort != null)
-//            {
-//                table.put(ProtocolProviderFactory.PROXY_PORT, proxyPort);
-//            }
-//        }
+        String serverAddress = System.getProperty(
+                    accountPrefix + ProtocolProviderFactory.SERVER_ADDRESS, null);
 
+        // optional
+        if(serverAddress != null)
+            table.put(ProtocolProviderFactory.SERVER_ADDRESS, serverAddress);
+
+        String serverPort = System.getProperty(
+                    accountPrefix + ProtocolProviderFactory.SERVER_PORT, null);
+
+        // optional
+        if(serverPort != null)
+            table.put(ProtocolProviderFactory.SERVER_PORT, serverPort);
 
         return table;
     }
-- 
cgit v1.1