GNOME.org
 

[libgdata] [media] Corrected Media RSS namespace

commit fb9db6f6edb1480b54e281a1f4de57e492b0dfd4
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Sep 21 08:25:31 2009 +0100

    [media] Corrected Media RSS namespace

 gdata/media/gdata-media-category.c  |    2 +-
 gdata/media/gdata-media-content.c   |    2 +-
 gdata/media/gdata-media-credit.c    |    2 +-
 gdata/media/gdata-media-group.c     |    2 +-
 gdata/media/gdata-media-thumbnail.c |    2 +-
 gdata/tests/general.c               |   28 ++++++++++++++--------------
 gdata/tests/picasaweb.c             |    4 ++--
 gdata/tests/youtube.c               |    5 ++---
 8 files changed, 23 insertions(+), 24 deletions(-)
---
diff --git a/gdata/media/gdata-media-category.c b/gdata/media/gdata-media-category.c
index 6ef1480..9b309bb 100644
--- a/gdata/media/gdata-media-category.c
+++ b/gdata/media/gdata-media-category.c
@@ -258,7 +258,7 @@ get_xml (GDataParsable *parsable, GString *xml_string)
 static void
 get_namespaces (GDataParsable *parsable, GHashTable *namespaces)
 {
-	g_hash_table_insert (namespaces, (gchar*) "media", (gchar*) "http://video.search.yahoo.com/mrss";);
+	g_hash_table_insert (namespaces, (gchar*) "media", (gchar*) "http://search.yahoo.com/mrss/";);
 }
 
 /**
diff --git a/gdata/media/gdata-media-content.c b/gdata/media/gdata-media-content.c
index 2f7da9a..f5fc09c 100644
--- a/gdata/media/gdata-media-content.c
+++ b/gdata/media/gdata-media-content.c
@@ -389,7 +389,7 @@ pre_parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *root_node, gpointe
 static void
 get_namespaces (GDataParsable *parsable, GHashTable *namespaces)
 {
-	g_hash_table_insert (namespaces, (gchar*) "media", (gchar*) "http://video.search.yahoo.com/mrss";);
+	g_hash_table_insert (namespaces, (gchar*) "media", (gchar*) "http://search.yahoo.com/mrss/";);
 }
 
 /**
diff --git a/gdata/media/gdata-media-credit.c b/gdata/media/gdata-media-credit.c
index cef3740..f90f28e 100644
--- a/gdata/media/gdata-media-credit.c
+++ b/gdata/media/gdata-media-credit.c
@@ -222,7 +222,7 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da
 static void
 get_namespaces (GDataParsable *parsable, GHashTable *namespaces)
 {
-	g_hash_table_insert (namespaces, (gchar*) "media", (gchar*) "http://video.search.yahoo.com/mrss";);
+	g_hash_table_insert (namespaces, (gchar*) "media", (gchar*) "http://search.yahoo.com/mrss/";);
 }
 
 /**
diff --git a/gdata/media/gdata-media-group.c b/gdata/media/gdata-media-group.c
index a15b851..5614071 100644
--- a/gdata/media/gdata-media-group.c
+++ b/gdata/media/gdata-media-group.c
@@ -279,7 +279,7 @@ get_xml (GDataParsable *parsable, GString *xml_string)
 static void
 get_namespaces (GDataParsable *parsable, GHashTable *namespaces)
 {
-	g_hash_table_insert (namespaces, (gchar*) "media", (gchar*) "http://video.search.yahoo.com/mrss";);
+	g_hash_table_insert (namespaces, (gchar*) "media", (gchar*) "http://search.yahoo.com/mrss/";);
 }
 
 /**
diff --git a/gdata/media/gdata-media-thumbnail.c b/gdata/media/gdata-media-thumbnail.c
index 90245c3..e1fd657 100644
--- a/gdata/media/gdata-media-thumbnail.c
+++ b/gdata/media/gdata-media-thumbnail.c
@@ -290,7 +290,7 @@ pre_parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *root_node, gpointe
 static void
 get_namespaces (GDataParsable *parsable, GHashTable *namespaces)
 {
-	g_hash_table_insert (namespaces, (gchar*) "media", (gchar*) "http://video.search.yahoo.com/mrss";);
+	g_hash_table_insert (namespaces, (gchar*) "media", (gchar*) "http://search.yahoo.com/mrss/";);
 }
 
 /**
diff --git a/gdata/tests/general.c b/gdata/tests/general.c
index e779b75..da12886 100644
--- a/gdata/tests/general.c
+++ b/gdata/tests/general.c
@@ -1234,7 +1234,7 @@ test_media_category (void)
 	GError *error = NULL;
 
 	category = GDATA_MEDIA_CATEGORY (gdata_parsable_new_from_xml (GDATA_TYPE_MEDIA_CATEGORY,
-		"<media:category xmlns:media='http://video.search.yahoo.com/mrss' scheme='http://dmoz.org' "
+		"<media:category xmlns:media='http://search.yahoo.com/mrss/' scheme='http://dmoz.org' "
 			"label='Ace Ventura - Pet &amp; Detective'>Arts/Movies/Titles/A/Ace_Ventura_Series/Ace_Ventura_-_Pet_Detective"
 			"</media:category>", -1, &error));
 	g_assert_no_error (error);
@@ -1249,7 +1249,7 @@ test_media_category (void)
 	/* Check the outputted XML is the same */
 	xml = gdata_parsable_get_xml (GDATA_PARSABLE (category));
 	g_assert_cmpstr (xml, ==,
-			 "<media:category xmlns='http://www.w3.org/2005/Atom' xmlns:media='http://video.search.yahoo.com/mrss' "
+			 "<media:category xmlns='http://www.w3.org/2005/Atom' xmlns:media='http://search.yahoo.com/mrss/' "
 				"scheme='http://dmoz.org' "
 				"label='Ace Ventura - Pet &amp; Detective'>Arts/Movies/Titles/A/Ace_Ventura_Series/Ace_Ventura_-_Pet_Detective"
 				"</media:category>");
