sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Import DNS package to tests and fix tests

Browse Source
cusax-fix
Ingo Bauersachs 14 years ago
parent 3bb4311fb9
commit 1d6e0246a1
22 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File

7
lib/felix.unit.test.properties
Unescape View File

@ -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

1
test/net/java/sip/communicator/slick/callhistory/callhistory.slick.manifest.mf
Unescape View File

@ -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,

1
test/net/java/sip/communicator/slick/configuration/configuration.slick.manifest.mf
Unescape View File

@ -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,

1
test/net/java/sip/communicator/slick/contactlist/meta.cl.slick.manifest.mf
Unescape View File

@ -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,

1
test/net/java/sip/communicator/slick/credentialsstorage/credentialsstorage.slick.manifest.mf
Unescape View File

@ -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

1
test/net/java/sip/communicator/slick/fileaccess/fileaccess.slick.manifest.mf
Unescape View File

@ -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,

1
test/net/java/sip/communicator/slick/history/history.slick.manifest.mf
Unescape View File

@ -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,

1
test/net/java/sip/communicator/slick/metahistory/metahistory.slick.manifest.mf
Unescape View File

@ -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,

1
test/net/java/sip/communicator/slick/msghistory/msghistory.slick.manifest.mf
Unescape View File

@ -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,

1
test/net/java/sip/communicator/slick/netaddr/netaddr.slick.manifest.mf
Unescape View File

@ -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,

1
test/net/java/sip/communicator/slick/popupmessagehandler/popupmessagehandler.slick.manifest.mf
Unescape View File

@ -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,

1
test/net/java/sip/communicator/slick/protocol/gibberish/gibberish.provider.slick.manifest.mf
Unescape View File

@ -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

1
test/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf
Unescape View File

@ -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,

1
test/net/java/sip/communicator/slick/protocol/jabber/jabber.provider.slick.manifest.mf
Unescape View File

@ -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,

1
test/net/java/sip/communicator/slick/protocol/msn/msn.provider.slick.manifest.mf
Unescape View File

@ -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

1
test/net/java/sip/communicator/slick/protocol/rss/rss.provider.slick.manifest.mf
Unescape View File

@ -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

12
test/net/java/sip/communicator/slick/protocol/sip/TestAutoProxyDetection.java
Unescape View File

@ -141,6 +141,7 @@ public void testOneNaptrOneSrvOneA() throws ParseException, DnssecException
.andReturn(new InetSocketAddress[]{a1});
replay(nu, srv1);
assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());
@ -155,6 +156,7 @@ public void testOneNaptrOneSrvTwoA() throws ParseException, DnssecException
.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 void testOneNaptrTwoSrvOneA() throws ParseException, DnssecException
.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 void testOneNaptrTwoSrvTwoA() throws ParseException, DnssecException
.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 void testThreeNaptrOneSrvEachOneAEach()
replay(nu, srv1, srv2, srv3);
assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());
@ -268,6 +273,7 @@ public void testNoSrvOneA() throws ParseException, DnssecException
replay(nu);
assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());
@ -287,6 +293,7 @@ public void testOneSrvOneA() throws ParseException, DnssecException
replay(nu, srv1);
assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());
@ -306,6 +313,7 @@ public void testOneSrvTwoA() throws ParseException, DnssecException
replay(nu, srv1);
assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());
@ -332,6 +340,7 @@ public void testTwoSrvOneA() throws ParseException, DnssecException
replay(nu, srv1, srv2);
assertTrue(apd.getNextAddress());
assertEquals(a2, apd.getAddress());
assertEquals("TLS", apd.getTransport());
@ -371,6 +380,7 @@ public void testOneA() throws ParseException, DnssecException
replay(nu);
assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());
@ -389,6 +399,7 @@ public void testTwoA() throws ParseException, DnssecException
replay(nu);
assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());
@ -423,6 +434,7 @@ public void testNotReturningSameAddressTwice()
replay(nu, srv1);
assertTrue(apd.getNextAddress());
assertEquals(a1, apd.getAddress());
assertEquals("UDP", apd.getTransport());

1
test/net/java/sip/communicator/slick/protocol/sip/sip.provider.slick.manifest.mf
Unescape View File

@ -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,

1
test/net/java/sip/communicator/slick/protocol/yahoo/yahoo.provider.slick.manifest.mf
Unescape View File

@ -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,

1
test/net/java/sip/communicator/slick/runner/slick-runner.manifest.mf
Unescape View File

@ -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,

1
test/net/java/sip/communicator/slick/slickless/slickless.manifest.mf
Unescape View File

@ -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,

1
test/net/java/sip/communicator/slick/version/version.slick.manifest.mf
Unescape View File

@ -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,

Write Preview
Loading…
Cancel
Save