aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2008-11-26 16:07:29 +0000
committerDamian Minkov <damencho@jitsi.org>2008-11-26 16:07:29 +0000
commit09cce621a1e1096d0d7a76f0ea17f7ace5311c38 (patch)
tree0b4cb47dfb00046dbd8ec4f1a540cd7c75eaa889
parent7927f460e318132cc8a5f1a2869c3ae2f55fb971 (diff)
downloadjitsi-09cce621a1e1096d0d7a76f0ea17f7ace5311c38.zip
jitsi-09cce621a1e1096d0d7a76f0ea17f7ace5311c38.tar.gz
jitsi-09cce621a1e1096d0d7a76f0ea17f7ace5311c38.tar.bz2
Disable video support during tests.
-rw-r--r--test/net/java/sip/communicator/slick/media/MediaServiceLick.java11
-rw-r--r--test/net/java/sip/communicator/slick/media/media.slick.manifest.mf1
2 files changed, 12 insertions, 0 deletions
diff --git a/test/net/java/sip/communicator/slick/media/MediaServiceLick.java b/test/net/java/sip/communicator/slick/media/MediaServiceLick.java
index e88fa3d..9db93db 100644
--- a/test/net/java/sip/communicator/slick/media/MediaServiceLick.java
+++ b/test/net/java/sip/communicator/slick/media/MediaServiceLick.java
@@ -10,6 +10,7 @@ import java.util.*;
import org.osgi.framework.*;
import junit.framework.*;
+import net.java.sip.communicator.service.configuration.*;
import net.java.sip.communicator.service.media.*;
import net.java.sip.communicator.util.*;
@@ -44,6 +45,16 @@ public class MediaServiceLick
Hashtable properties = new Hashtable();
properties.put("service.pid", getName());
+ // disable video support when testing
+ ServiceReference confReference
+ = bundleContext.getServiceReference(
+ ConfigurationService.class.getName());
+ ConfigurationService configurationService
+ = (ConfigurationService) bundleContext.getService(confReference);
+ configurationService.setProperty(
+ MediaService.DISABLE_VIDEO_SUPPORT_PROPERTY_NAME,
+ Boolean.TRUE.toString());
+
addTestSuite(TestMediaService.class);
bundleContext.registerService(getClass().getName(), this, properties);
diff --git a/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf b/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf
index efec7bd..a4c2d39 100644
--- a/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/media/media.slick.manifest.mf
@@ -5,6 +5,7 @@ Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
Import-Package: org.osgi.framework,
junit.framework,
+ net.java.sip.communicator.service.configuration,
net.java.sip.communicator.slick.media,
net.java.sip.communicator.service.media,
net.java.sip.communicator.service.media.event,