diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | test/rexml/xpath/test_text.rb | 4 | ||||
-rw-r--r-- | test/rss/test_maker_0.9.rb | 2 | ||||
-rw-r--r-- | test/rss/test_maker_1.0.rb | 2 | ||||
-rw-r--r-- | test/rss/test_maker_2.0.rb | 6 |
5 files changed, 17 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Thu Oct 13 11:31:40 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * test/rexml/xpath/test_text.rb (test_ancestors): Array#sort may + not be stable. [ruby-core:76088] [Bug #12509] + + * test/rss/test_maker_{0.9,1.0,2.0}.rb (test_items): ditto. + Thu Oct 13 10:37:31 2016 Eric Wong <e@80x24.org> * doc/extension.rdoc: wording fix diff --git a/test/rexml/xpath/test_text.rb b/test/rexml/xpath/test_text.rb index cea3b05731..7222388e1b 100644 --- a/test/rexml/xpath/test_text.rb +++ b/test/rexml/xpath/test_text.rb @@ -69,7 +69,9 @@ module REXMLTests assert_equal(1, nodes.size, "<b> has one element ancestor") nodes = @doc.get_elements('//b/ancestor::node()') assert_equal(2, nodes.size, "<b> has two node ancestors") - assert_kind_of REXML::Document, nodes[1] + nodes.sort_by!(&:name) + assert_kind_of REXML::Document, nodes[0] + assert_kind_of REXML::Element, nodes[1] end end end diff --git a/test/rss/test_maker_0.9.rb b/test/rss/test_maker_0.9.rb index 64d04bcd10..d07a724ab1 100644 --- a/test/rss/test_maker_0.9.rb +++ b/test/rss/test_maker_0.9.rb @@ -315,6 +315,7 @@ module RSS assert_equal(link, item.link) assert_nil(item.description) + pubDate = Time.now item_size = 5 rss = RSS::Maker.make("0.91") do |maker| @@ -325,6 +326,7 @@ module RSS _item.title = "#{title}#{i}" _item.link = "#{link}#{i}" _item.description = "#{description}#{i}" + _item.date = pubDate - i end end maker.items.do_sort = true diff --git a/test/rss/test_maker_1.0.rb b/test/rss/test_maker_1.0.rb index c8f9977e43..f3c0e50ceb 100644 --- a/test/rss/test_maker_1.0.rb +++ b/test/rss/test_maker_1.0.rb @@ -269,6 +269,7 @@ module RSS assert_equal(link, item.link) assert_nil(item.description) + pubDate = Time.now item_size = 5 rss = RSS::Maker.make("1.0") do |maker| @@ -279,6 +280,7 @@ module RSS _item.title = "#{title}#{i}" _item.link = "#{link}#{i}" _item.description = "#{description}#{i}" + _item.date = pubDate - i end end maker.items.do_sort = true diff --git a/test/rss/test_maker_2.0.rb b/test/rss/test_maker_2.0.rb index 8528611e53..f6d83f0c3d 100644 --- a/test/rss/test_maker_2.0.rb +++ b/test/rss/test_maker_2.0.rb @@ -390,7 +390,7 @@ module RSS item.description = "#{description}#{i}" item.author = "#{author}#{i}" item.comments = "#{comments}#{i}" - item.date = pubDate + item.date = pubDate - i end end maker.items.do_sort = true @@ -402,8 +402,8 @@ module RSS assert_equal("#{description}#{i}", item.description) assert_equal("#{author}#{i}", item.author) assert_equal("#{comments}#{i}", item.comments) - assert_equal(pubDate, item.pubDate) - assert_equal(pubDate, item.date) + assert_equal(pubDate - i, item.pubDate) + assert_equal(pubDate - i, item.date) end rss = RSS::Maker.make("2.0") do |maker| |