aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2010-01-18 14:44:27 +0000
committerDamian Minkov <damencho@jitsi.org>2010-01-18 14:44:27 +0000
commit030f0ea5b3a2c61d20e470b53bdbd3259676966b (patch)
treeab585a17f6624edf1e4a42d14266b478bf879bb4 /test
parent8c2dae73643d9b8a779671d192cdd7402cca609a (diff)
downloadjitsi-030f0ea5b3a2c61d20e470b53bdbd3259676966b.zip
jitsi-030f0ea5b3a2c61d20e470b53bdbd3259676966b.tar.gz
jitsi-030f0ea5b3a2c61d20e470b53bdbd3259676966b.tar.bz2
Enable sip tests, telephony and messaging (without presence).
Diffstat (limited to 'test')
-rw-r--r--test/net/java/sip/communicator/slick/protocol/sip/SipProtocolProviderServiceLick.java8
-rw-r--r--test/net/java/sip/communicator/slick/protocol/sip/SipSlickFixture.java5
2 files changed, 9 insertions, 4 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 c278d0c..e19a911 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/SipProtocolProviderServiceLick.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/SipProtocolProviderServiceLick.java
@@ -80,13 +80,13 @@ public class SipProtocolProviderServiceLick
addTestSuite(TestProtocolProviderServiceSipImpl.class);
// presence tests
- addTest(TestOperationSetPresence.suite());
+// addTest(TestOperationSetPresence.suite());
// only in online mode
- if (!SipSlickFixture.onlineTestingDisabled) {
-
+ if (!SipSlickFixture.onlineTestingDisabled)
+ {
// persistent presence
- addTest(TestOperationSetPersistentPresence.suite());
+// addTest(TestOperationSetPersistentPresence.suite());
//IM test
addTest(TestOperationSetBasicInstantMessaging.suite());
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/SipSlickFixture.java b/test/net/java/sip/communicator/slick/protocol/sip/SipSlickFixture.java
index d9375e7..28ab932 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/SipSlickFixture.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/SipSlickFixture.java
@@ -317,5 +317,10 @@ public class SipSlickFixture
}
citer = rootGroup2.contacts();
}
+
+ // be gentle to servers
+ synchronized(lock){
+ lock.wait(5000);
+ }
}
}