diff options
| author | paweldomas <pawel.domas@jitsi.org> | 2013-06-19 14:48:40 +0200 |
|---|---|---|
| committer | paweldomas <pawel.domas@jitsi.org> | 2013-06-19 14:48:40 +0200 |
| commit | ad770cf157d15e9bbfdb4a033d65f37d40862829 (patch) | |
| tree | f4545de60a116c1a746b6ee4a6aabc620157dde9 /test | |
| parent | 6ae5d6b90f2a933f7b7ba4cc09811027fb10e535 (diff) | |
| parent | 0282935ebd1ee3093639ed2084e53b144eaf861e (diff) | |
| download | jitsi-ad770cf157d15e9bbfdb4a033d65f37d40862829.zip jitsi-ad770cf157d15e9bbfdb4a033d65f37d40862829.tar.gz jitsi-ad770cf157d15e9bbfdb4a033d65f37d40862829.tar.bz2 | |
Merge branch 'Android-settings'
Diffstat (limited to 'test')
3 files changed, 11 insertions, 9 deletions
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/SipProtocolProviderServiceLick.java b/test/net/java/sip/communicator/slick/protocol/sip/SipProtocolProviderServiceLick.java index daf5be8..9beb088 100644 --- a/test/net/java/sip/communicator/slick/protocol/sip/SipProtocolProviderServiceLick.java +++ b/test/net/java/sip/communicator/slick/protocol/sip/SipProtocolProviderServiceLick.java @@ -10,6 +10,7 @@ import java.util.*; import junit.framework.*; +import net.java.sip.communicator.service.protocol.sip.*; import org.osgi.framework.*; /** @@ -53,7 +54,8 @@ public class SipProtocolProviderServiceLick /** * The name of the property the value of which is XCAP server uri. */ - public static final String XCAP_SERVER_PROPERTY_NAME = "XCAP_SERVER"; + public static final String XCAP_SERVER_PROPERTY_NAME + = SipAccountID.OPT_CLIST_SERVER_URI; /** * Initializes and registers all tests that we'll run as a part of this 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 a77a2e8..cc47fad 100644 --- a/test/net/java/sip/communicator/slick/protocol/sip/TestAccountInstallation.java +++ b/test/net/java/sip/communicator/slick/protocol/sip/TestAccountInstallation.java @@ -9,9 +9,9 @@ package net.java.sip.communicator.slick.protocol.sip; import java.util.*; import junit.framework.*; -import net.java.sip.communicator.impl.protocol.sip.*; import net.java.sip.communicator.service.protocol.*; +import net.java.sip.communicator.service.protocol.sip.*; import org.osgi.framework.*; public class TestAccountInstallation @@ -249,13 +249,13 @@ public class TestAccountInstallation SipProtocolProviderServiceLick.XCAP_SERVER_PROPERTY_NAME, null); if (xCapServerUri != null) { - table.put(ServerStoredContactListSipImpl.XCAP_ENABLE, + table.put(SipAccountID.XCAP_ENABLE, Boolean.TRUE.toString()); - table.put(ServerStoredContactListSipImpl.XCAP_USE_SIP_CREDETIALS, + table.put(SipAccountID.OPT_CLIST_USE_SIP_CREDETIALS, Boolean.TRUE.toString()); - table.put(ServerStoredContactListSipImpl.XCAP_USE_SIP_CREDETIALS, + table.put(SipAccountID.OPT_CLIST_USER, Boolean.TRUE.toString()); - table.put(ServerStoredContactListSipImpl.XCAP_SERVER_URI, + table.put(SipAccountID.OPT_CLIST_SERVER_URI, xCapServerUri); } diff --git a/test/net/java/sip/communicator/slick/protocol/sip/TestAutoProxyDetection.java b/test/net/java/sip/communicator/slick/protocol/sip/TestAutoProxyDetection.java index a3bad92..00dd8af 100644 --- a/test/net/java/sip/communicator/slick/protocol/sip/TestAutoProxyDetection.java +++ b/test/net/java/sip/communicator/slick/protocol/sip/TestAutoProxyDetection.java @@ -31,7 +31,7 @@ public class TestAutoProxyDetection {
private static class TestedAutoProxyDetection extends AutoProxyConnection
{
- public TestedAutoProxyDetection(SipAccountID account,
+ public TestedAutoProxyDetection(SipAccountIDImpl account,
String defaultTransport)
{
super(account, defaultTransport);
@@ -48,7 +48,7 @@ public class TestAutoProxyDetection }
}
- private SipAccountID account;
+ private SipAccountIDImpl account;
private TestedAutoProxyDetection.NetworkUtils nu;
private SRVRecord srv1;
private SRVRecord srv2;
@@ -67,7 +67,7 @@ public class TestAutoProxyDetection @Override
public void setUp()
{
- account = createMock(SipAccountID.class);
+ account = createMock(SipAccountIDImpl.class);
expect(account.getAccountPropertyString(USER_ID))
.andReturn("unit@" + DOMAIN);
replay(account);
|