remove remaining variant tests; not needed now that our server is in C

2 files changed, 4 insertions, 236 deletions

diff --git a/src/tests/com.example.Frob.xml b/src/tests/com.example.Frob.xml
index 9e3a0a2..f29e997 100644
--- a/src/tests/com.example.Frob.xml
+++ b/src/tests/com.example.Frob.xml
@@ -273,26 +273,6 @@
       <arg direction="out" type="v" name="variant" />
     </method>
 
-    <method name="TestVariantReturn2">
-      <arg direction="in"  type="s" name="desired_variant" />
-      <arg direction="out" type="av" name="array_of_variants" />
-      <arg direction="out" type="a{sv}" name="hash_of_variants" />
-      <arg direction="out" type="(siivi)" name="struct_with_variant" />
-    </method>
-
-    <method name="TestPassVariant">
-      <arg direction="in"  type="v" name="the_variant" />
-      <arg direction="out" type="s" name="as_string" />
-    </method>
-
-    <method name="TestPassVariant2">
-      <arg direction="in"  type="av" name="array_of_variants" />
-      <arg direction="in"  type="a{sv}" name="dict_of_string_to_variants" />
-      <arg direction="in"  type="a{sav}" name="dict_of_string_to_array_of_variants" />
-      <arg direction="in"  type="(siivi)" name="struct_with_variant" />
-      <arg direction="out" type="s" name="as_string" />
-    </method>
-
     <property name="y" type="y" access="read"/>
     <property name="b" type="b" access="read"/>
     <property name="n" type="n" access="read"/>
diff --git a/src/tests/testclient.c b/src/tests/testclient.c
index 04ceda9..8d298fd 100644
--- a/src/tests/testclient.c
+++ b/src/tests/testclient.c
@@ -1908,210 +1908,6 @@ test_variant_return (void)
 
 /* ---------------------------------------------------------------------------------------------------- */
 
