From a38e26be3a846161e35e8c64fd687f716a9a0827 Mon Sep 17 00:00:00 2001 From: Gaston Dombiak Date: Fri, 19 Dec 2003 18:22:42 +0000 Subject: [PATCH] Removes initialization code that was replaced by the automatic system configuration git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2187 b35dd754-fafc-0310-a699-88a17e54d16e --- .../smackx/ServiceDiscoveryManagerTest.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/test/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java b/test/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java index 128ea065f..de7c57d74 100644 --- a/test/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java +++ b/test/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java @@ -79,16 +79,10 @@ public class ServiceDiscoveryManagerTest extends TestCase { * Tests service discovery of XHTML support. */ public void testXHTMLFeature() { - // TODO Remove these two lines when the "additional services for extensions" are - // implemented - new ServiceDiscoveryManager(conn1); - new ServiceDiscoveryManager(conn2); - - // Enable the XHTML Message support in connection1 - XHTMLManager.setServiceEnabled(conn1, true); - // Check for local XHTML service support + // Check for local XHTML service support + // By default the XHTML service support is enabled in all the connections assertTrue(XHTMLManager.isServiceEnabled(conn1)); - assertFalse(XHTMLManager.isServiceEnabled(conn2)); + assertTrue(XHTMLManager.isServiceEnabled(conn2)); // Check for XHTML support in connection1 from connection2 assertTrue(XHTMLManager.isServiceEnabled(conn2, "gato10@" + conn1.getHost())); @@ -96,7 +90,7 @@ public class ServiceDiscoveryManagerTest extends TestCase { XHTMLManager.setServiceEnabled(conn1, false); // Check for local XHTML service support assertFalse(XHTMLManager.isServiceEnabled(conn1)); - assertFalse(XHTMLManager.isServiceEnabled(conn2)); + assertTrue(XHTMLManager.isServiceEnabled(conn2)); // Check for XHTML support in connection1 from connection2 assertFalse(XHTMLManager.isServiceEnabled(conn2, "gato10@" + conn1.getHost())); }