test: Move _dbus_server_test() here

Signed-off-by: Simon McVittie <smcv@collabora.com>

diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c
index b5153cee13b0a1e527f06144e6bccefd9984857e..cde3c986dcc143268074f5e12ec8560f1b28fa1a 100644 (file)
--- a/dbus/dbus-server.c
+++ b/dbus/dbus-server.c
@@ -1193,61 +1193,3 @@ dbus_server_get_data (DBusServer   *server,
 }
 
 /** @} */
-
-#ifdef DBUS_ENABLE_EMBEDDED_TESTS
-#include "dbus-test.h"
-#include <string.h>
-
-dbus_bool_t
-_dbus_server_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
-{
-  const char *valid_addresses[] = {
-    "tcp:port=1234",
-    "tcp:host=localhost,port=1234",
-    "tcp:host=localhost,port=1234;tcp:port=5678",
-#ifdef DBUS_UNIX
-    "unix:path=./boogie",
-    "tcp:port=1234;unix:path=./boogie",
-#endif
-  };
-
-  DBusServer *server;
-  int i;
-  
-  for (i = 0; i < _DBUS_N_ELEMENTS (valid_addresses); i++)
-    {
-      DBusError error = DBUS_ERROR_INIT;
-      char *address;
-      char *id;
-
-      server = dbus_server_listen (valid_addresses[i], &error);
-      if (server == NULL)
-        {
-          _dbus_warn ("server listen error: %s: %s", error.name, error.message);
-          dbus_error_free (&error);
-          _dbus_assert_not_reached ("Failed to listen for valid address.");
-        }
-
-      id = dbus_server_get_id (server);
-      _dbus_assert (id != NULL);
-      address = dbus_server_get_address (server);
-      _dbus_assert (address != NULL);
-
-      if (strstr (address, id) == NULL)
-        {
-          _dbus_warn ("server id '%s' is not in the server address '%s'",
-                      id, address);
-          _dbus_assert_not_reached ("bad server id or address");
-        }
-
-      dbus_free (id);
-      dbus_free (address);
-      
-      dbus_server_disconnect (server);
-      dbus_server_unref (server);
-    }
-
-  return TRUE;
-}
-
-#endif /* DBUS_ENABLE_EMBEDDED_TESTS */

diff --git a/dbus/dbus-test.h b/dbus/dbus-test.h
index baf08700692089b3ca521eeec3ba4639e0862157..ce43497dfa89ebfb3a97dfe0f4f819bb6352a309 100644 (file)
--- a/dbus/dbus-test.h
+++ b/dbus/dbus-test.h
@@ -49,9 +49,6 @@ dbus_bool_t _dbus_mem_pool_test          (const char *test_data_dir);
 DBUS_PRIVATE_EXPORT
 dbus_bool_t _dbus_address_test           (const char *test_data_dir);
 
-DBUS_PRIVATE_EXPORT
-dbus_bool_t _dbus_server_test            (const char *test_data_dir);
-
 DBUS_PRIVATE_EXPORT
 dbus_bool_t _dbus_sha_test               (const char *test_data_dir);
 

diff --git a/test/internals/misc-internals.c b/test/internals/misc-internals.c
index 94ad616e4346d27eada8b2a31b03e196bcfc15bd..a9cc0f0bc95ec3ab9476528fe9e137717bb78abb 100644 (file)
--- a/test/internals/misc-internals.c
+++ b/test/internals/misc-internals.c
@@ -95,6 +95,58 @@ _dbus_misc_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
   return TRUE;
 }
 
+static dbus_bool_t
+_dbus_server_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
+{
+  const char *valid_addresses[] = {
+    "tcp:port=1234",
+    "tcp:host=localhost,port=1234",
+    "tcp:host=localhost,port=1234;tcp:port=5678",
+#ifdef DBUS_UNIX
+    "unix:path=./boogie",
+    "tcp:port=1234;unix:path=./boogie",
+#endif
+  };
+
+  DBusServer *server;
+  int i;
+
+  for (i = 0; i < _DBUS_N_ELEMENTS (valid_addresses); i++)
+    {
+      DBusError error = DBUS_ERROR_INIT;
+      char *address;
+      char *id;
+
+      server = dbus_server_listen (valid_addresses[i], &error);
+      if (server == NULL)
+        {
+          _dbus_warn ("server listen error: %s: %s", error.name, error.message);
+          dbus_error_free (&error);
+          _dbus_assert_not_reached ("Failed to listen for valid address.");
+        }
+
+      id = dbus_server_get_id (server);
+      _dbus_assert (id != NULL);
+      address = dbus_server_get_address (server);
+      _dbus_assert (address != NULL);
+
+      if (strstr (address, id) == NULL)
+        {
+          _dbus_warn ("server id '%s' is not in the server address '%s'",
+                      id, address);
+          _dbus_assert_not_reached ("bad server id or address");
+        }
+
+      dbus_free (id);
+      dbus_free (address);
+
+      dbus_server_disconnect (server);
+      dbus_server_unref (server);
+    }
+
+  return TRUE;
+}
+
 /**
  * @ingroup DBusSignatureInternals
  * Unit test for DBusSignature.