-#if 0
-static void
-test_variant_return2 (void)
-{
-  GError *error;
-  GList *res_list_of_variants;
-  GHashTable *res_hash_of_variants;
-  TestStructWithVariant *res_struct_with_variant;
-
-  error = NULL;
-
-  g_assert (test_frob_invoke_test_variant_return2_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */
-                                                        "one",
-                                                        &res_list_of_variants,
-                                                        &res_hash_of_variants,
-                                                        &res_struct_with_variant,
-                                                        NULL,
-                                                        &error));
-  g_assert_no_error (error);
-  /* TODO: check data */
-  egg_dbus_list_free (res_list_of_variants);
-  egg_dbus_hash_table_unref (res_hash_of_variants);
-  g_object_unref (res_struct_with_variant);
-
-  g_assert (test_frob_invoke_test_variant_return2_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */
-                                                        "two",
-                                                        &res_list_of_variants,
-                                                        &res_hash_of_variants,
-                                                        &res_struct_with_variant,
-                                                        NULL,
-                                                        &error));
-  g_assert_no_error (error);
-  /* TODO: check data */
-  egg_dbus_list_free (res_list_of_variants);
-  egg_dbus_hash_table_unref (res_hash_of_variants);
-  g_object_unref (res_struct_with_variant);
-
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-static void
-test_pass_variant (void)
-{
-  GError *error;
-  char *as_string;
-  EggDBusVariant *variant_to_pass;
-  GArray *array_byte;
-  guint8 ret_byte;
-
-  error = NULL;
-
-  variant_to_pass = egg_dbus_variant_new_for_string ("dbus-rocks");
-  g_assert (test_frob_invoke_test_pass_variant_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */
-                                                     variant_to_pass,
-                                                     &as_string,
-                                                     NULL,
-                                                     &error));
-  g_assert_no_error (error);
-  g_object_unref (variant_to_pass);
-  g_assert_cmpstr (as_string, ==, "dbus-rocks-and-a-bag-of-chips");
-  g_free (as_string);
-
-  variant_to_pass = egg_dbus_variant_new_for_byte (0x5a);
-  g_assert (test_frob_invoke_test_pass_variant_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */
-                                                     variant_to_pass,
-                                                     &as_string,
-                                                     NULL,
-                                                     &error));
-  g_assert_no_error (error);
-  g_object_unref (variant_to_pass);
-  g_assert_cmpstr (as_string, ==, "Z-and-a-bag-of-chips");
-  g_free (as_string);
-
-  array_byte    = g_array_new (FALSE, FALSE, sizeof (guint8));
-  ret_byte = 1;        g_array_append_val (array_byte,    ret_byte);
-  ret_byte = 2;        g_array_append_val (array_byte,    ret_byte);
-  variant_to_pass = egg_dbus_variant_new_for_array_with_signature (array_byte, "y");
-  g_assert (test_frob_invoke_test_pass_variant_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */
-                                                     variant_to_pass,
-                                                     &as_string,
-                                                     NULL,
-                                                     &error));
-  g_assert_no_error (error);
-  g_object_unref (variant_to_pass);
-  g_array_free (array_byte, TRUE);
-  g_assert_cmpstr (as_string, ==, "dbus.Array([dbus.Byte(1), dbus.Byte(2)], signature=dbus.Signature('y'), variant_level=1)-and-a-bag-of-chips");
-  g_free (as_string);
-
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-static void
-test_pass_variant2 (void)
-{
-  GError *error;
-  GList *array_of_variants;
-  GHashTable *dict_of_string_to_variants;
-  GHashTable *dict_of_string_to_array_of_variants;
-  EggDBusVariant *a_variant;
-  EggDBusVariant *variant_to_pass;
-  TestStructWithVariant *struct_with_variant;
-  EggDBusArray *array_byte;
-  EggDBusArray *array_boolean;
-  EggDBusArray *array_double;
-  guint8 ret_byte;
-  gboolean ret_boolean;
-  gdouble ret_double;
-  char *as_string;
-
-  error = NULL;
-
-  array_byte    = g_array_new (FALSE, FALSE, sizeof (guint8));
-  ret_byte = 1;        g_array_append_val (array_byte,    ret_byte);
-  ret_byte = 2;        g_array_append_val (array_byte,    ret_byte);
-
-  array_boolean = g_array_new (FALSE, FALSE, sizeof (gboolean));
-  ret_boolean = FALSE; g_array_append_val (array_boolean, ret_boolean);
-  ret_boolean = TRUE;  g_array_append_val (array_boolean, ret_boolean);
-
-  array_double = g_array_new (FALSE, FALSE, sizeof (gdouble));
-  ret_double = 4.5; g_array_append_val (array_double, ret_double);
-  ret_double = 5.5;  g_array_append_val (array_double, ret_double);
-
-  array_of_variants = g_list_append (NULL,              egg_dbus_variant_new_for_string ("foo"));
-  array_of_variants = g_list_append (array_of_variants, egg_dbus_variant_new_for_int (64));
-  array_of_variants = g_list_append (array_of_variants, egg_dbus_variant_new_for_boolean (TRUE));
-
-  dict_of_string_to_variants = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
-  g_hash_table_insert (dict_of_string_to_variants, "key0", egg_dbus_variant_new_for_string ("bar"));
-  g_hash_table_insert (dict_of_string_to_variants, "key1", egg_dbus_variant_new_for_byte (0x41));
-  g_hash_table_insert (dict_of_string_to_variants, "key2", egg_dbus_variant_new_for_array_with_signature (array_boolean, "b"));
-
-  dict_of_string_to_array_of_variants = g_hash_table_new (g_str_hash, g_str_equal);
-  g_hash_table_insert (dict_of_string_to_array_of_variants, "otherkey0", array_of_variants);
-  g_hash_table_insert (dict_of_string_to_array_of_variants, "otherkey1", array_of_variants);
-
-  a_variant = egg_dbus_variant_new_for_array_with_signature (array_double, "d");
-
-  struct_with_variant = test_struct_with_variant_new ("my name",
-                                                      G_MAXINT,
-                                                      100,
-                                                      a_variant,
-                                                      42);
-  g_object_unref (a_variant);
-
-  variant_to_pass = egg_dbus_variant_new_for_array_with_signature (array_byte, "y");
-
-  g_assert (test_frob_invoke_test_pass_variant2_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */
-                                                      array_of_variants,
-                                                      dict_of_string_to_variants,
-                                                      dict_of_string_to_array_of_variants,
-                                                      struct_with_variant,
-                                                      &as_string,
-                                                      NULL,
-                                                      &error));
-  g_assert_no_error (error);
-  g_list_foreach (array_of_variants, (GFunc) g_object_unref, NULL);
-  g_list_free (array_of_variants);
-  g_hash_table_unref (dict_of_string_to_variants);
-  g_hash_table_unref (dict_of_string_to_array_of_variants);
-  g_object_unref (struct_with_variant);
-  g_array_free (array_byte, TRUE);
-  g_array_free (array_boolean, TRUE);
-  g_array_free (array_double, TRUE);
-  g_object_unref (variant_to_pass);
-
-  g_assert_cmpstr (as_string, ==,
-                   "dbus.Array(["
-                       "dbus.String(u'foo', variant_level=1), "
-                       "dbus.Int32(64, variant_level=1), "
-                       "dbus.Boolean(True, variant_level=1)], signature=dbus.Signature('v'))"
-                   "dbus.Dictionary({"
-                       "dbus.String(u'key2'): "
-                           "dbus.Array([dbus.Boolean(False), "
-                                       "dbus.Boolean(True)], signature=dbus.Signature('b'), variant_level=1), "
-                       "dbus.String(u'key1'): "
-                         "dbus.Byte(65, variant_level=1), "
-                       "dbus.String(u'key0'): "
-                         "dbus.String(u'bar', variant_level=1)"
-                   "}, signature=dbus.Signature('sv'))"
-                   "dbus.Dictionary({"
-                     "dbus.String(u'otherkey0'): "
-                         "dbus.Array([dbus.String(u'foo', variant_level=1), "
-                                     "dbus.Int32(64, variant_level=1), "
-                                     "dbus.Boolean(True, variant_level=1)], signature=dbus.Signature('v')), "
-                     "dbus.String(u'otherkey1'): "
-                         "dbus.Array([dbus.String(u'foo', variant_level=1), "
-                                     "dbus.Int32(64, variant_level=1), "
-                                     "dbus.Boolean(True, variant_level=1)], signature=dbus.Signature('v'))"
-                   "}, signature=dbus.Signature('sav'))"
-                   "dbus.Struct(("
-                     "dbus.String(u'my name'), "
-                     "dbus.Int32(2147483647), "
-                     "dbus.Int32(100), "
-                     "dbus.Array([dbus.Double(4.5), dbus.Double(5.5)], signature=dbus.Signature('d'), variant_level=1),"
-                   " dbus.Int64(42L)), signature=None)");
-  g_free (as_string);
-}
-#endif
-
-/* ---------------------------------------------------------------------------------------------------- */
-
 static void
 test_another_interface (void)
 {
@@ -2898,9 +2694,8 @@ test_egg_dbus_structure (void)
   if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR))
     {
       dpoint = TEST_DESCRIBED_POINT (pair);
-      exit (0);
     }
-  g_test_trap_assert_passed ();
+  g_test_trap_assert_failed ();
   g_test_trap_assert_stderr ("*invalid cast from EggDBusStructure with signature (ii) to TestDescribedPoint with signature (s(ii))*");
 
   g_object_unref (point);
@@ -4391,19 +4186,15 @@ main (int argc, char *argv[])
    */
 
   /* Test collection classes */
-  //test_egg_dbus_array_seq ();
-  //test_egg_dbus_hash_map ();
+  test_egg_dbus_array_seq ();
+  test_egg_dbus_hash_map ();
+  test_egg_dbus_structure ();
 
   /* Tests for code generator
    *
    */
   test_enums ();
 
-  /* Tests for collection classes.
-   *
-   */
-  //test_egg_dbus_structure ();
-
   /* The life-cycle test suite requires that none of our test services
    * are on the bus. So we start with that.
    */
@@ -4433,9 +4224,6 @@ main (int argc, char *argv[])
   test_array_of_hash_table_of_structures ();
   test_array_of_arrays ();
   test_variant_return ();
-  /*test_variant_return2 ();*/
-  /*test_pass_variant ();*/
-  /*test_pass_variant2 ();*/
   test_another_interface ();
   test_ctypes ();
   test_user_supplied_structs ();