aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2006-09-29 11:11:01 +0000
committerDamian Minkov <damencho@jitsi.org>2006-09-29 11:11:01 +0000
commitae7a91d0c8c66dda83025a8c93049954ccb5216f (patch)
treeb6750d4c4ea2c4e1bc97503ddf80701922d31751 /test
parent595d1bf1d364f4d09e9a6566eb315970281d257c (diff)
downloadjitsi-ae7a91d0c8c66dda83025a8c93049954ccb5216f.zip
jitsi-ae7a91d0c8c66dda83025a8c93049954ccb5216f.tar.gz
jitsi-ae7a91d0c8c66dda83025a8c93049954ccb5216f.tar.bz2
Add use of SERVER_ADDRESS and SERVER_PORT
Diffstat (limited to 'test')
-rw-r--r--test/net/java/sip/communicator/slick/protocol/jabber/TestAccountInstallation.java46
1 files changed, 12 insertions, 34 deletions
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;
}