summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Duponchelle <mathieu.duponchelle@opencreed.com>2015-04-25 17:28:15 +0200
committerBastien Nocera <hadess@hadess.net>2015-07-17 15:27:14 +0200
commitde50ad298b88bddabd6d5cc9c1f20f93731c1f7b (patch)
tree1c560dbbb41355c1a7517cf6e15191c34c18dcce
parent851e3cf4c9b240b60941d9c72af0cb812a18c002 (diff)
downloadgrilo-de50ad298b88bddabd6d5cc9c1f20f93731c1f7b.tar.gz
core: Remove remaining references to GrlMetadataSource
https://bugzilla.gnome.org/show_bug.cgi?id=748455
-rw-r--r--doc/grilo/Makefile.am1
-rw-r--r--src/grl-metadata-source-priv.h36
-rw-r--r--tests/Makefile.am4
-rw-r--r--tests/metadata_source.c180
-rw-r--r--tests/python/Makefile.am3
-rw-r--r--tests/python/test_metadata_source.py106
6 files changed, 1 insertions, 329 deletions
diff --git a/doc/grilo/Makefile.am b/doc/grilo/Makefile.am
index 5055940..11ce422 100644
--- a/doc/grilo/Makefile.am
+++ b/doc/grilo/Makefile.am
@@ -62,7 +62,6 @@ IGNORE_HFILES=config.h \
grl-log-priv.h \
grl-marshal.h \
grl-metadata-key-priv.h \
- grl-metadata-source-priv.h \
grl-net-mock-private.h \
grl-operation-options-priv.h \
grl-operation-priv.h \
diff --git a/src/grl-metadata-source-priv.h b/src/grl-metadata-source-priv.h
deleted file mode 100644
index 22f4411..0000000
--- a/src/grl-metadata-source-priv.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2010-2012 Igalia S.L.
- *
- * Contact: Iago Toral Quiroga <itoral@igalia.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; version 2.1 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 St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#ifndef _GRL_METADATA_SOURCE_PRIV_H_
-#define _GRL_METADATA_SOURCE_PRIV_H_
-
-#include "grl-metadata-source.h"
-
-#include <glib.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-
-G_END_DECLS
-
-#endif /* _GRL_METADATA_SOURCE_PRIV_H_ */
diff --git a/tests/Makefile.am b/tests/Makefile.am
index be1f757..0695481 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,10 +15,6 @@ TEST_PROGS = registry
registry_SOURCES = registry.c
registry_LDADD = $(progs_ldadd)
-TEST_PROGS += metadata_source
-metadata_source_SOURCES = metadata_source.c
-metadata_source_LDADD = $(progs_ldadd)
-
### testing rules (from glib)
GTESTER = gtester
diff --git a/tests/metadata_source.c b/tests/metadata_source.c
deleted file mode 100644
index 6dfb93a..0000000
--- a/tests/metadata_source.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (C) 2010 Víctor M. Jáquez Leal <vjaquez@igalia.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; version 2.1 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 St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#include <glib.h>
-#include <grilo.h>
-#include <stdbool.h>
-
-static GList *sources;
-static GList *keys;
-
-/* #define DUMP 1 */
-
-#if GLIB_CHECK_VERSION(2,22,0)
-
-#include <string.h> /* for strstr */
-
-#define CHECK_MESSAGE(domain, error_message) \
- (g_strcmp0 (log_domain, domain) == 0 && strstr (message, error_message))
-
-static gboolean
-registry_load_error_handler (const gchar *log_domain,
- GLogLevelFlags log_level,
- const gchar *message,
- gpointer user_data)
-{
- if (CHECK_MESSAGE ("Grilo", "Failed to initialize plugin") ||
- CHECK_MESSAGE ("Grilo", "Configuration not provided") ||
- CHECK_MESSAGE ("Grilo", "Missing configuration") ||
- CHECK_MESSAGE ("Grilo", "Could not open plugin directory") ||
- CHECK_MESSAGE ("Grilo", "Could not read XML file")) {
- return FALSE;
- }
-
- return TRUE;
-}
-
-#endif
-
-static bool
-load_metadata_sources ()
-{
- GrlRegistry *reg;
-
- reg = grl_registry_get_default ();
- if (!reg)
- return false;
-
-#if GLIB_CHECK_VERSION(2,22,0)
- g_test_log_set_fatal_handler (registry_load_error_handler, NULL);
-#endif
-
- if (!grl_registry_load_all_plugins (reg, NULL))
- return false;
-
- keys = grl_registry_get_metadata_keys (reg);
- if (!keys)
- return false;
-
- sources = grl_registry_get_sources (reg, false);
- if (!sources)
- return false;
-
- return true;
-}
-
-#if DUMP
-static void
-print_keys (GrlMetadataSource *source,
- GList *keys)
-{
- GList *iter;
-
- g_print ("%s:\n", grl_metadata_source_get_name (source));
- for (iter = keys; iter; iter = g_list_next (iter)) {
- g_print ("\t%s\n", g_param_spec_get_name (iter->data));
- }
-}
-#endif
-
-enum filter_types { SUPPORTED, SLOW, WRITABLE, LAST_FILTER };
-
-typedef GList* (*KeyFilterFunc) (GrlMetadataSource *source,
- GList **keys,
- gboolean return_filtered);
-
-KeyFilterFunc key_filter[LAST_FILTER] = {
- grl_metadata_source_filter_supported,
- grl_metadata_source_filter_slow,
- grl_metadata_source_filter_writable
-};
-
-static void
-test_key_filters (enum filter_types filter)
-{
- GList *iter;
- unsigned int keys_num;
-
- keys_num = g_list_length (keys);
-
- for (iter = sources; iter; iter = g_list_next (iter)) {
- GList *filtered, *unfiltered;
- GrlMetadataSource *source;
- unsigned int fil_num, unfil_num;
-
- source = GRL_METADATA_SOURCE (iter->data);
- filtered = g_list_copy (keys);
- unfiltered = key_filter[filter] (source, &filtered, true);
-
-#if DUMP
- print_keys (source, filtered);
-#endif
-
- fil_num = g_list_length (filtered);
- unfil_num = g_list_length (unfiltered);
-
- g_list_free (filtered);
- g_list_free (unfiltered);
-
- g_assert_cmpuint (fil_num + unfil_num, ==, keys_num);
- }
-}
-
-static void
-test_metadata_source_supported_keys (void)
-{
- test_key_filters (SUPPORTED);
-}
-
-static void
-test_metadata_source_slow_keys (void)
-{
- test_key_filters (SLOW);
-}
-
-static void
-test_metadata_source_writable_keys (void)
-{
- test_key_filters (WRITABLE);
-}
-
-int
-main (int argc, char **argv)
-{
- /* initialize the gtester */
- g_test_init (&argc, &argv, NULL);
-
- /* initialize grilo */
- grl_init (&argc, &argv);
-
- g_assert (load_metadata_sources ());
-
- /* registry tests */
- g_test_add_func ("/metadata_source/filter_supported_keys",
- test_metadata_source_supported_keys);
-
- g_test_add_func ("/metadata_source/filter_slow_keys",
- test_metadata_source_slow_keys);
-
- g_test_add_func ("/metadata_source/filter_writable_keys",
- test_metadata_source_writable_keys);
-
- return g_test_run ();
-}
diff --git a/tests/python/Makefile.am b/tests/python/Makefile.am
index a8e91fd..61af918 100644
--- a/tests/python/Makefile.am
+++ b/tests/python/Makefile.am
@@ -12,8 +12,7 @@ if HAVE_INTROSPECTION
EXTRA_DIST = \
testrunner.py \
test_registry.py \
- test_plugin.py \
- test_metadata_source.py
+ test_plugin.py
endif
.PHONY: test test-report perf-report full-report
diff --git a/tests/python/test_metadata_source.py b/tests/python/test_metadata_source.py
deleted file mode 100644
index 9642e9a..0000000
--- a/tests/python/test_metadata_source.py
+++ /dev/null
@@ -1,106 +0,0 @@
-import unittest
-import logging
-import constants
-
-try:
- from gi.repository import Grl
-except:
- logging.warning("Unable to import Grilo's introspection bindings")
-
-class TestMetadataSource(unittest.TestCase):
-
- MEDIA = Grl.Media()
- METADATA_FLAGS = Grl.MetadataResolutionFlags(Grl.MetadataResolutionFlags.FULL |
- Grl.MetadataResolutionFlags.IDLE_RELAY)
-
- def __init__(self, method_name):
- super(TestMetadataSource, self).__init__(method_name)
- Grl.init([])
- self.registry = Grl.Registry.get_default()
- self.registry.load_all()
- ops = Grl.SupportedOps(Grl.SupportedOps.RESOLVE |
- Grl.SupportedOps.SET_METADATA)
- sources = self.registry.get_sources_by_operations(ops, False)
- if sources:
- self.metadata_source = sources[0]
-
- def test_supported_ops(self):
- ops = self.metadata_source.supported_operations()
- self.assertTrue(ops)
-
- def test_supported_keys(self):
- keys = self.metadata_source.supported_keys()
- self.assertTrue(keys)
-
- def test_slow_keys(self):
- keys = self.metadata_source.slow_keys()
-
- def test_filter_supported(self):
- sources = self.registry.get_sources(False)
- keys = self.registry.get_metadata_keys()
- for source in sources:
- supported, unsupported = source.filter_supported(keys, True)
- self.assertEqual(len(supported) + len(unsupported), len(keys))
-
- def test_filter_slow(self):
- sources = self.registry.get_sources(False)
- keys = self.registry.get_metadata_keys()
- for source in sources:
- fast, slow = source.filter_slow(keys, True)
- self.assertEqual(len(fast) + len(slow), len(keys))
-
- def test_filter_writable(self):
- sources = self.registry.get_sources(False)
- keys = self.registry.get_metadata_keys()
- for source in sources:
- writable, unwritable = source.filter_writable(keys, True)
- self.assertEqual(len(writable) + len(unwritable), len(keys))
-
- def test_key_depends(self):
- key_id = self.registry.lookup_metadata_key(constants.KEY_ID)
- keys = self.metadata_source.key_depends(key_id)
- self.assertTrue(keys is not None)
-
- def test_writable_keys(self):
- keys = self.metadata_source.writable_keys()
- self.assertTrue(keys is not None)
-
- def test_resolve(self):
- self.metadata_source.resolve([], self.MEDIA, self.METADATA_FLAGS,
- self.resolve_cb, None)
-
- def resolve_cb(self, *args):
- pass
-
- def test_resolve_sync(self):
- try:
- self.metadata_source.resolve_sync([], self.MEDIA, self.METADATA_FLAGS)
- except Exception, ex:
- self.fail(ex)
-
- def test_set_metadata(self):
- self.metadata_source.set_metadata(self.MEDIA, [], self.METADATA_FLAGS,
- self.metadata_cb, None)
-
- def metadata_cb(self, *args):
- pass
-
- def test_set_metadata_sync(self):
- try:
- self.metadata_source.set_metadata_sync(self.MEDIA,
- self.registry.get_metadata_keys(),
- self.METADATA_FLAGS)
- except Exception, ex:
- self.fail(ex)
-
- def test_get_id(self):
- id = self.metadata_source.get_id()
- self.assertTrue(id)
-
- def test_get_name(self):
- name = self.metadata_source.get_name()
- self.assertTrue(name)
-
- def test_get_description(self):
- description = self.metadata_source.get_description()
- self.assertTrue(description)