@@ -1258,7 +1258,7 @@ test_media_category (void)
 
 	/* Now parse one with less information available */
 	category = GDATA_MEDIA_CATEGORY (gdata_parsable_new_from_xml (GDATA_TYPE_MEDIA_CATEGORY,
-		"<media:category xmlns:media='http://video.search.yahoo.com/mrss'>foo</media:category>", -1, &error));
+		"<media:category xmlns:media='http://search.yahoo.com/mrss/'>foo</media:category>", -1, &error));
 	g_assert_no_error (error);
 	g_assert (GDATA_IS_MEDIA_CATEGORY (category));
 	g_clear_error (&error);
@@ -1271,7 +1271,7 @@ test_media_category (void)
 	/* Check the outputted XML is the same */
 	xml = gdata_parsable_get_xml (GDATA_PARSABLE (category));
 	g_assert_cmpstr (xml, ==,
-			 "<media:category xmlns='http://www.w3.org/2005/Atom' xmlns:media='http://video.search.yahoo.com/mrss' "
+			 "<media:category xmlns='http://www.w3.org/2005/Atom' xmlns:media='http://search.yahoo.com/mrss/' "
 				"scheme='http://video.search.yahoo.com/mrss/category_schema'>foo</media:category>");
 	g_free (xml);
 	g_object_unref (category);
@@ -1284,7 +1284,7 @@ test_media_content (void)
 	GError *error = NULL;
 
 	content = GDATA_MEDIA_CONTENT (gdata_parsable_new_from_xml (GDATA_TYPE_MEDIA_CONTENT,
-		"<media:content xmlns:media='http://video.search.yahoo.com/mrss' url='http://www.foo.com/movie.mov' fileSize='12216320' "
+		"<media:content xmlns:media='http://search.yahoo.com/mrss/' url='http://www.foo.com/movie.mov' fileSize='12216320' "
 			"type='video/quicktime' medium='video' isDefault='true' expression='nonstop' duration='185' height='200' width='300'/>",
 			-1, &error));
 	g_assert_no_error (error);
@@ -1307,7 +1307,7 @@ test_media_content (void)
 
 	/* Now parse one with less information available */
 	content = GDATA_MEDIA_CONTENT (gdata_parsable_new_from_xml (GDATA_TYPE_MEDIA_CONTENT,
-		"<media:content xmlns:media='http://video.search.yahoo.com/mrss' url='http://foobar.com/'/>", -1, &error));
+		"<media:content xmlns:media='http://search.yahoo.com/mrss/' url='http://foobar.com/'/>", -1, &error));
 	g_assert_no_error (error);
 	g_assert (GDATA_IS_MEDIA_CONTENT (content));
 	g_clear_error (&error);
