diff options
author | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-28 06:53:41 +0000 |
---|---|---|
committer | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-28 06:53:41 +0000 |
commit | b684f87574166a42d3305c005896bf2aa7cd37b3 (patch) | |
tree | 3c0083d0e120e624822a05df86762d20e1ac2dbc /test | |
parent | 49d454ea2e2dc1d447b2dc290b6ea361ad18f979 (diff) | |
download | ruby-b684f87574166a42d3305c005896bf2aa7cd37b3.tar.gz |
* lib/rss/rss.rb (RSS::NotSetError): added.
* lib/rss/maker/{1.0,0.9,2.0}.rb: changed RSS Maker to raise
RSS::NotSetError if required values of maker.channel are not
set.
* test/rss/test_maker_{1.0,0.9,2.0}.rb: changed tests to check RSS
Maker raises or not.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/rss/rss-assertions.rb | 12 | ||||
-rw-r--r-- | test/rss/test_maker_0.9.rb | 96 | ||||
-rw-r--r-- | test/rss/test_maker_1.0.rb | 84 | ||||
-rw-r--r-- | test/rss/test_maker_2.0.rb | 79 |
4 files changed, 150 insertions, 121 deletions
diff --git a/test/rss/rss-assertions.rb b/test/rss/rss-assertions.rb index a51fc1fd60..569e9621d2 100644 --- a/test/rss/rss-assertions.rb +++ b/test/rss/rss-assertions.rb @@ -95,6 +95,18 @@ module RSS end end + def assert_not_set_error(name, variables) + _wrap_assertion do + begin + yield + flunk("Not raise NotSetError") + rescue ::RSS::NotSetError => e + assert_equal(name, e.name) + assert_equal(variables.sort, e.variables.sort) + end + end + end + def assert_xml_declaration(version, encoding, standalone, rss) _wrap_assertion do assert_equal(version, rss.version) diff --git a/test/rss/test_maker_0.9.rb b/test/rss/test_maker_0.9.rb index 7dfe0da241..50c311ad94 100644 --- a/test/rss/test_maker_0.9.rb +++ b/test/rss/test_maker_0.9.rb @@ -121,39 +121,43 @@ module RSS link = "http://hoge.com" description = "fugafugafugafuga" language = "ja" - - rss = RSS::Maker.make("0.91") do |maker| - # maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - maker.channel.language = language + + assert_not_set_error("maker.channel", %w(title)) do + RSS::Maker.make("0.91") do |maker| + # maker.channel.title = title + maker.channel.link = link + maker.channel.description = description + maker.channel.language = language + end end - assert_nil(rss) - rss = RSS::Maker.make("0.91") do |maker| - maker.channel.title = title - # maker.channel.link = link - maker.channel.link = nil - maker.channel.description = description - maker.channel.language = language + assert_not_set_error("maker.channel", %w(link)) do + RSS::Maker.make("0.91") do |maker| + maker.channel.title = title + # maker.channel.link = link + maker.channel.link = nil + maker.channel.description = description + maker.channel.language = language + end end - assert_nil(rss) - rss = RSS::Maker.make("0.91") do |maker| - maker.channel.title = title - maker.channel.link = link - # maker.channel.description = description - maker.channel.language = language + assert_not_set_error("maker.channel", %w(description)) do + RSS::Maker.make("0.91") do |maker| + maker.channel.title = title + maker.channel.link = link + # maker.channel.description = description + maker.channel.language = language + end end - assert_nil(rss) - rss = RSS::Maker.make("0.91") do |maker| - maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - # maker.channel.language = language + assert_not_set_error("maker.channel", %w(language)) do + RSS::Maker.make("0.91") do |maker| + maker.channel.title = title + maker.channel.link = link + maker.channel.description = description + # maker.channel.language = language + end end - assert_nil(rss) end def test_image @@ -182,17 +186,18 @@ module RSS assert_equal(height, image.height) assert_equal(description, image.description) - rss = RSS::Maker.make("0.91") do |maker| - # setup_dummy_channel(maker) - maker.channel.link = link + assert_not_set_error("maker.channel", %w(description title language)) do + RSS::Maker.make("0.91") do |maker| + # setup_dummy_channel(maker) + maker.channel.link = link - maker.image.title = title - maker.image.url = url - maker.image.width = width - maker.image.height = height - maker.image.description = description + maker.image.title = title + maker.image.url = url + maker.image.width = width + maker.image.height = height + maker.image.description = description + end end - assert_nil(rss) end def test_not_valid_image @@ -215,18 +220,19 @@ module RSS end assert_nil(rss.channel.image) - rss = RSS::Maker.make("0.91") do |maker| - setup_dummy_channel(maker) - # maker.channel.link = link - maker.channel.link = nil + assert_not_set_error("maker.channel", %w(link)) do + RSS::Maker.make("0.91") do |maker| + setup_dummy_channel(maker) + # maker.channel.link = link + maker.channel.link = nil - maker.image.title = title - maker.image.url = url - maker.image.width = width - maker.image.height = height - maker.image.description = description + maker.image.title = title + maker.image.url = url + maker.image.width = width + maker.image.height = height + maker.image.description = description + end end - assert_nil(rss) rss = RSS::Maker.make("0.91") do |maker| setup_dummy_channel(maker) diff --git a/test/rss/test_maker_1.0.rb b/test/rss/test_maker_1.0.rb index 8f80f6e2fe..1fa86662e1 100644 --- a/test/rss/test_maker_1.0.rb +++ b/test/rss/test_maker_1.0.rb @@ -85,37 +85,41 @@ module RSS link = "http://hoge.com" description = "fugafugafugafuga" - rss = RSS::Maker.make("1.0") do |maker| - # maker.channel.about = about - maker.channel.title = title - maker.channel.link = link - maker.channel.description = description + assert_not_set_error("maker.channel", %w(about)) do + RSS::Maker.make("1.0") do |maker| + # maker.channel.about = about + maker.channel.title = title + maker.channel.link = link + maker.channel.description = description + end end - assert_nil(rss) - rss = RSS::Maker.make("1.0") do |maker| - maker.channel.about = about - # maker.channel.title = title - maker.channel.link = link - maker.channel.description = description + assert_not_set_error("maker.channel", %w(title)) do + RSS::Maker.make("1.0") do |maker| + maker.channel.about = about + # maker.channel.title = title + maker.channel.link = link + maker.channel.description = description + end end - assert_nil(rss) - rss = RSS::Maker.make("1.0") do |maker| - maker.channel.about = about - maker.channel.title = title - # maker.channel.link = link - maker.channel.description = description + assert_not_set_error("maker.channel", %w(link)) do + RSS::Maker.make("1.0") do |maker| + maker.channel.about = about + maker.channel.title = title + # maker.channel.link = link + maker.channel.description = description + end end - assert_nil(rss) - rss = RSS::Maker.make("1.0") do |maker| - maker.channel.about = about - maker.channel.title = title - maker.channel.link = link - # maker.channel.description = description + assert_not_set_error("maker.channel", %w(description)) do + RSS::Maker.make("1.0") do |maker| + maker.channel.about = about + maker.channel.title = title + maker.channel.link = link + # maker.channel.description = description + end end - assert_nil(rss) end @@ -138,14 +142,15 @@ module RSS assert_equal(link, image.link) assert_equal(url, image.url) - rss = RSS::Maker.make("1.0") do |maker| - # setup_dummy_channel(maker) - maker.channel.link = link - - maker.image.title = title - maker.image.url = url + assert_not_set_error("maker.channel", %w(about title description)) do + RSS::Maker.make("1.0") do |maker| + # setup_dummy_channel(maker) + maker.channel.link = link + + maker.image.title = title + maker.image.url = url + end end - assert_nil(rss) end def test_not_valid_image @@ -173,15 +178,16 @@ module RSS assert_nil(rss.channel.image) assert_nil(rss.image) - rss = RSS::Maker.make("1.0") do |maker| - setup_dummy_channel(maker) - # maker.channel.link = link - maker.channel.link = nil - - maker.image.url = url - maker.image.title = title + assert_not_set_error("maker.channel", %w(link)) do + RSS::Maker.make("1.0") do |maker| + setup_dummy_channel(maker) + # maker.channel.link = link + maker.channel.link = nil + + maker.image.url = url + maker.image.title = title + end end - assert_nil(rss) end def test_items diff --git a/test/rss/test_maker_2.0.rb b/test/rss/test_maker_2.0.rb index dc08ada34b..e2d5e32280 100644 --- a/test/rss/test_maker_2.0.rb +++ b/test/rss/test_maker_2.0.rb @@ -137,29 +137,32 @@ module RSS description = "fugafugafugafuga" language = "ja" - rss = RSS::Maker.make("2.0") do |maker| - # maker.channel.title = title - maker.channel.link = link - maker.channel.description = description - maker.channel.language = language + assert_not_set_error("maker.channel", %w(title)) do + RSS::Maker.make("2.0") do |maker| + # maker.channel.title = title + maker.channel.link = link + maker.channel.description = description + maker.channel.language = language + end end - assert_nil(rss) - rss = RSS::Maker.make("2.0") do |maker| - maker.channel.title = title - # maker.channel.link = link - maker.channel.description = description - maker.channel.language = language + assert_not_set_error("maker.channel", %w(link)) do + RSS::Maker.make("2.0") do |maker| + maker.channel.title = title + # maker.channel.link = link + maker.channel.description = description + maker.channel.language = language + end end - assert_nil(rss) - rss = RSS::Maker.make("2.0") do |maker| - maker.channel.title = title - maker.channel.link = link - # maker.channel.description = description - maker.channel.language = language + assert_not_set_error("maker.channel", %w(description)) do + RSS::Maker.make("2.0") do |maker| + maker.channel.title = title + maker.channel.link = link + # maker.channel.description = description + maker.channel.language = language + end end - assert_nil(rss) rss = RSS::Maker.make("2.0") do |maker| maker.channel.title = title @@ -285,17 +288,18 @@ module RSS assert_equal(height, image.height) assert_equal(description, image.description) - rss = RSS::Maker.make("2.0") do |maker| - # setup_dummy_channel(maker) - maker.channel.link = link + assert_not_set_error("maker.channel", %w(title description)) do + RSS::Maker.make("2.0") do |maker| + # setup_dummy_channel(maker) + maker.channel.link = link - maker.image.title = title - maker.image.url = url - maker.image.width = width - maker.image.height = height - maker.image.description = description + maker.image.title = title + maker.image.url = url + maker.image.width = width + maker.image.height = height + maker.image.description = description + end end - assert_nil(rss) end def test_not_valid_image @@ -318,18 +322,19 @@ module RSS end assert_nil(rss.image) - rss = RSS::Maker.make("2.0") do |maker| - setup_dummy_channel(maker) - # maker.channel.link = link - maker.channel.link = nil + assert_not_set_error("maker.channel", %w(link)) do + RSS::Maker.make("2.0") do |maker| + setup_dummy_channel(maker) + # maker.channel.link = link + maker.channel.link = nil - maker.image.title = title - maker.image.url = url - maker.image.width = width - maker.image.height = height - maker.image.description = description + maker.image.title = title + maker.image.url = url + maker.image.width = width + maker.image.height = height + maker.image.description = description + end end - assert_nil(rss) rss = RSS::Maker.make("2.0") do |maker| setup_dummy_channel(maker) |