merges r23446 from trunk into ruby_1_9_1.

--
* lib/rss/maker/feed.rb, test/test_maker_atom_entry.rb,
  test/test_maker_atom_feed.rb: fix duplicated dc:date.
  Reported by Kazuhiro NISHIYAMA. Thanks!!! [ruby-list:46014]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 29 insertions, 0 deletions

diff --git a/test/rss/test_maker_atom_entry.rb b/test/rss/test_maker_atom_entry.rb
index ae0ab2d09f..564c582be9 100644
--- a/test/rss/test_maker_atom_entry.rb
+++ b/test/rss/test_maker_atom_entry.rb
@@ -363,5 +363,20 @@ module RSS
         setup_dummy_item_atom(maker)
       end
     end
+
+    def test_date
+      date = Time.parse("2004/11/1 10:10")
+      feed = Maker.make("atom:entry") do |maker|
+        setup_dummy_channel_atom(maker)
+        maker.channel.date = nil
+        maker.items.new_item do |item|
+          item.link = "http://example.com/article.html"
+          item.title = "Sample Article"
+          item.date = date
+        end
+      end
+      assert_equal(date, feed.items[0].updated.content)
+      assert_equal([date], feed.items[0].dc_dates.collect {|date| date.value})
+    end
   end
 end
diff --git a/test/rss/test_maker_atom_feed.rb b/test/rss/test_maker_atom_feed.rb
index e5bf0e23b2..94a03662b7 100644
--- a/test/rss/test_maker_atom_feed.rb
+++ b/test/rss/test_maker_atom_feed.rb
@@ -385,5 +385,19 @@ module RSS
         setup_dummy_item_atom(maker)
       end
     end
+    
+    def test_date
+      date = Time.parse("2004/11/1 10:10")
+      feed = Maker.make("atom") do |maker|
+        setup_dummy_channel_atom(maker)
+        maker.items.new_item do |item|
+          item.link = "http://example.com/article.html"
+          item.title = "Sample Article"
+          item.date = date
+        end
+      end
+      assert_equal(date, feed.items[0].updated.content)
+      assert_equal([date], feed.items[0].dc_dates.collect {|date| date.value})
+    end
   end
 end