Merge pull request #699 from linquize/atom-bug-2-10

Atom bug 2 10
mono · Jul 23, 2013 · b06fc16 · b06fc16
2 parents 1609a11 + 372c612
commit b06fc16
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10FeedFormatter.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10FeedFormatter.cs
@@ -476,7 +476,7 @@ void WriteXml (XmlWriter writer, bool writeRoot)
 				}
 
 			if (Feed.Description != null)
-				Feed.Description.WriteTo (writer, "description", AtomNamespace);
+				Feed.Description.WriteTo (writer, "subtitle", AtomNamespace);
 
 			if (Feed.ImageUrl != null)
 				writer.WriteElementString ("logo", AtomNamespace, Feed.ImageUrl.ToString ());

diff --git a/...s/System.ServiceModel.Web/Test/System.ServiceModel.Syndication/Atom10FeedFormatterTest.cs b/...s/System.ServiceModel.Web/Test/System.ServiceModel.Syndication/Atom10FeedFormatterTest.cs
@@ -160,6 +160,7 @@ public void WriteTo ()
 			SyndicationFeed feed = new SyndicationFeed ();
 			feed.BaseUri = new Uri ("http://mono-project.com");
 			feed.Copyright = new TextSyndicationContent ("No rights reserved");
+			feed.Description = new TextSyndicationContent ("A sample feed for unit testing");
 			feed.Generator = "mono test generator";
 			// .NET bug: it ignores this value.
 			feed.Id = "urn:myid";
@@ -169,7 +170,7 @@ public void WriteTo ()
 			StringWriter sw = new StringWriter ();
 			using (XmlWriter w = CreateWriter (sw))
 				new Atom10FeedFormatter (feed).WriteTo (w);
-			Assert.AreEqual ("<feed xml:base=\"http://mono-project.com/\" xmlns=\"http://www.w3.org/2005/Atom\"><title type=\"text\"></title><id>XXX</id><rights type=\"text\">No rights reserved</rights><updated>2008-01-01T00:00:00Z</updated><logo>http://mono-project.com/images/mono.png</logo><generator>mono test generator</generator></feed>", DummyId (sw.ToString ()));
+			Assert.AreEqual ("<feed xml:base=\"http://mono-project.com/\" xmlns=\"http://www.w3.org/2005/Atom\"><title type=\"text\"></title><id>XXX</id><rights type=\"text\">No rights reserved</rights><updated>2008-01-01T00:00:00Z</updated><subtitle type=\"text\">A sample feed for unit testing</subtitle><logo>http://mono-project.com/images/mono.png</logo><generator>mono test generator</generator></feed>", DummyId (sw.ToString ()));
 		}
 
 		[Test]