@@ -1333,7 +1333,7 @@ test_media_credit (void)
 	GError *error = NULL;
 
 	credit = GDATA_MEDIA_CREDIT (gdata_parsable_new_from_xml (GDATA_TYPE_MEDIA_CREDIT,
-		"<media:credit xmlns:media='http://video.search.yahoo.com/mrss' role='producer' scheme='urn:foobar'>entity name</media:credit>",
+		"<media:credit xmlns:media='http://search.yahoo.com/mrss/' role='producer' scheme='urn:foobar'>entity name</media:credit>",
 			-1, &error));
 	g_assert_no_error (error);
 	g_assert (GDATA_IS_MEDIA_CREDIT (credit));
@@ -1349,7 +1349,7 @@ test_media_credit (void)
 
 	/* Now parse one with less information available */
 	credit = GDATA_MEDIA_CREDIT (gdata_parsable_new_from_xml (GDATA_TYPE_MEDIA_CREDIT,
-		"<media:credit xmlns:media='http://video.search.yahoo.com/mrss'>John Smith</media:credit>", -1, &error));
+		"<media:credit xmlns:media='http://search.yahoo.com/mrss/'>John Smith</media:credit>", -1, &error));
 	g_assert_no_error (error);
 	g_assert (GDATA_IS_MEDIA_CREDIT (credit));
 	g_clear_error (&error);
@@ -1373,7 +1373,7 @@ test_media_group (void)
 	GError *error = NULL;
 
 	group = GDATA_MEDIA_GROUP (gdata_parsable_new_from_xml (GDATA_TYPE_MEDIA_GROUP,
-		"<media:group xmlns:media='http://video.search.yahoo.com/mrss'>"
+		"<media:group xmlns:media='http://search.yahoo.com/mrss/'>"
 			"<media:title>Foobar â?? shizzle!</media:title>"
 			"<media:description>This is a description, isn't itâ?½</media:description>"
 			"<media:keywords>keywords,are, fun</media:keywords>"
@@ -1420,7 +1420,7 @@ test_media_group (void)
 	/* Check the outputted XML is the same */
 	xml = gdata_parsable_get_xml (GDATA_PARSABLE (group));
 	g_assert_cmpstr (xml, ==,
-			 "<media:group xmlns:media='http://video.search.yahoo.com/mrss'>"
+			 "<media:group xmlns:media='http://search.yahoo.com/mrss/'>"
 				"<media:title>Foobar â?? shizzle!</media:title>"
 				"<media:description>This is a description, isn't itâ?½</media:description>"
 				"<media:keywords>keywords,are, fun</media:keywords>"
@@ -1461,7 +1461,7 @@ test_media_group (void)
 
 	/* Now parse one with less information available */
 	group = GDATA_MEDIA_GROUP (gdata_parsable_new_from_xml (GDATA_TYPE_MEDIA_GROUP,
-		"<media:group xmlns:media='http://video.search.yahoo.com/mrss'></media:group>", -1, &error));
+		"<media:group xmlns:media='http://search.yahoo.com/mrss/'></media:group>", -1, &error));
 	g_assert_no_error (error);
 	g_assert (GDATA_IS_MEDIA_GROUP (group));
 	g_clear_error (&error);
@@ -1483,7 +1483,7 @@ test_media_group (void)
 
 	/* Check the outputted XML is the same */
 	xml = gdata_parsable_get_xml (GDATA_PARSABLE (group));
-	g_assert_cmpstr (xml, ==, "<media:group xmlns='http://www.w3.org/2005/Atom' xmlns:media='http://video.search.yahoo.com/mrss'></media:group>");
+	g_assert_cmpstr (xml, ==, "<media:group xmlns='http://www.w3.org/2005/Atom' xmlns:media='http://search.yahoo.com/mrss/'></media:group>");
 	g_free (xml);
 	g_object_unref (group);
 }
@@ -1496,7 +1496,7 @@ test_media_thumbnail (void)
 	GError *error = NULL;
 
 	thumbnail = GDATA_MEDIA_THUMBNAIL (gdata_parsable_new_from_xml (GDATA_TYPE_MEDIA_THUMBNAIL,
-		"<media:thumbnail xmlns:media='http://video.search.yahoo.com/mrss' url='http://www.foo.com/keyframe.jpg' width='75' height='50' "
+		"<media:thumbnail xmlns:media='http://search.yahoo.com/mrss/' url='http://www.foo.com/keyframe.jpg' width='75' height='50' "
 			"time='12:05:01.123'/>", -1, &error));
 	g_assert_no_error (error);
 	g_assert (GDATA_IS_MEDIA_THUMBNAIL (thumbnail));
