diff options
40 files changed, 47 insertions, 39 deletions
@@ -1,3 +1,11 @@ +Tue May 27 21:03:03 2014 Kouhei Sutou <kou@cozmixng.org> + + * test/rexml/: Use REXMLTests as wrapping module for REXML tests. + I avoid using the same module for library in test because + it provides "include REXML" environment in test. Normally, + users don't use REXML on "include REXML" environment. So I + don't want to write tests on "include REXML" environment. + Tue May 27 20:59:37 2014 Kouhei Sutou <kou@cozmixng.org> * test/rexml/test_comment.rb: Remove needless REXML module wrapping. diff --git a/test/rexml/parse/test_document_type_declaration.rb b/test/rexml/parse/test_document_type_declaration.rb index 8f5a87951c..fb7cee5c3b 100644 --- a/test/rexml/parse/test_document_type_declaration.rb +++ b/test/rexml/parse/test_document_type_declaration.rb @@ -1,7 +1,7 @@ require "test/unit" require "rexml/document" -module REXML +module REXMLTests class TestParseDocumentTypeDeclaration < Test::Unit::TestCase private def xml(internal_subset) diff --git a/test/rexml/parse/test_notation_declaration.rb b/test/rexml/parse/test_notation_declaration.rb index 1e81c5aaf7..ecce44a790 100644 --- a/test/rexml/parse/test_notation_declaration.rb +++ b/test/rexml/parse/test_notation_declaration.rb @@ -1,7 +1,7 @@ require 'test/unit' require 'rexml/document' -module REXML +module REXMLTests class TestParseNotationDeclaration < Test::Unit::TestCase private def xml(internal_subset) diff --git a/test/rexml/parser/test_sax2.rb b/test/rexml/parser/test_sax2.rb index c417d4b29d..dba5eab033 100644 --- a/test/rexml/parser/test_sax2.rb +++ b/test/rexml/parser/test_sax2.rb @@ -2,7 +2,7 @@ require "test/unit" require "rexml/parsers/sax2parser" require "rexml/sax2listener" -module REXML +module REXMLTests class TestSAX2Parser < Test::Unit::TestCase class TestDocumentTypeDeclaration < self private diff --git a/test/rexml/parser/test_tree.rb b/test/rexml/parser/test_tree.rb index b63722dd49..fa010f6975 100644 --- a/test/rexml/parser/test_tree.rb +++ b/test/rexml/parser/test_tree.rb @@ -2,7 +2,7 @@ require "test/unit" require "rexml/document" require "rexml/parsers/treeparser" -module REXML +module REXMLTests class TestTreeParser < Test::Unit::TestCase class TestInvalid < self def test_unmatched_close_tag diff --git a/test/rexml/parser/test_ultra_light.rb b/test/rexml/parser/test_ultra_light.rb index a9706858d8..4960fc16dc 100644 --- a/test/rexml/parser/test_ultra_light.rb +++ b/test/rexml/parser/test_ultra_light.rb @@ -1,7 +1,7 @@ require "test/unit" require "rexml/parsers/ultralightparser" -module REXML +module REXMLTests class TestUltraLightParser < Test::Unit::TestCase class TestDocumentTypeDeclaration < self def test_entity_declaration diff --git a/test/rexml/test_attributes.rb b/test/rexml/test_attributes.rb index ed8d8e1083..fea4ee7636 100644 --- a/test/rexml/test_attributes.rb +++ b/test/rexml/test_attributes.rb @@ -1,7 +1,7 @@ require 'test/unit/testcase' require 'rexml/document' -module REXML +module REXMLTests class AttributesTester < Test::Unit::TestCase include REXML def test_accessor diff --git a/test/rexml/test_attributes_mixin.rb b/test/rexml/test_attributes_mixin.rb index 03bf198ea5..a92c783d1a 100644 --- a/test/rexml/test_attributes_mixin.rb +++ b/test/rexml/test_attributes_mixin.rb @@ -1,7 +1,7 @@ require 'test/unit' require 'rexml/document' -module REXML +module REXMLTests class TestAttributes < Test::Unit::TestCase def setup @ns_a = "urn:x-test:a" diff --git a/test/rexml/test_changing_encoding.rb b/test/rexml/test_changing_encoding.rb index c2970288b3..0e0cd6cf8b 100644 --- a/test/rexml/test_changing_encoding.rb +++ b/test/rexml/test_changing_encoding.rb @@ -2,7 +2,7 @@ require 'rexml/encoding' -module REXML +module REXMLTests class ChangingEncodings < Test::Unit::TestCase def initialize a @u = 'テスト ほげ ふが 美しい' diff --git a/test/rexml/test_comment.rb b/test/rexml/test_comment.rb index ebe3eead8d..d5e78a5cde 100644 --- a/test/rexml/test_comment.rb +++ b/test/rexml/test_comment.rb @@ -2,7 +2,7 @@ require "test/unit/testcase" require 'rexml/document' -module REXMLTest +module REXMLTests class CommentTester < Test::Unit::TestCase # Bug #5278 def test_hyphen_end_line_in_doctype diff --git a/test/rexml/test_contrib.rb b/test/rexml/test_contrib.rb index 44f7b8c3f6..ea357b139f 100644 --- a/test/rexml/test_contrib.rb +++ b/test/rexml/test_contrib.rb @@ -6,7 +6,7 @@ require "rexml/document" require "rexml/parseexception" require "rexml/formatters/default" -module REXML +module REXMLTests class ContribTester < Test::Unit::TestCase include REXMLTestUtils include REXML diff --git a/test/rexml/test_core.rb b/test/rexml/test_core.rb index 7c8e4238b8..8bba293cbf 100644 --- a/test/rexml/test_core.rb +++ b/test/rexml/test_core.rb @@ -11,7 +11,7 @@ require "rexml/undefinednamespaceexception" require_relative "listener" -module REXML +module REXMLTests class Tester < Test::Unit::TestCase include REXMLTestUtils include REXML diff --git a/test/rexml/test_doctype.rb b/test/rexml/test_doctype.rb index cc5624b839..63c2ed9ada 100644 --- a/test/rexml/test_doctype.rb +++ b/test/rexml/test_doctype.rb @@ -1,7 +1,7 @@ require 'test/unit' require 'rexml/document' -module REXML +module REXMLTests class TestDocTypeAccessor < Test::Unit::TestCase def setup diff --git a/test/rexml/test_elements.rb b/test/rexml/test_elements.rb index 878c848765..6a9b3bbdd2 100644 --- a/test/rexml/test_elements.rb +++ b/test/rexml/test_elements.rb @@ -1,7 +1,7 @@ require 'test/unit/testcase' require 'rexml/document' -module REXML +module REXMLTests class ElementsTester < Test::Unit::TestCase include REXML def test_accessor diff --git a/test/rexml/test_encoding.rb b/test/rexml/test_encoding.rb index 799f3f27ef..a08406782c 100644 --- a/test/rexml/test_encoding.rb +++ b/test/rexml/test_encoding.rb @@ -5,7 +5,7 @@ require_relative "rexml_test_utils" require 'rexml/source' require 'rexml/document' -module REXML +module REXMLTests class EncodingTester < Test::Unit::TestCase include REXMLTestUtils include REXML diff --git a/test/rexml/test_entity.rb b/test/rexml/test_entity.rb index dfa868820e..00272234f8 100644 --- a/test/rexml/test_entity.rb +++ b/test/rexml/test_entity.rb @@ -4,7 +4,7 @@ require 'rexml/document' require 'rexml/entity' require 'rexml/source' -module REXML +module REXMLTests class EntityTester < Test::Unit::TestCase def test_parse_general_decl simple = "<!ENTITY foo 'bar'>" diff --git a/test/rexml/test_functions.rb b/test/rexml/test_functions.rb index 9e2df8c133..da9a986bd9 100644 --- a/test/rexml/test_functions.rb +++ b/test/rexml/test_functions.rb @@ -2,7 +2,7 @@ require "test/unit/testcase" require "rexml/document" -module REXML +module REXMLTests class FunctionsTester < Test::Unit::TestCase include REXML def test_functions diff --git a/test/rexml/test_functions_number.rb b/test/rexml/test_functions_number.rb index ee4e6b45ef..c2124a508d 100644 --- a/test/rexml/test_functions_number.rb +++ b/test/rexml/test_functions_number.rb @@ -2,7 +2,7 @@ require 'rexml/document' require 'test/unit' require 'rexml/functions' -module REXML +module REXMLTests class TC_Rexml_Functions_Number < Test::Unit::TestCase def test_functions_number_int diff --git a/test/rexml/test_jaxen.rb b/test/rexml/test_jaxen.rb index 19d4063358..a5053aac64 100644 --- a/test/rexml/test_jaxen.rb +++ b/test/rexml/test_jaxen.rb @@ -6,7 +6,7 @@ require "rexml/xpath" # Harness to test REXML's capabilities against the test suite from Jaxen # ryan.a.cox@gmail.com -module REXML +module REXMLTests class JaxenTester < Test::Unit::TestCase include REXMLTestUtils include REXML diff --git a/test/rexml/test_light.rb b/test/rexml/test_light.rb index 250886d2d0..c47b9a60b1 100644 --- a/test/rexml/test_light.rb +++ b/test/rexml/test_light.rb @@ -2,7 +2,7 @@ require_relative "rexml_test_utils" require "rexml/light/node" require "rexml/parsers/lightparser" -module REXML +module REXMLTests class LightTester < Test::Unit::TestCase include REXMLTestUtils include REXML::Light diff --git a/test/rexml/test_lightparser.rb b/test/rexml/test_lightparser.rb index 0fbf8bcefb..d492e0b456 100644 --- a/test/rexml/test_lightparser.rb +++ b/test/rexml/test_lightparser.rb @@ -1,7 +1,7 @@ require_relative 'rexml_test_utils' require 'rexml/parsers/lightparser' -module REXML +module REXMLTests class LightParserTester < Test::Unit::TestCase include REXMLTestUtils include REXML diff --git a/test/rexml/test_listener.rb b/test/rexml/test_listener.rb index a1bbc7404c..3d5c17e858 100644 --- a/test/rexml/test_listener.rb +++ b/test/rexml/test_listener.rb @@ -5,7 +5,7 @@ require_relative 'rexml_test_utils' require 'rexml/document' require 'rexml/streamlistener' -module REXML +module REXMLTests class BaseTester < Test::Unit::TestCase include REXMLTestUtils def test_empty diff --git a/test/rexml/test_martin_fowler.rb b/test/rexml/test_martin_fowler.rb index 70d81bdd50..3025c74034 100644 --- a/test/rexml/test_martin_fowler.rb +++ b/test/rexml/test_martin_fowler.rb @@ -1,7 +1,7 @@ require 'test/unit' require 'rexml/document' -module REXML +module REXMLTests class OrderTester < Test::Unit::TestCase DOC = <<END <paper> diff --git a/test/rexml/test_namespace.rb b/test/rexml/test_namespace.rb index e2bedb965f..01d496f926 100644 --- a/test/rexml/test_namespace.rb +++ b/test/rexml/test_namespace.rb @@ -2,7 +2,7 @@ require_relative "rexml_test_utils" require "rexml/document" -module REXML +module REXMLTests class TestNamespace < Test::Unit::TestCase include REXMLTestUtils include REXML diff --git a/test/rexml/test_order.rb b/test/rexml/test_order.rb index fc08249cae..9559c46ca4 100644 --- a/test/rexml/test_order.rb +++ b/test/rexml/test_order.rb @@ -5,7 +5,7 @@ begin rescue LoadError end -module REXML +module REXMLTests class OrderTester < Test::Unit::TestCase include REXMLTestUtils diff --git a/test/rexml/test_preceding_sibling.rb b/test/rexml/test_preceding_sibling.rb index d3cc0e092b..c05eedb001 100644 --- a/test/rexml/test_preceding_sibling.rb +++ b/test/rexml/test_preceding_sibling.rb @@ -2,7 +2,7 @@ require 'test/unit' require 'rexml/document' -module REXML +module REXMLTests # daz - for report by Dan Kohn in: # http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/156328 class XPathTesterDd < Test::Unit::TestCase diff --git a/test/rexml/test_pullparser.rb b/test/rexml/test_pullparser.rb index 31ee019295..83751f2a44 100644 --- a/test/rexml/test_pullparser.rb +++ b/test/rexml/test_pullparser.rb @@ -2,7 +2,7 @@ require "test/unit/testcase" require 'rexml/parsers/pullparser' -module REXML +module REXMLTests class PullParserTester < Test::Unit::TestCase include REXML def test_basics diff --git a/test/rexml/test_rexml_issuezilla.rb b/test/rexml/test_rexml_issuezilla.rb index 3fa1ceead5..59649ae090 100644 --- a/test/rexml/test_rexml_issuezilla.rb +++ b/test/rexml/test_rexml_issuezilla.rb @@ -1,7 +1,7 @@ require_relative 'rexml_test_utils' require 'rexml/document' -module REXML +module REXMLTests class TestIssuezillaParsing < Test::Unit::TestCase include REXMLTestUtils def test_rexml diff --git a/test/rexml/test_sax.rb b/test/rexml/test_sax.rb index 20920f7a46..5cf1ec1132 100644 --- a/test/rexml/test_sax.rb +++ b/test/rexml/test_sax.rb @@ -3,7 +3,7 @@ require 'rexml/sax2listener' require 'rexml/parsers/sax2parser' require 'rexml/document' -module REXML +module REXMLTests class SAX2Tester < Test::Unit::TestCase include REXMLTestUtils include REXML diff --git a/test/rexml/test_stream.rb b/test/rexml/test_stream.rb index 7f270e93da..d9e622f00c 100644 --- a/test/rexml/test_stream.rb +++ b/test/rexml/test_stream.rb @@ -3,7 +3,7 @@ require "rexml/document" require 'rexml/streamlistener' require 'stringio' -module REXML +module REXMLTests class MyListener include REXML::StreamListener end diff --git a/test/rexml/test_text.rb b/test/rexml/test_text.rb index 69d68f3bc2..9aa0e2f68e 100644 --- a/test/rexml/test_text.rb +++ b/test/rexml/test_text.rb @@ -1,6 +1,6 @@ require "rexml/text" -module REXML +module REXMLTests class TextTester < Test::Unit::TestCase include REXML diff --git a/test/rexml/test_ticket_80.rb b/test/rexml/test_ticket_80.rb index c494ff5a7f..bd588814b3 100644 --- a/test/rexml/test_ticket_80.rb +++ b/test/rexml/test_ticket_80.rb @@ -9,7 +9,7 @@ require 'test/unit' require 'rexml/document' -module REXML +module REXMLTests class Ticket80 < Test::Unit::TestCase @@xmlstr = '<?xml version="1.0"?> diff --git a/test/rexml/test_validation_rng.rb b/test/rexml/test_validation_rng.rb index 8563dfc9dd..67abe20a48 100644 --- a/test/rexml/test_validation_rng.rb +++ b/test/rexml/test_validation_rng.rb @@ -3,7 +3,7 @@ require "test/unit/testcase" require "rexml/document" require "rexml/validation/relaxng" -module REXML +module REXMLTests class RNGValidation < Test::Unit::TestCase include REXML diff --git a/test/rexml/test_xml_declaration.rb b/test/rexml/test_xml_declaration.rb index 8f99f252a6..a7b7023ad4 100644 --- a/test/rexml/test_xml_declaration.rb +++ b/test/rexml/test_xml_declaration.rb @@ -6,7 +6,7 @@ require "rexml/document" require "test/unit" -module REXML +module REXMLTests class TestXmlDeclaration < Test::Unit::TestCase def setup xml = <<-'END_XML' diff --git a/test/rexml/xpath/test_attribute.rb b/test/rexml/xpath/test_attribute.rb index 666dcfbf15..313910489b 100644 --- a/test/rexml/xpath/test_attribute.rb +++ b/test/rexml/xpath/test_attribute.rb @@ -1,7 +1,7 @@ require 'test/unit' require 'rexml/document' -module REXML +module REXMLTests class TestXPathAttribute < Test::Unit::TestCase def setup @xml = <<-XML diff --git a/test/rexml/xpath/test_axis_preceding_sibling.rb b/test/rexml/xpath/test_axis_preceding_sibling.rb index 7733e56a8d..faba177f95 100644 --- a/test/rexml/xpath/test_axis_preceding_sibling.rb +++ b/test/rexml/xpath/test_axis_preceding_sibling.rb @@ -1,7 +1,7 @@ require "test/unit/testcase" require "rexml/document" -module REXML +module REXMLTests class TestXPathAxisPredcedingSibling < Test::Unit::TestCase include REXML SOURCE = <<-EOF diff --git a/test/rexml/xpath/test_base.rb b/test/rexml/xpath/test_base.rb index 0882efc5ea..54559c979f 100644 --- a/test/rexml/xpath/test_base.rb +++ b/test/rexml/xpath/test_base.rb @@ -2,7 +2,7 @@ require_relative "../rexml_test_utils" require "rexml/document" -module REXML +module REXMLTests class TestXPathBase < Test::Unit::TestCase include REXMLTestUtils include REXML diff --git a/test/rexml/xpath/test_node.rb b/test/rexml/xpath/test_node.rb index c3cdb0dc9b..f0109be9ff 100644 --- a/test/rexml/xpath/test_node.rb +++ b/test/rexml/xpath/test_node.rb @@ -4,7 +4,7 @@ require_relative "../rexml_test_utils" require "rexml/document" -module REXML +module REXMLTests class TestXPathNode < Test::Unit::TestCase def matches(xml, xpath) document = REXML::Document.new(xml) diff --git a/test/rexml/xpath/test_predicate.rb b/test/rexml/xpath/test_predicate.rb index ce1596b756..4cbf244d74 100644 --- a/test/rexml/xpath/test_predicate.rb +++ b/test/rexml/xpath/test_predicate.rb @@ -3,7 +3,7 @@ require "rexml/document" require "rexml/xpath" require "rexml/parsers/xpathparser" -module REXML +module REXMLTests class TestXPathPredicate < Test::Unit::TestCase include REXML SRC=<<-EOL diff --git a/test/rexml/xpath/test_text.rb b/test/rexml/xpath/test_text.rb index 6521653ccd..cf65130854 100644 --- a/test/rexml/xpath/test_text.rb +++ b/test/rexml/xpath/test_text.rb @@ -3,7 +3,7 @@ require 'rexml/document' require 'rexml/element' require 'rexml/xpath' -module REXML +module REXMLTests class TestXPathText < Test::Unit::TestCase def setup @doc = REXML::Document.new |