* test/rss/*: Test::Unit::TestCase -> RSS::TestCase and

  Test::Unit::Assertions -> RSS::Assertions.


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

1 files changed, 87 insertions, 86 deletions

diff --git a/test/rss/test_syndication.rb b/test/rss/test_syndication.rb
index 22fa30c2de..0eec3bacc6 100644
--- a/test/rss/test_syndication.rb
+++ b/test/rss/test_syndication.rb
@@ -1,124 +1,125 @@
 # -*- tab-width: 2 -*- vim: ts=2
 
-require "test/unit"
 require "cgi"
 require "rexml/document"
 
+require "rss-testcase"
+
 require "rss/1.0"
 require "rss/syndication"
-require "common"
-
-class TestSyndication < Test::Unit::TestCase
-	include TestRSSMixin
 
-	def setup
-		@prefix = "sy"
-		@uri = "http://purl.org/rss/1.0/modules/syndication/"
+module RSS
+	class TestSyndication < TestCase
 		
-		@parents = %w(channel)
-
-		t = Time.iso8601("2000-01-01T12:00:05+00:00")
-		class << t
-			alias_method(:to_s, :iso8601)
-		end
-
-		@elems = {
-			:updatePeriod => "hourly",
-			:updateFrequency => 2,
-			:updateBase => t,
-		}
-
-		@sy_nodes = @elems.collect do |name, value|
-			"<#{@prefix}:#{name}>#{CGI.escapeHTML(value.to_s)}</#{@prefix}:#{name}>"
-		end.join("\n")
-
-		@rss_source = make_RDF(<<-EOR, {@prefix =>  @uri})
+		def setup
+			@prefix = "sy"
+			@uri = "http://purl.org/rss/1.0/modules/syndication/"
+			
+			@parents = %w(channel)
+			
+			t = Time.iso8601("2000-01-01T12:00:05+00:00")
+			class << t
+				alias_method(:to_s, :iso8601)
+			end
+			
+			@elems = {
+				:updatePeriod => "hourly",
+				:updateFrequency => 2,
+				:updateBase => t,
+			}
+			
+			@sy_nodes = @elems.collect do |name, value|
+				"<#{@prefix}:#{name}>#{CGI.escapeHTML(value.to_s)}</#{@prefix}:#{name}>"
+			end.join("\n")
+			
+			@rss_source = make_RDF(<<-EOR, {@prefix =>  @uri})
 #{make_channel(@sy_nodes)}
 #{make_image()}
 #{make_item()}
 #{make_textinput()}
 EOR
 
-		@rss = Parser.parse(@rss_source)
-	end
-	
-	def test_parser
-
-		assert_nothing_raised do
-			Parser.parse(@rss_source)
+			@rss = Parser.parse(@rss_source)
 		end
-		
-		@elems.each do |tag, value|
-			assert_too_much_tag(tag.to_s, "channel") do
-				Parser.parse(make_RDF(<<-EOR, {@prefix => @uri}))
+	
+		def test_parser
+			
+			assert_nothing_raised do
+				Parser.parse(@rss_source)
+			end
+			
+			@elems.each do |tag, value|
+				assert_too_much_tag(tag.to_s, "channel") do
+					Parser.parse(make_RDF(<<-EOR, {@prefix => @uri}))
 #{make_channel(("<" + @prefix + ":" + tag.to_s + ">" +
 	CGI.escapeHTML(value.to_s) +
 	"</" + @prefix + ":" + tag.to_s + ">") * 2)}
 #{make_item}
 EOR
+				end
 			end
-		end
 
-	end
-	
-	def test_accessor
-		
-		t = Time.iso8601("2003-01-01T12:00:23+09:00")
-		class << t
-			alias_method(:to_s, :iso8601)
 		end
-
-		new_value = {
-			:updatePeriod => "daily",
-			:updateFrequency => +11,
-			:updateBase => t,
-		}
-
-		@elems.each do |name, value|
-			@parents.each do |parent|
-				assert_equal(value, @rss.send(parent).send("sy_#{name}"))
-				@rss.send(parent).send("sy_#{name}=", new_value[name].to_s)
-				assert_equal(new_value[name], @rss.send(parent).send("sy_#{name}"))
+	
+		def test_accessor
+			
+			t = Time.iso8601("2003-01-01T12:00:23+09:00")
+			class << t
+				alias_method(:to_s, :iso8601)
 			end
-		end
-
-		%w(hourly daily weekly monthly yearly).each do |x|
-			@parents.each do |parent|
-				assert_nothing_raised do
-					@rss.send(parent).sy_updatePeriod = x
+			
+			new_value = {
+				:updatePeriod => "daily",
+				:updateFrequency => +11,
+				:updateBase => t,
+			}
+			
+			@elems.each do |name, value|
+				@parents.each do |parent|
+					assert_equal(value, @rss.send(parent).send("sy_#{name}"))
+					@rss.send(parent).send("sy_#{name}=", new_value[name].to_s)
+					assert_equal(new_value[name], @rss.send(parent).send("sy_#{name}"))
 				end
 			end
-		end
-
-		%w(-2 0.3 -0.4).each do |x|
-			@parents.each do |parent|
-				assert_not_available_value("updateBase", x) do
-					@rss.send(parent).sy_updateBase = x
+			
+			%w(hourly daily weekly monthly yearly).each do |x|
+				@parents.each do |parent|
+					assert_nothing_raised do
+						@rss.send(parent).sy_updatePeriod = x
+					end
 				end
 			end
-		end
-		
-	end
-
-	def test_to_s
-		
-		@elems.each do |name, value|
-			excepted = "<#{@prefix}:#{name}>#{value}</#{@prefix}:#{name}>"
-			@parents.each do |parent|
-				assert_equal(excepted, @rss.send(parent).send("sy_#{name}_element"))
+			
+			%w(-2 0.3 -0.4).each do |x|
+				@parents.each do |parent|
+					assert_not_available_value("updateBase", x) do
+						@rss.send(parent).sy_updateBase = x
+					end
+				end
 			end
+			
 		end
 
-		REXML::Document.new(@rss_source).root.each_element do |parent|
-			if @parents.include?(parent.name)
-				parent.each_element do |elem|
-					if elem.namespace == @uri
-						assert_equal(elem.text, @elems[elem.name.intern].to_s)
+		def test_to_s
+			
+			@elems.each do |name, value|
+				excepted = "<#{@prefix}:#{name}>#{value}</#{@prefix}:#{name}>"
+				@parents.each do |parent|
+					assert_equal(excepted, @rss.send(parent).send("sy_#{name}_element"))
+				end
+			end
+			
+			REXML::Document.new(@rss_source).root.each_element do |parent|
+				if @parents.include?(parent.name)
+					parent.each_element do |elem|
+						if elem.namespace == @uri
+							assert_equal(elem.text, @elems[elem.name.intern].to_s)
+						end
 					end
 				end
 			end
+			
 		end
-
-	end
 	
+	end
 end