@@ -1513,7 +1513,7 @@ test_media_thumbnail (void)
 
 	/* Now parse one with less information available */
 	thumbnail = GDATA_MEDIA_THUMBNAIL (gdata_parsable_new_from_xml (GDATA_TYPE_MEDIA_THUMBNAIL,
-		"<media:thumbnail xmlns:media='http://video.search.yahoo.com/mrss' url='http://foobar.com/'/>", -1, &error));
+		"<media:thumbnail xmlns:media='http://search.yahoo.com/mrss/' url='http://foobar.com/'/>", -1, &error));
 	g_assert_no_error (error);
 	g_assert (GDATA_IS_MEDIA_THUMBNAIL (thumbnail));
 	g_clear_error (&error);
diff --git a/gdata/tests/picasaweb.c b/gdata/tests/picasaweb.c
index 05de42e..20311b4 100644
--- a/gdata/tests/picasaweb.c
+++ b/gdata/tests/picasaweb.c
@@ -119,7 +119,7 @@ test_upload_simple (GDataService *service)
 	expected_xml = g_strdup_printf ("<entry "
 						"xmlns='http://www.w3.org/2005/Atom' "
 						"xmlns:gphoto='http://schemas.google.com/photos/2007' "
-						"xmlns:media='http://video.search.yahoo.com/mrss' "
+						"xmlns:media='http://search.yahoo.com/mrss/' "
 						"xmlns:gd='http://schemas.google.com/g/2005' "
 						"xmlns:exif='http://schemas.google.com/photos/exif/2007' "
 						"xmlns:app='http://www.w3.org/2007/app' "
@@ -562,7 +562,7 @@ test_query_all_albums (GDataService *service)
 	GDataPicasaWebAlbum *album;
 
 	/* Test a query with a "q" parameter; it should fail */
-	query = gdata_picasaweb_query_new ("foobar");
+	query = GDATA_PICASAWEB_QUERY (gdata_picasaweb_query_new ("foobar"));
 	album_feed = gdata_picasaweb_service_query_all_albums (GDATA_PICASAWEB_SERVICE (service), query, NULL, NULL, NULL, NULL, &error);
 	g_assert_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_BAD_QUERY_PARAMETER);
 	g_assert (album_feed == NULL);
diff --git a/gdata/tests/youtube.c b/gdata/tests/youtube.c
index c741f8e..cabd9c5 100644
--- a/gdata/tests/youtube.c
+++ b/gdata/tests/youtube.c
@@ -380,7 +380,7 @@ test_parsing_yt_recorded (GDataService *service)
 
 	video = GDATA_YOUTUBE_VIDEO (gdata_parsable_new_from_xml (GDATA_TYPE_YOUTUBE_VIDEO,
 		"<entry xmlns='http://www.w3.org/2005/Atom' "
-			"xmlns:media='http://video.search.yahoo.com/mrss' "
+			"xmlns:media='http://search.yahoo.com/mrss/' "
 			"xmlns:yt='http://gdata.youtube.com/schemas/2007' "
 			"xmlns:gd='http://schemas.google.com/g/2005' "
 			"gd:etag='W/\"CEMFSX47eCp7ImA9WxVUGEw.\"'>"
@@ -419,7 +419,7 @@ test_parsing_yt_recorded (GDataService *service)
 	xml = gdata_parsable_get_xml (GDATA_PARSABLE (video));
 	g_assert_cmpstr (xml, ==,
 			 "<entry xmlns='http://www.w3.org/2005/Atom' "
-				"xmlns:media='http://video.search.yahoo.com/mrss' "
+				"xmlns:media='http://search.yahoo.com/mrss/' "
 				"xmlns:gd='http://schemas.google.com/g/2005' "
 				"xmlns:yt='http://gdata.youtube.com/schemas/2007' "
 				"xmlns:app='http://www.w3.org/2007/app' "
@@ -607,7 +607,6 @@ test_query_single_async_cb (GDataService *service, GAsyncResult *async_result, G
 	video = gdata_youtube_service_query_single_video_finish (GDATA_YOUTUBE_SERVICE (service), async_result, &error);
 
 	g_assert_no_error (error);
-	g_assert (video != NULL);
 	g_assert (GDATA_IS_YOUTUBE_VIDEO (video));
 	g_assert_cmpstr (gdata_youtube_video_get_video_id (video), ==, "_LeQuMpwbW4");
 	g_assert_cmpstr (gdata_entry_get_id (GDATA_ENTRY (video)), ==, "tag:youtube.com,2008:video:_LeQuMpwbW4");
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]