diff options
22 files changed, 37 insertions, 2 deletions
diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties index 504ca50..0a45447 100644 --- a/lib/felix.unit.test.properties +++ b/lib/felix.unit.test.properties @@ -60,7 +60,11 @@ felix.auto.start.30= \ reference:file:sc-bundles/fileaccess.jar felix.auto.start.31= \ - reference:file:sc-bundles/configuration.jar + reference:file:sc-bundles/configuration.jar \ + reference:file:sc-bundles/notification-service.jar + +felix.auto.start.32= \ + reference:file:sc-bundles/dns.jar felix.auto.start.40= \ reference:file:sc-bundles/hid.jar \ @@ -106,7 +110,6 @@ felix.auto.start.60= \ reference:file:sc-bundles/callhistory.jar \ reference:file:sc-bundles/filehistory.jar \ reference:file:sc-bundles/metahistory.jar \ - reference:file:sc-bundles/notification-service.jar \ reference:file:sc-bundles/plugin-nimbuzzavatars.jar \ reference:file:sc-bundles/osdependent.jar diff --git a/test/net/java/sip/communicator/slick/callhistory/callhistory.slick.manifest.mf b/test/net/java/sip/communicator/slick/callhistory/callhistory.slick.manifest.mf index 9026cc5..b11eab4 100755..100644 --- a/test/net/java/sip/communicator/slick/callhistory/callhistory.slick.manifest.mf +++ b/test/net/java/sip/communicator/slick/callhistory/callhistory.slick.manifest.mf @@ -18,6 +18,7 @@ Import-Package: junit.framework, org.w3c.dom, javax.xml.parsers, net.java.sip.communicator.util, + net.java.sip.communicator.util.dns, net.java.sip.communicator.util.xml, javax.xml.transform, javax.xml.transform.dom, diff --git a/test/net/java/sip/communicator/slick/configuration/configuration.slick.manifest.mf b/test/net/java/sip/communicator/slick/configuration/configuration.slick.manifest.mf index 2f6c805..8814bbe 100644 --- a/test/net/java/sip/communicator/slick/configuration/configuration.slick.manifest.mf +++ b/test/net/java/sip/communicator/slick/configuration/configuration.slick.manifest.mf @@ -10,6 +10,7 @@ Import-Package: junit.framework, org.w3c.dom, javax.xml.parsers, net.java.sip.communicator.util, + net.java.sip.communicator.util.dns, net.java.sip.communicator.util.xml, javax.xml.transform, javax.xml.transform.dom, diff --git a/test/net/java/sip/communicator/slick/contactlist/meta.cl.slick.manifest.mf b/test/net/java/sip/communicator/slick/contactlist/meta.cl.slick.manifest.mf index b427e58..685edc2 100644 --- a/test/net/java/sip/communicator/slick/contactlist/meta.cl.slick.manifest.mf +++ b/test/net/java/sip/communicator/slick/contactlist/meta.cl.slick.manifest.mf @@ -9,6 +9,7 @@ Import-Package: net.java.sip.communicator.service.contactlist, org.osgi.framework, junit.framework, net.java.sip.communicator.util, + net.java.sip.communicator.util.dns, net.java.sip.communicator.service.configuration, net.java.sip.communicator.service.protocol, net.java.sip.communicator.service.protocol.icqconstants, diff --git a/test/net/java/sip/communicator/slick/credentialsstorage/credentialsstorage.slick.manifest.mf b/test/net/java/sip/communicator/slick/credentialsstorage/credentialsstorage.slick.manifest.mf index c53903d..3c5245b 100644 --- a/test/net/java/sip/communicator/slick/credentialsstorage/credentialsstorage.slick.manifest.mf +++ b/test/net/java/sip/communicator/slick/credentialsstorage/credentialsstorage.slick.manifest.mf @@ -7,5 +7,6 @@ System-Bundle: yes Import-Package: junit.framework, net.java.sip.communicator.service.credentialsstorage, net.java.sip.communicator.util, + net.java.sip.communicator.util.dns, org.osgi.framework Export-Package: net.java.sip.communicator.slick.credentialsstorage diff --git a/test/net/java/sip/communicator/slick/fileaccess/fileaccess.slick.manifest.mf b/test/net/java/sip/communicator/slick/fileaccess/fileaccess.slick.manifest.mf index 110812d..6c9ac4c 100644 --- a/test/net/java/sip/communicator/slick/fileaccess/fileaccess.slick.manifest.mf +++ b/test/net/java/sip/communicator/slick/fileaccess/fileaccess.slick.manifest.mf @@ -12,6 +12,7 @@ Import-Package: junit.framework, org.w3c.dom, javax.xml.parsers, net.java.sip.communicator.util, + net.java.sip.communicator.util.dns, net.java.sip.communicator.util.xml, javax.xml.transform, javax.xml.transform.dom, diff --git a/test/net/java/sip/communicator/slick/history/history.slick.manifest.mf b/test/net/java/sip/communicator/slick/history/history.slick.manifest.mf index 2397406..f9d62a8 100644 --- a/test/net/java/sip/communicator/slick/history/history.slick.manifest.mf +++ b/test/net/java/sip/communicator/slick/history/history.slick.manifest.mf @@ -13,6 +13,7 @@ Import-Package: junit.framework, org.w3c.dom, javax.xml.parsers, net.java.sip.communicator.util, + net.java.sip.communicator.util.dns, net.java.sip.communicator.util.xml, javax.xml.transform, javax.xml.transform.dom, diff --git a/test/net/java/sip/communicator/slick/metahistory/metahistory.slick.manifest.mf b/test/net/java/sip/communicator/slick/metahistory/metahistory.slick.manifest.mf index 2223757..dcab292 100644 --- a/test/net/java/sip/communicator/slick/metahistory/metahistory.slick.manifest.mf +++ b/test/net/java/sip/communicator/slick/metahistory/metahistory.slick.manifest.mf @@ -20,6 +20,7 @@ Import-Package: junit.framework, org.w3c.dom, javax.xml.parsers, net.java.sip.communicator.util, + net.java.sip.communicator.util.dns, net.java.sip.communicator.util.xml, javax.xml.transform, javax.xml.transform.dom, diff --git a/test/net/java/sip/communicator/slick/msghistory/msghistory.slick.manifest.mf b/test/net/java/sip/communicator/slick/msghistory/msghistory.slick.manifest.mf index 4e104a1..e96ceaf 100644 --- a/test/net/java/sip/communicator/slick/msghistory/msghistory.slick.manifest.mf +++ b/test/net/java/sip/communicator/slick/msghistory/msghistory.slick.manifest.mf @@ -17,6 +17,7 @@ Import-Package: junit.framework, org.w3c.dom, javax.xml.parsers, net.java.sip.communicator.util, + net.java.sip.communicator.util.dns, net.java.sip.communicator.util.xml, javax.xml.transform, javax.xml.transform.dom, diff --git a/test/net/java/sip/communicator/slick/netaddr/netaddr.slick.manifest.mf b/test/net/java/sip/communicator/slick/netaddr/netaddr.slick.manifest.mf index c9434f5..5d9f631 100644 --- a/test/net/java/sip/communicator/slick/netaddr/netaddr.slick.manifest.mf +++ b/test/net/java/sip/communicator/slick/netaddr/netaddr.slick.manifest.mf @@ -5,6 +5,7 @@ Bundle-Vendor: sip-communicator.org Bundle-Version: 0.0.1 System-Bundle: yes Import-Package: net.java.sip.communicator.util, + net.java.sip.communicator.util.dns, net.java.sip.communicator.service.netaddr, net.java.sip.communicator.service.configuration, junit, diff --git a/test/net/java/sip/communicator/slick/popupmessagehandler/popupmessagehandler.slick.manifest.mf b/test/net/java/sip/communicator/slick/popupmessagehandler/popupmessagehandler.slick.manifest.mf index 6424a68..ef833c1 100644 --- a/test/net/java/sip/communicator/slick/popupmessagehandler/popupmessagehandler.slick.manifest.mf +++ b/test/net/java/sip/communicator/slick/popupmessagehandler/popupmessagehandler.slick.manifest.mf @@ -10,4 +10,5 @@ Import-Package: junit.framework, net.java.sip.communicator.service.systray,
net.java.sip.communicator.service.systray.event,
net.java.sip.communicator.util,
+ net.java.sip.communicator.util.dns
Export-Package: net.java.sip.communicator.slick.popupmessagehandler,
diff --git a/test/net/java/sip/communicator/slick/protocol/gibberish/gibberish.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/gibberish/gibberish.provider.slick.manifest.mf index f887b5e..f2b9cf2 100755..100644 --- a/test/net/java/sip/communicator/slick/protocol/gibberish/gibberish.provider.slick.manifest.mf +++ b/test/net/java/sip/communicator/slick/protocol/gibberish/gibberish.provider.slick.manifest.mf @@ -8,5 +8,6 @@ Import-Package: net.java.sip.communicator.service.configuration, junit.framework, org.osgi.framework, net.java.sip.communicator.util, + net.java.sip.communicator.util.dns, net.java.sip.communicator.service.protocol, net.java.sip.communicator.service.protocol.event diff --git a/test/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf index 401b66f..9ef5144 100644 --- a/test/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf +++ b/test/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf @@ -9,6 +9,7 @@ Import-Package: junit.framework, net.java.sip.communicator.service.configuration, org.osgi.framework, net.java.sip.communicator.util, + net.java.sip.communicator.util.dns, net.java.sip.communicator.service.protocol, net.java.sip.communicator.service.protocol.icqconstants, net.java.sip.communicator.service.protocol.aimconstants, diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/jabber.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/jabber/jabber.provider.slick.manifest.mf index a8bd5c7..4bcdd72 100755..100644 --- a/test/net/java/sip/communicator/slick/protocol/jabber/jabber.provider.slick.manifest.mf +++ b/test/net/java/sip/communicator/slick/protocol/jabber/jabber.provider.slick.manifest.mf @@ -12,6 +12,7 @@ Import-Package: net.java.sip.communicator.service.configuration, javax.net.ssl, javax.xml.parsers, net.java.sip.communicator.util, + net.java.sip.communicator.util.dns, net.java.sip.communicator.service.protocol, net.java.sip.communicator.service.protocol.jabberconstants, net.java.sip.communicator.service.protocol.event, diff --git a/test/net/java/sip/communicator/slick/protocol/msn/msn.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/msn/msn.provider.slick.manifest.mf index fd8813c..4e657f2 100755..100644 --- a/test/net/java/sip/communicator/slick/protocol/msn/msn.provider.slick.manifest.mf +++ b/test/net/java/sip/communicator/slick/protocol/msn/msn.provider.slick.manifest.mf @@ -13,4 +13,5 @@ Import-Package: junit.framework, net.java.sip.communicator.service.protocol.event, net.java.sip.communicator.service.protocol.msnconstants, net.java.sip.communicator.util, + net.java.sip.communicator.util.dns, net.java.sip.communicator.service.fileaccess diff --git a/test/net/java/sip/communicator/slick/protocol/rss/rss.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/rss/rss.provider.slick.manifest.mf index 3587723..dd5adad 100755..100644 --- a/test/net/java/sip/communicator/slick/protocol/rss/rss.provider.slick.manifest.mf +++ b/test/net/java/sip/communicator/slick/protocol/rss/rss.provider.slick.manifest.mf @@ -8,5 +8,6 @@ Import-Package: net.java.sip.communicator.service.configuration, junit.framework, org.osgi.framework, net.java.sip.communicator.util, + net.java.sip.communicator.util.dns, net.java.sip.communicator.service.protocol, net.java.sip.communicator.service.protocol.event 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 9469f5c..634d275 100644 --- a/test/net/java/sip/communicator/slick/protocol/sip/TestAutoProxyDetection.java +++ b/test/net/java/sip/communicator/slick/protocol/sip/TestAutoProxyDetection.java @@ -141,6 +141,7 @@ public class TestAutoProxyDetection .andReturn(new InetSocketAddress[]{a1});
replay(nu, srv1);
+ assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());
@@ -155,6 +156,7 @@ public class TestAutoProxyDetection .andReturn(new InetSocketAddress[]{a1, a2});
replay(nu, srv1);
+ assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());
assertTrue(apd.getNextAddress());
@@ -176,6 +178,7 @@ public class TestAutoProxyDetection .andReturn(new InetSocketAddress[]{a2});
replay(nu, srv1, srv2);
+ assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());
assertTrue(apd.getNextAddress());
@@ -195,6 +198,7 @@ public class TestAutoProxyDetection .andReturn(new InetSocketAddress[]{a3, a4});
replay(nu, srv1, srv2);
+ assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());
@@ -240,6 +244,7 @@ public class TestAutoProxyDetection replay(nu, srv1, srv2, srv3);
+ assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());
@@ -268,6 +273,7 @@ public class TestAutoProxyDetection replay(nu);
+ assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());
@@ -287,6 +293,7 @@ public class TestAutoProxyDetection replay(nu, srv1);
+ assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());
@@ -306,6 +313,7 @@ public class TestAutoProxyDetection replay(nu, srv1);
+ assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());
@@ -332,6 +340,7 @@ public class TestAutoProxyDetection replay(nu, srv1, srv2);
+ assertTrue(apd.getNextAddress());
assertEquals(a2, apd.getAddress());
assertEquals("TLS", apd.getTransport());
@@ -371,6 +380,7 @@ public class TestAutoProxyDetection replay(nu);
+ assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());
@@ -389,6 +399,7 @@ public class TestAutoProxyDetection replay(nu);
+ assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());
@@ -423,6 +434,7 @@ public class TestAutoProxyDetection replay(nu, srv1);
+ assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/sip.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/sip/sip.provider.slick.manifest.mf index e5a7495..d52a38b 100644 --- a/test/net/java/sip/communicator/slick/protocol/sip/sip.provider.slick.manifest.mf +++ b/test/net/java/sip/communicator/slick/protocol/sip/sip.provider.slick.manifest.mf @@ -11,6 +11,7 @@ Import-Package: net.java.sip.communicator.service.configuration, org.easymock, javax.xml.namespace, net.java.sip.communicator.util, + net.java.sip.communicator.util.dns, net.java.sip.communicator.util.xml, net.java.sip.communicator.service.protocol, net.java.sip.communicator.service.protocol.event, diff --git a/test/net/java/sip/communicator/slick/protocol/yahoo/yahoo.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/yahoo/yahoo.provider.slick.manifest.mf index e79c1ef..f0b6b35 100644 --- a/test/net/java/sip/communicator/slick/protocol/yahoo/yahoo.provider.slick.manifest.mf +++ b/test/net/java/sip/communicator/slick/protocol/yahoo/yahoo.provider.slick.manifest.mf @@ -10,6 +10,7 @@ Import-Package: net.java.sip.communicator.service.configuration, javax.net.ssl, javax.xml.parsers, net.java.sip.communicator.util, + net.java.sip.communicator.util.dns, net.java.sip.communicator.service.protocol, net.java.sip.communicator.service.protocol.yahooconstants, net.java.sip.communicator.service.protocol.event, diff --git a/test/net/java/sip/communicator/slick/runner/slick-runner.manifest.mf b/test/net/java/sip/communicator/slick/runner/slick-runner.manifest.mf index 9ba295a..467e1a9 100644 --- a/test/net/java/sip/communicator/slick/runner/slick-runner.manifest.mf +++ b/test/net/java/sip/communicator/slick/runner/slick-runner.manifest.mf @@ -14,6 +14,7 @@ Import-Package: net.java.sip.communicator.service.configuration, org.osgi.framework, org.w3c.dom, javax.xml.parsers, + net.java.sip.communicator.util.dns, net.java.sip.communicator.util.xml, javax.xml.transform, javax.xml.transform.dom, diff --git a/test/net/java/sip/communicator/slick/slickless/slickless.manifest.mf b/test/net/java/sip/communicator/slick/slickless/slickless.manifest.mf index 117a273..07a79ec 100644 --- a/test/net/java/sip/communicator/slick/slickless/slickless.manifest.mf +++ b/test/net/java/sip/communicator/slick/slickless/slickless.manifest.mf @@ -13,6 +13,7 @@ Import-Package: net.java.sip.communicator.service.configuration, org.osgi.framework, org.w3c.dom, javax.xml.parsers, + net.java.sip.communicator.util.dns, net.java.sip.communicator.util.xml, javax.xml.transform, javax.xml.transform.dom, diff --git a/test/net/java/sip/communicator/slick/version/version.slick.manifest.mf b/test/net/java/sip/communicator/slick/version/version.slick.manifest.mf index 3f2c1d8..9788fdf 100755..100644 --- a/test/net/java/sip/communicator/slick/version/version.slick.manifest.mf +++ b/test/net/java/sip/communicator/slick/version/version.slick.manifest.mf @@ -6,6 +6,7 @@ Bundle-Version: 0.0.1 System-Bundle: yes Import-Package: org.osgi.framework, net.java.sip.communicator.util, + net.java.sip.communicator.util.dns, net.java.sip.communicator.service.configuration, net.java.sip.communicator.service.protocol, net.java.sip.communicator.service.protocol.icqconstants, |