[gupnp-dlna/wip/new-api: 8/15] Add native sets implementation test, move old tests elsewhere
- From: Krzesimir Nowak <krnowak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gupnp-dlna/wip/new-api: 8/15] Add native sets implementation test, move old tests elsewhere
- Date: Tue, 27 Nov 2012 11:45:19 +0000 (UTC)
commit 69824ea160cd0c2b4f5a7b8b618dd28af5a2f1d6
Author: Krzesimir Nowak <krnowak openismus com>
Date: Thu Nov 15 15:32:11 2012 +0100
Add native sets implementation test, move old tests elsewhere
The old tests are right now in 'old' subdirectory waiting for being
incorporated into the build system again after necessary (or not)
adaptations.
tests/old/Makefile.am | 15 +
tests/old/README | 1 +
tests/{ => old}/dlna-encoding.c | 16 +-
tests/{ => old}/dlna-profile-parser.c | 9 +-
tests/{ => old}/xml/dlna-profile-illegal-base.xml | 0
.../{ => old}/xml/dlna-profile-illegal-parent.xml | 0
.../xml/dlna-profile-missing-attribute.xml | 0
tests/{ => old}/xml/dlna-profile-parent-order.xml | 0
tests/{ => old}/xml/dlna-profiles-empty.xml | 0
.../xml/dlna-profiles-restrictions-order.xml | 0
tests/{ => old}/xml/duplicate-detection/dup1.xml | 0
tests/{ => old}/xml/duplicate-detection/dup2.xml | 0
tests/{ => old}/xml/field-no-value.xml | 0
tests/{ => old}/xml/range-invalid.xml | 0
tests/{ => old}/xml/restriction-duplicate.xml | 0
.../xml/restriction-forward-reference.xml | 0
.../{ => old}/xml/restrictions-illegal-parent.xml | 0
tests/{ => old}/xml/value-empty.xml | 0
tests/{ => old}/xml/value-invalid.xml | 0
tests/sets.c | 532 ++++++++++++++++++++
tests/test-discoverer.sh.in | 2 +-
21 files changed, 567 insertions(+), 8 deletions(-)
---
diff --git a/tests/old/Makefile.am b/tests/old/Makefile.am
new file mode 100644
index 0000000..210c0c9
--- /dev/null
+++ b/tests/old/Makefile.am
@@ -0,0 +1,15 @@
+SUBDIRS = . experiment
+
+noinst_PROGRAMS = dlna-profile-parser dlna-encoding
+
+AM_CFLAGS = -I$(top_srcdir) $(GST_CFLAGS) $(GST_PBU_CFLAGS) $(LIBXML_CFLAGS)
+LIBS = $(GST_LIBS) \
+ $(LIBXML_LIBS) \
+ $(GST_PBU_LIBS) \
+ $(top_builddir)/libgupnp-dlna/libgupnp-dlna-1.0.la
+
+dlna_profile_parser_SOURCES = dlna-profile-parser.c
+dlna_encoding_SOURCES = dlna-encoding.c
+
+TESTS_ENVIRONMENT = MEDIA_DIR="$(srcdir)/media" FILE_LIST="$(srcdir)/media/media-list.txt" ${SHELL}
+TESTS = test-discoverer.sh
diff --git a/tests/old/README b/tests/old/README
new file mode 100644
index 0000000..a0430a2
--- /dev/null
+++ b/tests/old/README
@@ -0,0 +1 @@
+Code here is some old stuff that waits to be ported to new GUPnP-DLNA when it is ready.
diff --git a/tests/dlna-encoding.c b/tests/old/dlna-encoding.c
similarity index 93%
rename from tests/dlna-encoding.c
rename to tests/old/dlna-encoding.c
index f776077..970ffb4 100644
--- a/tests/dlna-encoding.c
+++ b/tests/old/dlna-encoding.c
@@ -31,7 +31,9 @@
static gboolean silent = FALSE;
static void
-pad_added_cb (GstElement * uridecodebin, GstPad * pad, GstElement * encodebin)
+pad_added_cb (GstElement * uridecodebin G_GNUC_UNUSED,
+ GstPad * pad,
+ GstElement * encodebin)
{
GstPad *sinkpad;
@@ -60,8 +62,10 @@ pad_added_cb (GstElement * uridecodebin, GstPad * pad, GstElement * encodebin)
}
static gboolean
-autoplug_continue_cb (GstElement * uridecodebin, GstPad * somepad,
- GstCaps * caps, GstElement * encodebin)
+autoplug_continue_cb (GstElement * uridecodebin G_GNUC_UNUSED,
+ GstPad * somepad G_GNUC_UNUSED,
+ GstCaps * caps,
+ GstElement * encodebin)
{
GstPad *sinkpad;
@@ -74,7 +78,9 @@ autoplug_continue_cb (GstElement * uridecodebin, GstPad * somepad,
}
static void
-bus_message_cb (GstBus * bus, GstMessage * message, GMainLoop * mainloop)
+bus_message_cb (GstBus * bus G_GNUC_UNUSED,
+ GstMessage * message,
+ GMainLoop * mainloop)
{
switch (GST_MESSAGE_TYPE (message)) {
case GST_MESSAGE_ERROR:
@@ -199,7 +205,9 @@ main (int argc, char **argv)
GUPnPDLNAProfile *profile;
gchar *inputuri;
+#if !GLIB_CHECK_VERSION(2,35,0)
g_type_init ();
+#endif
ctx = g_option_context_new ("- encode URIs with GstProfile and encodebin");
g_option_context_add_main_entries (ctx, options, NULL);
diff --git a/tests/dlna-profile-parser.c b/tests/old/dlna-profile-parser.c
similarity index 95%
rename from tests/dlna-profile-parser.c
rename to tests/old/dlna-profile-parser.c
index 4ab179e..a30bba1 100644
--- a/tests/dlna-profile-parser.c
+++ b/tests/old/dlna-profile-parser.c
@@ -33,7 +33,7 @@ static void usage (void)
static void print_caps (const GstCaps *caps)
{
- int i;
+ guint i;
for (i = 0; i < gst_caps_get_size (caps); i++) {
GstStructure *structure = gst_caps_get_structure (caps, i);
@@ -45,7 +45,8 @@ static void print_caps (const GstCaps *caps)
}
}
-static void print_profile (GUPnPDLNAProfile *profile, gpointer unused)
+static void print_profile (GUPnPDLNAProfile *profile,
+ gpointer unused G_GNUC_UNUSED)
{
GstEncodingProfile *enc_profile;
const GList *tmp;
@@ -72,7 +73,7 @@ static void print_profile (GUPnPDLNAProfile *profile, gpointer unused)
}
static void
-free_restrictions_struct (gpointer data, gpointer user_data)
+free_restrictions_struct (gpointer data, gpointer user_data G_GNUC_UNUSED)
{
GUPnPDLNARestrictions *restr = (GUPnPDLNARestrictions *)data;
if (restr) {
@@ -103,7 +104,9 @@ main (int argc, char **argv)
GOptionContext *ctx;
+#if !GLIB_CHECK_VERSION(2,35,0)
g_type_init ();
+#endif
ctx = g_option_context_new (" - test to parse dlna profiles");
g_option_context_add_main_entries (ctx, options, NULL);
diff --git a/tests/xml/dlna-profile-illegal-base.xml b/tests/old/xml/dlna-profile-illegal-base.xml
similarity index 100%
rename from tests/xml/dlna-profile-illegal-base.xml
rename to tests/old/xml/dlna-profile-illegal-base.xml
diff --git a/tests/xml/dlna-profile-illegal-parent.xml b/tests/old/xml/dlna-profile-illegal-parent.xml
similarity index 100%
rename from tests/xml/dlna-profile-illegal-parent.xml
rename to tests/old/xml/dlna-profile-illegal-parent.xml
diff --git a/tests/xml/dlna-profile-missing-attribute.xml b/tests/old/xml/dlna-profile-missing-attribute.xml
similarity index 100%
rename from tests/xml/dlna-profile-missing-attribute.xml
rename to tests/old/xml/dlna-profile-missing-attribute.xml
diff --git a/tests/xml/dlna-profile-parent-order.xml b/tests/old/xml/dlna-profile-parent-order.xml
similarity index 100%
rename from tests/xml/dlna-profile-parent-order.xml
rename to tests/old/xml/dlna-profile-parent-order.xml
diff --git a/tests/xml/dlna-profiles-empty.xml b/tests/old/xml/dlna-profiles-empty.xml
similarity index 100%
rename from tests/xml/dlna-profiles-empty.xml
rename to tests/old/xml/dlna-profiles-empty.xml
diff --git a/tests/xml/dlna-profiles-restrictions-order.xml b/tests/old/xml/dlna-profiles-restrictions-order.xml
similarity index 100%
rename from tests/xml/dlna-profiles-restrictions-order.xml
rename to tests/old/xml/dlna-profiles-restrictions-order.xml
diff --git a/tests/xml/duplicate-detection/dup1.xml b/tests/old/xml/duplicate-detection/dup1.xml
similarity index 100%
rename from tests/xml/duplicate-detection/dup1.xml
rename to tests/old/xml/duplicate-detection/dup1.xml
diff --git a/tests/xml/duplicate-detection/dup2.xml b/tests/old/xml/duplicate-detection/dup2.xml
similarity index 100%
rename from tests/xml/duplicate-detection/dup2.xml
rename to tests/old/xml/duplicate-detection/dup2.xml
diff --git a/tests/xml/field-no-value.xml b/tests/old/xml/field-no-value.xml
similarity index 100%
rename from tests/xml/field-no-value.xml
rename to tests/old/xml/field-no-value.xml
diff --git a/tests/xml/range-invalid.xml b/tests/old/xml/range-invalid.xml
similarity index 100%
rename from tests/xml/range-invalid.xml
rename to tests/old/xml/range-invalid.xml
diff --git a/tests/xml/restriction-duplicate.xml b/tests/old/xml/restriction-duplicate.xml
similarity index 100%
rename from tests/xml/restriction-duplicate.xml
rename to tests/old/xml/restriction-duplicate.xml
diff --git a/tests/xml/restriction-forward-reference.xml b/tests/old/xml/restriction-forward-reference.xml
similarity index 100%
rename from tests/xml/restriction-forward-reference.xml
rename to tests/old/xml/restriction-forward-reference.xml
diff --git a/tests/xml/restrictions-illegal-parent.xml b/tests/old/xml/restrictions-illegal-parent.xml
similarity index 100%
rename from tests/xml/restrictions-illegal-parent.xml
rename to tests/old/xml/restrictions-illegal-parent.xml
diff --git a/tests/xml/value-empty.xml b/tests/old/xml/value-empty.xml
similarity index 100%
rename from tests/xml/value-empty.xml
rename to tests/old/xml/value-empty.xml
diff --git a/tests/xml/value-invalid.xml b/tests/old/xml/value-invalid.xml
similarity index 100%
rename from tests/xml/value-invalid.xml
rename to tests/old/xml/value-invalid.xml
diff --git a/tests/sets.c b/tests/sets.c
new file mode 100644
index 0000000..e63c19b
--- /dev/null
+++ b/tests/sets.c
@@ -0,0 +1,532 @@
+/*
+ * Copyright (C) 2012 Intel Corporation.
+ *
+ * Authors: Krzesimir Nowak <krnowak openismus com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <glib.h>
+#include "gupnp-dlna-native-sets.h"
+#include "gupnp-dlna-native-sets-private.h"
+
+static void
+value_type_not_null (void)
+{
+ g_assert (gupnp_dlna_native_value_type_bool () != NULL);
+ g_assert (gupnp_dlna_native_value_type_fraction () != NULL);
+ g_assert (gupnp_dlna_native_value_type_int () != NULL);
+ g_assert (gupnp_dlna_native_value_type_string () != NULL);
+}
+
+static void
+value_list_single (void)
+{
+ GUPnPDLNANativeValueList *list;
+ gboolean result;
+
+ /* bool */
+ list = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_bool ());
+ g_assert (list != NULL);
+ result = gupnp_dlna_native_value_list_add_single (list, "true");
+ g_assert (result == TRUE);
+ result = gupnp_dlna_native_value_list_add_single (list, "false");
+ g_assert (result == TRUE);
+ result = gupnp_dlna_native_value_list_add_single (list, "wrong");
+ g_assert (result == FALSE);
+ gupnp_dlna_native_value_list_free (list);
+
+ /* fraction */
+ list = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_fraction ());
+ g_assert (list != NULL);
+ result = gupnp_dlna_native_value_list_add_single (list, "1/2");
+ g_assert (result == TRUE);
+ result = gupnp_dlna_native_value_list_add_single (list, "15/3");
+ g_assert (result == TRUE);
+ result = gupnp_dlna_native_value_list_add_single (list, "wrong");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_single (list, "1/0");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_single (list, "1/2/3");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_single (list, "wrong/bad");
+ g_assert (result == FALSE);
+ gupnp_dlna_native_value_list_free (list);
+
+ /* int */
+ list = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_int ());
+ g_assert (list != NULL);
+ result = gupnp_dlna_native_value_list_add_single (list, "1");
+ g_assert (result == TRUE);
+ result = gupnp_dlna_native_value_list_add_single (list, "-15");
+ g_assert (result == TRUE);
+ result = gupnp_dlna_native_value_list_add_single (list, "wrong");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_single (list, "1.4");
+ g_assert (result == FALSE);
+ gupnp_dlna_native_value_list_free (list);
+
+ /* string */
+ list = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_string ());
+ g_assert (list != NULL);
+ result = gupnp_dlna_native_value_list_add_single (list, "1");
+ g_assert (result == TRUE);
+ result = gupnp_dlna_native_value_list_add_single (list, "-15");
+ g_assert (result == TRUE);
+ result = gupnp_dlna_native_value_list_add_single (list, "wrong");
+ g_assert (result == TRUE);
+ result = gupnp_dlna_native_value_list_add_single (list, "1.4");
+ g_assert (result == TRUE);
+ gupnp_dlna_native_value_list_free (list);
+}
+
+static void
+value_list_range (void)
+{
+ GUPnPDLNANativeValueList *list;
+ gboolean result;
+
+ /* bool ranges have no sense. */
+ list = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_bool ());
+ g_assert (list != NULL);
+ result = gupnp_dlna_native_value_list_add_range (list, "true", "true");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_range (list, "false", "true");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_range (list, "false", "false");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_range (list, "false", "true");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_range (list, "false", "wrong");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_range (list, "wrong", "true");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_range (list, "wrong", "bad");
+ g_assert (result == FALSE);
+ gupnp_dlna_native_value_list_free (list);
+
+ /* fraction */
+ list = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_fraction ());
+ g_assert (list != NULL);
+ result = gupnp_dlna_native_value_list_add_range (list, "1/2", "3/4");
+ g_assert (result == TRUE);
+ result = gupnp_dlna_native_value_list_add_range (list, "-8/3", "15/3");
+ g_assert (result == TRUE);
+ result = gupnp_dlna_native_value_list_add_range (list, "wrong", "bad");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_range (list, "1/0", "-4/3");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_range (list, "1/2/3", "3/2");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_range (list, "a/b", "c/d");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_range (list, "1/2", "1/4");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_range (list, "1/2", "-1/2");
+ g_assert (result == FALSE);
+ gupnp_dlna_native_value_list_free (list);
+
+ /* int */
+ list = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_int ());
+ g_assert (list != NULL);
+ result = gupnp_dlna_native_value_list_add_range (list, "1", "3");
+ g_assert (result == TRUE);
+ result = gupnp_dlna_native_value_list_add_range (list, "-15", "15");
+ g_assert (result == TRUE);
+ result = gupnp_dlna_native_value_list_add_range (list, "wrong", "bad");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_range (list, "1.4", "3");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_range (list, "1", "-3");
+ g_assert (result == FALSE);
+ gupnp_dlna_native_value_list_free (list);
+
+ /* string ranges have no sense */
+ list = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_string ());
+ g_assert (list != NULL);
+ result = gupnp_dlna_native_value_list_add_range (list, "1", "3");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_range (list, "-15", "x");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_range (list, "wrong", "bad");
+ g_assert (result == FALSE);
+ result = gupnp_dlna_native_value_list_add_range (list, "1.4", "-1");
+ g_assert (result == FALSE);
+ gupnp_dlna_native_value_list_free (list);
+}
+
+static void
+restriction_construction (void)
+{
+ GUPnPDLNANativeRestriction *r = gupnp_dlna_native_restriction_new
+ (NULL);
+ GHashTable *e = gupnp_dlna_native_restriction_get_entries (r);
+
+ g_assert_cmpstr (gupnp_dlna_native_restriction_get_mime (r), ==, NULL);
+ g_assert_cmpuint (g_hash_table_size (e), ==, 0);
+ gupnp_dlna_native_restriction_free (r);
+
+ r = gupnp_dlna_native_restriction_new ("mime");
+ e = gupnp_dlna_native_restriction_get_entries (r);
+ g_assert_cmpstr (gupnp_dlna_native_restriction_get_mime (r), ==, "mime");
+ g_assert_cmpuint (g_hash_table_size (e), ==, 0);
+ gupnp_dlna_native_restriction_free (r);
+}
+
+static void
+restriction_empty (void)
+{
+ GUPnPDLNANativeRestriction *r =
+ gupnp_dlna_native_restriction_new (NULL);
+ GUPnPDLNANativeValueList *list = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_bool ());
+
+ g_assert (gupnp_dlna_native_restriction_is_empty (r));
+ gupnp_dlna_native_value_list_add_single (list, "true");
+ g_assert (gupnp_dlna_native_restriction_add_value_list (r,
+ "bool",
+ list));
+ g_assert (!gupnp_dlna_native_restriction_is_empty (r));
+ gupnp_dlna_native_restriction_free (r);
+ r = gupnp_dlna_native_restriction_new ("mime");
+ g_assert (!gupnp_dlna_native_restriction_is_empty (r));
+ gupnp_dlna_native_restriction_free (r);
+}
+
+static void
+restriction_adding_value_lists (void)
+{
+ GUPnPDLNANativeRestriction *r =
+ gupnp_dlna_native_restriction_new (NULL);
+ GUPnPDLNANativeValueList *list = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_bool ());
+
+ g_assert (gupnp_dlna_native_restriction_is_empty (r));
+ /* adding empty value list should fail */
+ g_assert (!gupnp_dlna_native_restriction_add_value_list (r,
+ "bool",
+ list));
+ g_assert (gupnp_dlna_native_restriction_is_empty (r));
+ gupnp_dlna_native_value_list_add_single (list, "true");
+ g_assert (gupnp_dlna_native_restriction_add_value_list (r,
+ "bool",
+ list));
+ g_assert (!gupnp_dlna_native_restriction_is_empty (r));
+ list = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_bool ());
+ gupnp_dlna_native_value_list_add_single (list, "false");
+ /* adding value list with already existing name should fail */
+ g_assert (!gupnp_dlna_native_restriction_add_value_list (r,
+ "bool",
+ list));
+ gupnp_dlna_native_value_list_free (list);
+ gupnp_dlna_native_restriction_free (r);
+}
+
+static void
+restriction_merge (void)
+{
+ GUPnPDLNANativeRestriction *r1 =
+ gupnp_dlna_native_restriction_new (NULL);
+ GUPnPDLNANativeRestriction *r2 =
+ gupnp_dlna_native_restriction_new ("mime1");
+ GUPnPDLNANativeValueList *v;
+ GHashTable *e;
+ GList *l;
+
+ g_assert (gupnp_dlna_native_restriction_merge
+ (r1,
+ r2,
+ GUPNP_DLNA_NATIVE_RESTRICTION_MERGE_RESOLUTION_NONE));
+ g_assert_cmpstr (gupnp_dlna_native_restriction_get_mime (r1),
+ ==,
+ "mime1");
+
+ r2 = gupnp_dlna_native_restriction_new ("mime2");
+ g_assert (gupnp_dlna_native_restriction_merge
+ (r1,
+ r2,
+ GUPNP_DLNA_NATIVE_RESTRICTION_MERGE_RESOLUTION_NONE));
+ g_assert_cmpstr (gupnp_dlna_native_restriction_get_mime (r1),
+ ==,
+ "mime1");
+
+ v = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_string ());
+ g_assert (gupnp_dlna_native_value_list_add_single (v, "string1"));
+ gupnp_dlna_native_restriction_add_value_list (r1, "s", v);
+
+ v = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_int ());
+ g_assert (gupnp_dlna_native_value_list_add_single (v, "1"));
+ g_assert (gupnp_dlna_native_restriction_add_value_list (r1, "i", v));
+
+ r2 = gupnp_dlna_native_restriction_new ("mime2");
+ v = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_string ());
+ g_assert (gupnp_dlna_native_value_list_add_single (v, "string2"));
+ g_assert (gupnp_dlna_native_restriction_add_value_list (r2, "s", v));
+
+ v = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_bool ());
+ g_assert (gupnp_dlna_native_value_list_add_single (v, "true"));
+ g_assert (gupnp_dlna_native_restriction_add_value_list (r2, "b", v));
+
+ g_assert (gupnp_dlna_native_restriction_merge
+ (r1,
+ r2,
+ GUPNP_DLNA_NATIVE_RESTRICTION_MERGE_RESOLUTION_NONE));
+
+ /* TODO: Check types and values */
+ e = gupnp_dlna_native_restriction_get_entries (r1);
+ g_assert_cmpuint (g_hash_table_size (e), ==, 3);
+ v = g_hash_table_lookup (e, "i");
+ g_assert (v != NULL);
+ l = gupnp_dlna_native_value_list_get_list (v);
+ g_assert_cmpuint (g_list_length (l), ==, 1);
+
+ v = g_hash_table_lookup (e, "s");
+ g_assert (v != NULL);
+ l = gupnp_dlna_native_value_list_get_list (v);
+ g_assert_cmpuint (g_list_length (l), ==, 2);
+
+ v = g_hash_table_lookup (e, "b");
+ g_assert (v != NULL);
+ l = gupnp_dlna_native_value_list_get_list (v);
+ g_assert_cmpuint (g_list_length (l), ==, 1);
+
+ r2 = gupnp_dlna_native_restriction_new ("mime2");
+ v = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_bool ());
+ g_assert (gupnp_dlna_native_value_list_add_single (v, "true"));
+ g_assert (gupnp_dlna_native_restriction_add_value_list (r2, "s", v));
+
+ g_assert (!gupnp_dlna_native_restriction_merge
+ (r1,
+ r2,
+ GUPNP_DLNA_NATIVE_RESTRICTION_MERGE_RESOLUTION_NONE));
+ g_assert (gupnp_dlna_native_restriction_merge
+ (r1,
+ r2,
+ GUPNP_DLNA_NATIVE_RESTRICTION_MERGE_RESOLUTION_FROM_SOURCE));
+ g_assert_cmpstr (gupnp_dlna_native_restriction_get_mime (r1),
+ ==,
+ "mime2");
+ /* TODO: Check types and values. */
+ e = gupnp_dlna_native_restriction_get_entries (r1);
+ g_assert_cmpuint (g_hash_table_size (e), ==, 3);
+ v = g_hash_table_lookup (e, "i");
+ g_assert (v != NULL);
+ l = gupnp_dlna_native_value_list_get_list (v);
+ g_assert_cmpuint (g_list_length (l), ==, 1);
+
+ v = g_hash_table_lookup (e, "s");
+ g_assert (v != NULL);
+ l = gupnp_dlna_native_value_list_get_list (v);
+ g_assert_cmpuint (g_list_length (l), ==, 1);
+
+ v = g_hash_table_lookup (e, "b");
+ g_assert (v != NULL);
+ l = gupnp_dlna_native_value_list_get_list (v);
+ g_assert_cmpuint (g_list_length (l), ==, 1);
+
+ r2 = gupnp_dlna_native_restriction_new (NULL);
+ g_assert (gupnp_dlna_native_restriction_merge
+ (r1,
+ r2,
+ GUPNP_DLNA_NATIVE_RESTRICTION_MERGE_RESOLUTION_FROM_SOURCE));
+ g_assert_cmpstr (gupnp_dlna_native_restriction_get_mime (r1),
+ ==,
+ "mime2");
+ gupnp_dlna_native_restriction_free (r1);
+}
+
+static void
+info_set_adding_values (void)
+{
+ GUPnPDLNANativeInfoSet *info_set =
+ gupnp_dlna_native_info_set_new ("mime");
+
+ g_assert (info_set != NULL);
+ g_assert (gupnp_dlna_native_info_set_add_bool (info_set, "b", TRUE));
+ /* invalid fraction */
+ g_assert (!gupnp_dlna_native_info_set_add_fraction (info_set,
+ "f",
+ 1,
+ 0));
+ g_assert (gupnp_dlna_native_info_set_add_fraction (info_set,
+ "f",
+ 1,
+ 2));
+ g_assert (gupnp_dlna_native_info_set_add_int (info_set, "i", 42));
+ g_assert (gupnp_dlna_native_info_set_add_string (info_set, "s", "str"));
+ /* that name already exists */
+ g_assert (!gupnp_dlna_native_info_set_add_bool (info_set, "b", FALSE));
+
+ gupnp_dlna_native_info_set_free (info_set);
+}
+
+static void
+info_set_fit (void)
+{
+ GUPnPDLNANativeRestriction *r =
+ gupnp_dlna_native_restriction_new ("mime");
+ GUPnPDLNANativeValueList *v = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_bool());
+ GUPnPDLNANativeInfoSet *s;
+
+ /* restriction */
+ g_assert (gupnp_dlna_native_value_list_add_single (v, "true"));
+ g_assert (gupnp_dlna_native_restriction_add_value_list (r, "b1", v));
+ v = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_fraction());
+ g_assert (gupnp_dlna_native_value_list_add_single (v, "1/2"));
+ g_assert (gupnp_dlna_native_restriction_add_value_list (r, "f1", v));
+ v = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_fraction());
+ g_assert (gupnp_dlna_native_value_list_add_range (v, "1/4", "2/3"));
+ g_assert (gupnp_dlna_native_restriction_add_value_list (r, "f2", v));
+ v = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_int());
+ g_assert (gupnp_dlna_native_value_list_add_single (v, "13"));
+ g_assert (gupnp_dlna_native_restriction_add_value_list (r, "i1", v));
+ v = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_int());
+ g_assert (gupnp_dlna_native_value_list_add_range (v, "42", "55"));
+ g_assert (gupnp_dlna_native_restriction_add_value_list (r, "i2", v));
+ v = gupnp_dlna_native_value_list_new
+ (gupnp_dlna_native_value_type_string());
+ g_assert (gupnp_dlna_native_value_list_add_single (v, "aaa"));
+ g_assert (gupnp_dlna_native_restriction_add_value_list (r, "s1", v));
+
+ /* info set with exactly fitting values and same mime*/
+ s = gupnp_dlna_native_info_set_new ("mime");
+ g_assert (gupnp_dlna_native_info_set_add_bool (s, "b1", TRUE));
+ g_assert (gupnp_dlna_native_info_set_add_fraction (s, "f1", 1, 2));
+ g_assert (gupnp_dlna_native_info_set_add_fraction (s, "f2", 1, 3));
+ g_assert (gupnp_dlna_native_info_set_add_int (s, "i1", 13));
+ g_assert (gupnp_dlna_native_info_set_add_int (s, "i2", 50));
+ g_assert (gupnp_dlna_native_info_set_add_string (s, "s1", "aaa"));
+
+ g_assert (gupnp_dlna_native_info_set_fits_restriction (s, r));
+
+ /* add some more values not considered by restriction */
+ g_assert (gupnp_dlna_native_info_set_add_bool (s, "b2", FALSE));
+ g_assert (gupnp_dlna_native_info_set_add_fraction (s, "f3", 4, 5));
+ g_assert (gupnp_dlna_native_info_set_add_int (s, "i3", 7));
+ g_assert (gupnp_dlna_native_info_set_add_string (s, "s2", "bbb"));
+
+ g_assert (gupnp_dlna_native_info_set_fits_restriction (s, r));
+
+ gupnp_dlna_native_info_set_free (s);
+
+ /* info set with exactly fitting values but different mime */
+ s = gupnp_dlna_native_info_set_new ("asdf");
+ g_assert (gupnp_dlna_native_info_set_add_bool (s, "b1", TRUE));
+ g_assert (gupnp_dlna_native_info_set_add_fraction (s, "f1", 1, 2));
+ g_assert (gupnp_dlna_native_info_set_add_fraction (s, "f2", 1, 3));
+ g_assert (gupnp_dlna_native_info_set_add_int (s, "i1", 13));
+ g_assert (gupnp_dlna_native_info_set_add_int (s, "i2", 50));
+ g_assert (gupnp_dlna_native_info_set_add_string (s, "s1", "aaa"));
+
+ g_assert (!gupnp_dlna_native_info_set_fits_restriction (s, r));
+
+ /* add some more values not considered by restriction */
+ g_assert (gupnp_dlna_native_info_set_add_bool (s, "b2", FALSE));
+ g_assert (gupnp_dlna_native_info_set_add_fraction (s, "f3", 4, 5));
+ g_assert (gupnp_dlna_native_info_set_add_int (s, "i3", 7));
+ g_assert (gupnp_dlna_native_info_set_add_string (s, "s2", "bbb"));
+
+ g_assert (!gupnp_dlna_native_info_set_fits_restriction (s, r));
+
+ gupnp_dlna_native_info_set_free (s);
+
+ /* info set with same mime, exact fitting set but not fitting values */
+ s = gupnp_dlna_native_info_set_new ("mime");
+ g_assert (gupnp_dlna_native_info_set_add_bool (s, "b1", FALSE));
+ g_assert (gupnp_dlna_native_info_set_add_fraction (s, "f1", 3, 2));
+ g_assert (gupnp_dlna_native_info_set_add_fraction (s, "f2", 3, 3));
+ g_assert (gupnp_dlna_native_info_set_add_int (s, "i1", 17));
+ g_assert (gupnp_dlna_native_info_set_add_int (s, "i2", 57));
+ g_assert (gupnp_dlna_native_info_set_add_string (s, "s1", "aaaa"));
+
+ g_assert (!gupnp_dlna_native_info_set_fits_restriction (s, r));
+
+ /* add some more values not considered by restriction */
+ g_assert (gupnp_dlna_native_info_set_add_bool (s, "b2", FALSE));
+ g_assert (gupnp_dlna_native_info_set_add_fraction (s, "f3", 4, 5));
+ g_assert (gupnp_dlna_native_info_set_add_int (s, "i3", 7));
+ g_assert (gupnp_dlna_native_info_set_add_string (s, "s2", "bbb"));
+
+ g_assert (!gupnp_dlna_native_info_set_fits_restriction (s, r));
+
+ gupnp_dlna_native_info_set_free (s);
+
+ /* info set with same mime but with too few values */
+ s = gupnp_dlna_native_info_set_new ("mime");
+ g_assert (gupnp_dlna_native_info_set_add_fraction (s, "f2", 1, 3));
+ g_assert (gupnp_dlna_native_info_set_add_int (s, "i1", 13));
+
+ g_assert (!gupnp_dlna_native_info_set_fits_restriction (s, r));
+
+ /* add some more values not considered by restriction */
+ g_assert (gupnp_dlna_native_info_set_add_bool (s, "b2", FALSE));
+ g_assert (gupnp_dlna_native_info_set_add_fraction (s, "f3", 4, 5));
+ g_assert (gupnp_dlna_native_info_set_add_int (s, "i3", 7));
+ g_assert (gupnp_dlna_native_info_set_add_string (s, "s2", "bbb"));
+
+ g_assert (!gupnp_dlna_native_info_set_fits_restriction (s, r));
+
+ /* add missing values */
+ g_assert (gupnp_dlna_native_info_set_add_bool (s, "b1", TRUE));
+ g_assert (gupnp_dlna_native_info_set_add_fraction (s, "f1", 1, 2));
+ g_assert (gupnp_dlna_native_info_set_add_int (s, "i2", 50));
+ g_assert (gupnp_dlna_native_info_set_add_string (s, "s1", "aaa"));
+
+ g_assert (gupnp_dlna_native_info_set_fits_restriction (s, r));
+
+ gupnp_dlna_native_info_set_free (s);
+ gupnp_dlna_native_restriction_free (r);
+}
+
+int
+main (int argc, char **argv)
+{
+ g_test_init (&argc, &argv, NULL);
+
+ g_test_add_func ("/value-type/not-null", value_type_not_null);
+ g_test_add_func ("/value-list/single", value_list_single);
+ g_test_add_func ("/value-list/range", value_list_range);
+ g_test_add_func ("/restriction/construction", restriction_construction);
+ g_test_add_func ("/restriction/empty", restriction_empty);
+ g_test_add_func ("/restriction/adding-value-lists",
+ restriction_adding_value_lists);
+ g_test_add_func ("/restriction/merge", restriction_merge);
+ g_test_add_func ("/info-set/adding-values", info_set_adding_values);
+ g_test_add_func ("/info-set/fit", info_set_fit);
+
+ g_test_run ();
+
+ return 0;
+}
diff --git a/tests/test-discoverer.sh.in b/tests/test-discoverer.sh.in
index 0310942..a8d616c 100644
--- a/tests/test-discoverer.sh.in
+++ b/tests/test-discoverer.sh.in
@@ -26,7 +26,7 @@
# git clone git://git.gnome.org/gupnp-dlna-media tests/media
if [[ "x${GUPNP_DLNA_INFO}" = "x" ]]; then
- GUPNP_DLNA_INFO= abs_top_builddir@/tools/gupnp-dlna-info
+ GUPNP_DLNA_INFO= abs_top_builddir@/tools/gupnp-dlna-info-2.0
fi
# See if params are available in the environment - if yes, carry on, else read
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
