diff --git a/test/data/ofbiz-issues-full-177.xml b/test/data/ofbiz-issues-full-177.xml
index bfff771d..e1f7bdfd 100644
--- a/test/data/ofbiz-issues-full-177.xml
+++ b/test/data/ofbiz-issues-full-177.xml
@@ -152,8 +152,8 @@
-
-
+
+
diff --git a/test/data/test/tests.xml b/test/data/test/tests.xml
index cf03b42b..fd415679 100644
--- a/test/data/test/tests.xml
+++ b/test/data/test/tests.xml
@@ -299,7 +299,7 @@
-
+
web-app
web-app
web-app
@@ -318,7 +318,7 @@
-
+
web-app
web-app
web-app
diff --git a/test/data/tutorial.xml b/test/data/tutorial.xml
index bf5783d0..9c4639b9 100644
--- a/test/data/tutorial.xml
+++ b/test/data/tutorial.xml
@@ -286,7 +286,7 @@ el1 << Text.new(" cruel world")
strings.
I can't emphasize this enough, because people do have problems with
- this. REXML can't possibly alway guess correctly how your text is
+ this. REXML can't possibly always guess correctly how your text is
encoded, so it always assumes the text is UTF-8. It also does not warn
you when you try to add text which isn't properly encoded, for the
same reason. You must make sure that you are adding UTF-8 text.
diff --git a/test/formatter/test_default.rb b/test/formatter/test_default.rb
index 321d8180..aa403dbe 100644
--- a/test/formatter/test_default.rb
+++ b/test/formatter/test_default.rb
@@ -2,7 +2,7 @@ module REXMLTests
class DefaultFormatterTest < Test::Unit::TestCase
def format(node)
formatter = REXML::Formatters::Default.new
- output = ""
+ output = +""
formatter.write(node, output)
output
end
diff --git a/test/functions/test_base.rb b/test/functions/test_base.rb
index 74dc1a31..daa38156 100644
--- a/test/functions/test_base.rb
+++ b/test/functions/test_base.rb
@@ -229,8 +229,30 @@ def test_normalize_space
assert_equal( [REXML::Comment.new("COMMENT A")], m )
end
+ def test_normalize_space_strings
+ source = <<-XML
+breakfast boosts\t\t
+
+concentration
+Coffee beans
+ aroma
+
+
+
+ Dessert
+ \t\t after dinner
+ XML
+ normalized_texts = REXML::XPath.each(REXML::Document.new(source), "normalize-space(//text())").to_a
+ assert_equal([
+ "breakfast boosts concentration",
+ "Coffee beans aroma",
+ "Dessert after dinner",
+ ],
+ normalized_texts)
+ end
+
def test_string_nil_without_context
- doc = REXML::Document.new(<<-XML)
+ doc = REXML::Document.new(<<~XML)
diff --git a/test/parse/test_attribute_list_declaration.rb b/test/parse/test_attribute_list_declaration.rb
new file mode 100644
index 00000000..43882528
--- /dev/null
+++ b/test/parse/test_attribute_list_declaration.rb
@@ -0,0 +1,30 @@
+require "test/unit"
+require "core_assertions"
+
+require "rexml/document"
+
+module REXMLTests
+ class TestParseAttributeListDeclaration < Test::Unit::TestCase
+ include Test::Unit::CoreAssertions
+
+ def test_linear_performance_space
+ seq = [10000, 50000, 100000, 150000, 200000]
+ assert_linear_performance(seq, rehearsal: 10) do |n|
+ REXML::Document.new("]>")
+ end
+ end
+
+ def test_linear_performance_tab_and_gt
+ seq = [10000, 50000, 100000, 150000, 200000]
+ assert_linear_performance(seq, rehearsal: 10) do |n|
+ REXML::Document.new("" * n +
+ "\">]>")
+ end
+ end
+ end
+end
diff --git a/test/parse/test_cdata.rb b/test/parse/test_cdata.rb
new file mode 100644
index 00000000..b5f1a3bc
--- /dev/null
+++ b/test/parse/test_cdata.rb
@@ -0,0 +1,17 @@
+require "test/unit"
+require "core_assertions"
+
+require "rexml/document"
+
+module REXMLTests
+ class TestParseCData < Test::Unit::TestCase
+ include Test::Unit::CoreAssertions
+
+ def test_linear_performance_gt
+ seq = [10000, 50000, 100000, 150000, 200000]
+ assert_linear_performance(seq, rehearsal: 10) do |n|
+ REXML::Document.new('" * n + ' ]]>')
+ end
+ end
+ end
+end
diff --git a/test/parse/test_character_reference.rb b/test/parse/test_character_reference.rb
new file mode 100644
index 00000000..bf8d2190
--- /dev/null
+++ b/test/parse/test_character_reference.rb
@@ -0,0 +1,17 @@
+require "test/unit"
+require "core_assertions"
+
+require "rexml/document"
+
+module REXMLTests
+ class TestParseCharacterReference < Test::Unit::TestCase
+ include Test::Unit::CoreAssertions
+
+ def test_linear_performance_many_preceding_zeros
+ seq = [10000, 50000, 100000, 150000, 200000]
+ assert_linear_performance(seq, rehearsal: 10) do |n|
+ REXML::Document.new('')
+ end
+ end
+ end
+end
diff --git a/test/parse/test_comment.rb b/test/parse/test_comment.rb
new file mode 100644
index 00000000..4475dca7
--- /dev/null
+++ b/test/parse/test_comment.rb
@@ -0,0 +1,151 @@
+require "test/unit"
+require "core_assertions"
+
+require "rexml/document"
+
+module REXMLTests
+ class TestParseComment < Test::Unit::TestCase
+ include Test::Unit::CoreAssertions
+
+ def parse(xml)
+ REXML::Document.new(xml)
+ end
+
+ class TestInvalid < self
+ def test_toplevel_unclosed_comment
+ exception = assert_raise(REXML::ParseException) do
+ parse("")
+ end
+ assert_equal(<<~DETAIL, exception.to_s)
+ Malformed comment
+ Line: 1
+ Position: 11
+ Last 80 unconsumed characters:
+ DETAIL
+ end
+
+ def test_toplevel_malformed_comment_end
+ exception = assert_raise(REXML::ParseException) do
+ parse("")
+ end
+ assert_equal(<<~DETAIL, exception.to_s)
+ Malformed comment
+ Line: 1
+ Position: 9
+ Last 80 unconsumed characters:
+ DETAIL
+ end
+
+ def test_doctype_malformed_comment_inner
+ exception = assert_raise(REXML::ParseException) do
+ parse("")
+ end
+ assert_equal(<<~DETAIL, exception.to_s)
+ Malformed comment
+ Line: 1
+ Position: 26
+ Last 80 unconsumed characters:
+ DETAIL
+ end
+
+ def test_doctype_malformed_comment_end
+ exception = assert_raise(REXML::ParseException) do
+ parse("")
+ end
+ assert_equal(<<~DETAIL, exception.to_s)
+ Malformed comment
+ Line: 1
+ Position: 24
+ Last 80 unconsumed characters:
+ DETAIL
+ end
+
+ def test_after_doctype_malformed_comment_short
+ exception = assert_raise(REXML::ParseException) do
+ parse("")
+ end
+ assert_equal(<<~DETAIL.chomp, exception.to_s)
+ Malformed comment
+ Line: 1
+ Position: 8
+ Last 80 unconsumed characters:
+ -->
+ DETAIL
+ end
+
+ def test_after_doctype_malformed_comment_inner
+ exception = assert_raise(REXML::ParseException) do
+ parse("")
+ end
+ assert_equal(<<~DETAIL, exception.to_s)
+ Malformed comment
+ Line: 1
+ Position: 14
+ Last 80 unconsumed characters:
+ DETAIL
+ end
+
+ def test_after_doctype_malformed_comment_end
+ exception = assert_raise(REXML::ParseException) do
+ parse("")
+ end
+ assert_equal(<<~DETAIL, exception.to_s)
+ Malformed comment
+ Line: 1
+ Position: 12
+ Last 80 unconsumed characters:
+ DETAIL
+ end
+ end
+
+ def test_before_root
+ parser = REXML::Parsers::BaseParser.new('')
+
+ events = {}
+ while parser.has_next?
+ event = parser.pull
+ events[event[0]] = event[1]
+ end
+
+ assert_equal(" ok comment ", events[:comment])
+ end
+
+ def test_after_root
+ parser = REXML::Parsers::BaseParser.new('')
+
+ events = {}
+ while parser.has_next?
+ event = parser.pull
+ events[event[0]] = event[1]
+ end
+
+ assert_equal(" ok comment ", events[:comment])
+ end
+
+ def test_linear_performance_top_level_gt
+ seq = [10000, 50000, 100000, 150000, 200000]
+ assert_linear_performance(seq, rehearsal: 10) do |n|
+ REXML::Document.new('')
+ end
+ end
+
+ def test_linear_performance_in_element_gt
+ seq = [10000, 50000, 100000, 150000, 200000]
+ assert_linear_performance(seq, rehearsal: 10) do |n|
+ REXML::Document.new('')
+ end
+ end
+ end
+end
diff --git a/test/parse/test_document_type_declaration.rb b/test/parse/test_document_type_declaration.rb
index 55713909..99c23745 100644
--- a/test/parse/test_document_type_declaration.rb
+++ b/test/parse/test_document_type_declaration.rb
@@ -1,9 +1,13 @@
# frozen_string_literal: false
require "test/unit"
+require "core_assertions"
+
require "rexml/document"
module REXMLTests
class TestParseDocumentTypeDeclaration < Test::Unit::TestCase
+ include Test::Unit::CoreAssertions
+
private
def parse(doctype)
REXML::Document.new(<<-XML).doctype
@@ -36,6 +40,66 @@ def test_garbage_plus_before_name_at_line_start
+ r SYSTEM "urn:x-rexml:test" [ ]>
DETAIL
end
+
+ def test_no_name
+ exception = assert_raise(REXML::ParseException) do
+ parse(<<-DOCTYPE)
+
+ DOCTYPE
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed DOCTYPE: name is missing
+Line: 3
+Position: 17
+Last 80 unconsumed characters:
+
+ DETAIL
+ end
+ end
+
+ class TestUnclosed < self
+ def test_no_extra_node
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("
+ DOCTYPE
+ end
+ assert_equal(<<~DETAIL.chomp, exception.to_s)
+ Malformed DOCTYPE: invalid declaration
+ Line: 1
+ Position: 20
+ Last 80 unconsumed characters:
+ #{' '}
+ DETAIL
+ end
+
+ def test_text
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new(<<~DOCTYPE)
+ " * n + "]>")
+ rescue
+ end
+ end
+ end
+
+ def test_linear_performance_comment_gt
+ seq = [10000, 50000, 100000, 150000, 200000]
+ assert_linear_performance(seq, rehearsal: 10) do |n|
+ REXML::Document.new("" * n + " -->]>")
+ end
+ end
+
+ def test_linear_performance_external_entity_right_bracket_gt
+ seq = [10000, 50000, 100000, 150000, 200000]
+ assert_linear_performance(seq, rehearsal: 10) do |n|
+ REXML::Document.new("" * n + ";]>")
+ end
+ end
end
end
diff --git a/test/parse/test_element.rb b/test/parse/test_element.rb
index 9f172a28..2b0746ea 100644
--- a/test/parse/test_element.rb
+++ b/test/parse/test_element.rb
@@ -1,8 +1,12 @@
require "test/unit"
+require "core_assertions"
+
require "rexml/document"
module REXMLTests
class TestParseElement < Test::Unit::TestCase
+ include Test::Unit::CoreAssertions
+
def parse(xml)
REXML::Document.new(xml)
end
@@ -41,9 +45,22 @@ def test_empty_namespace_attribute_name
assert_equal(<<-DETAIL.chomp, exception.to_s)
Invalid attribute name: <:a="">
Line: 1
-Position: 9
+Position: 13
Last 80 unconsumed characters:
+:a="">
+ DETAIL
+ end
+ def test_empty_namespace_attribute_name_with_utf8_character
+ exception = assert_raise(REXML::ParseException) do
+ parse("") # U+200B ZERO WIDTH SPACE
+ end
+ assert_equal(<<-DETAIL.chomp.force_encoding("ASCII-8BIT"), exception.to_s)
+Invalid attribute name: <:\xE2\x80\x8B>
+Line: 1
+Position: 8
+Last 80 unconsumed characters:
+:\xE2\x80\x8B>
DETAIL
end
@@ -72,6 +89,47 @@ def test_garbage_less_than_slash_before_end_tag_at_line_start
DETAIL
end
+
+ def test_after_root
+ exception = assert_raise(REXML::ParseException) do
+ parser = REXML::Parsers::BaseParser.new('')
+ while parser.has_next?
+ parser.pull
+ end
+ end
+
+ assert_equal(<<~DETAIL.chomp, exception.to_s)
+ Malformed XML: Extra tag at the end of the document (got '')
+ while parser.has_next?
+ parser.pull
+ end
+ end
+
+ assert_equal(<<~DETAIL.chomp, exception.to_s)
+ Malformed XML: Extra tag at the end of the document (got '" * n + '">')
+ end
end
end
end
diff --git a/test/parse/test_entity_declaration.rb b/test/parse/test_entity_declaration.rb
new file mode 100644
index 00000000..81d95b58
--- /dev/null
+++ b/test/parse/test_entity_declaration.rb
@@ -0,0 +1,557 @@
+# frozen_string_literal: false
+require "test/unit"
+require "core_assertions"
+
+require "rexml/document"
+
+module REXMLTests
+ class TestParseEntityDeclaration < Test::Unit::TestCase
+ include Test::Unit::CoreAssertions
+
+ private
+ def xml(internal_subset)
+ <<-XML
+
+
+ XML
+ end
+
+ def parse(internal_subset)
+ REXML::Document.new(xml(internal_subset)).doctype
+ end
+
+ public
+
+ # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-GEDecl
+ class TestGeneralEntityDeclaration < self
+ # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-Name
+ class TestName < self
+ def test_prohibited_character
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 61
+Last 80 unconsumed characters:
+ invalid&name "valid-entity-value">]>
+ DETAIL
+ end
+ end
+
+ # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-EntityDef
+ class TestEntityDefinition < self
+ # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-EntityValue
+ class TestEntityValue < self
+ def test_no_quote
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 59
+Last 80 unconsumed characters:
+ valid-name invalid-entity-value>]>
+ DETAIL
+ end
+
+ def test_prohibited_character
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 44
+Last 80 unconsumed characters:
+ valid-name "% &">]>
+ DETAIL
+ end
+
+ def test_mixed_quote
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 61
+Last 80 unconsumed characters:
+ valid-name "invalid-entity-value'>]>
+ DETAIL
+ end
+ end
+
+ # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-ExternalID
+ class TestExternalID < self
+ # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-SystemLiteral
+ class TestSystemLiteral < self
+ def test_no_quote_in_system
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 68
+Last 80 unconsumed characters:
+ valid-name SYSTEM invalid-system-literal>]>
+ DETAIL
+ end
+
+ def test_no_quote_in_public
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 90
+Last 80 unconsumed characters:
+ valid-name PUBLIC "valid-pubid-literal" invalid-system-literal>]>
+ DETAIL
+ end
+
+ def test_mixed_quote_in_system
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 70
+Last 80 unconsumed characters:
+ valid-name SYSTEM 'invalid-system-literal">]>
+ DETAIL
+ end
+
+ def test_mixed_quote_in_public
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 92
+Last 80 unconsumed characters:
+ valid-name PUBLIC "valid-pubid-literal" "invalid-system-literal'>]>
+ DETAIL
+ end
+
+ def test_no_literal_in_system
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 45
+Last 80 unconsumed characters:
+ valid-name SYSTEM>]>
+ DETAIL
+ end
+
+ def test_no_literal_in_public
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 67
+Last 80 unconsumed characters:
+ valid-name PUBLIC "valid-pubid-literal">]>
+ DETAIL
+ end
+ end
+
+ # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-PubidLiteral
+ # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-PubidChar
+ class TestPublicIDLiteral < self
+ def test_no_quote
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 90
+Last 80 unconsumed characters:
+ valid-name PUBLIC invalid-pubid-literal "valid-system-literal">]>
+ DETAIL
+ end
+
+ def test_prohibited_pubid_character
+ exception = assert_raise(REXML::ParseException) do
+ # U+3042 HIRAGANA LETTER A
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.force_encoding('utf-8').chomp, exception.to_s.force_encoding('utf-8'))
+Malformed entity declaration
+Line: 1
+Position: 74
+Last 80 unconsumed characters:
+ valid-name PUBLIC "\u3042" "valid-system-literal">]>
+ DETAIL
+ end
+
+ def test_mixed_quote
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 92
+Last 80 unconsumed characters:
+ valid-name PUBLIC "invalid-pubid-literal' "valid-system-literal">]>
+ DETAIL
+ end
+
+ def test_no_literal
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 45
+Last 80 unconsumed characters:
+ valid-name PUBLIC>]>
+ DETAIL
+ end
+ end
+ end
+
+ # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-NDataDecl
+ class TestNotationDataDeclaration < self
+ # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-NameChar
+ def test_prohibited_character
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 109
+Last 80 unconsumed characters:
+ valid-name PUBLIC "valid-pubid-literal" "valid-system-literal" NDATA invalid&nam
+ DETAIL
+ end
+ end
+
+ def test_entity_value_and_notation_data_declaration
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 83
+Last 80 unconsumed characters:
+ valid-name "valid-entity-value" NDATA valid-ndata-value>]>
+ DETAIL
+ end
+ end
+
+ def test_no_space
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 102
+Last 80 unconsumed characters:
+ valid-namePUBLIC"valid-pubid-literal""valid-system-literal"NDATAvalid-name>]>
+ DETAIL
+ end
+ end
+
+ # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-PEDecl
+ class TestParsedEntityDeclaration < self
+ # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-Name
+ class TestName < self
+ def test_prohibited_character
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 63
+Last 80 unconsumed characters:
+ % invalid&name "valid-entity-value">]>
+ DETAIL
+ end
+ end
+
+ # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-PEDef
+ class TestParsedEntityDefinition < self
+ # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-EntityValue
+ class TestEntityValue < self
+ def test_no_quote
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 61
+Last 80 unconsumed characters:
+ % valid-name invalid-entity-value>]>
+ DETAIL
+ end
+
+ def test_prohibited_character
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 46
+Last 80 unconsumed characters:
+ % valid-name "% &">]>
+ DETAIL
+ end
+
+ def test_mixed_quote
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 63
+Last 80 unconsumed characters:
+ % valid-name 'invalid-entity-value">]>
+ DETAIL
+ end
+ end
+
+ # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-ExternalID
+ class TestExternalID < self
+ # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-SystemLiteral
+ class TestSystemLiteral < self
+ def test_no_quote_in_system
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 70
+Last 80 unconsumed characters:
+ % valid-name SYSTEM invalid-system-literal>]>
+ DETAIL
+ end
+
+ def test_no_quote_in_public
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 92
+Last 80 unconsumed characters:
+ % valid-name PUBLIC "valid-pubid-literal" invalid-system-literal>]>
+ DETAIL
+ end
+
+ def test_mixed_quote_in_system
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 72
+Last 80 unconsumed characters:
+ % valid-name SYSTEM "invalid-system-literal'>]>
+ DETAIL
+ end
+
+ def test_mixed_quote_in_public
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 94
+Last 80 unconsumed characters:
+ % valid-name PUBLIC "valid-pubid-literal" 'invalid-system-literal">]>
+ DETAIL
+ end
+
+ def test_no_literal_in_system
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 47
+Last 80 unconsumed characters:
+ % valid-name SYSTEM>]>
+ DETAIL
+ end
+
+ def test_no_literal_in_public
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 69
+Last 80 unconsumed characters:
+ % valid-name PUBLIC "valid-pubid-literal">]>
+ DETAIL
+ end
+ end
+
+ # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-PubidLiteral
+ # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-PubidChar
+ class TestPublicIDLiteral < self
+ def test_no_quote
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 92
+Last 80 unconsumed characters:
+ % valid-name PUBLIC invalid-pubid-literal "valid-system-literal">]>
+ DETAIL
+ end
+
+ def test_prohibited_pubid_character
+ exception = assert_raise(REXML::ParseException) do
+ # U+3042 HIRAGANA LETTER A
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.force_encoding('utf-8').chomp, exception.to_s.force_encoding('utf-8'))
+Malformed entity declaration
+Line: 1
+Position: 76
+Last 80 unconsumed characters:
+ % valid-name PUBLIC "\u3042" "valid-system-literal">]>
+ DETAIL
+ end
+
+ def test_mixed_quote
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 94
+Last 80 unconsumed characters:
+ % valid-name PUBLIC 'invalid-pubid-literal" "valid-system-literal">]>
+ DETAIL
+ end
+
+ def test_no_literal
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 47
+Last 80 unconsumed characters:
+ % valid-name PUBLIC>]>
+ DETAIL
+ end
+ end
+ end
+
+ def test_entity_value_and_notation_data_declaration
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 85
+Last 80 unconsumed characters:
+ % valid-name "valid-entity-value" NDATA valid-ndata-value>]>
+ DETAIL
+ end
+ end
+
+ def test_no_space
+ exception = assert_raise(REXML::ParseException) do
+ REXML::Document.new("]>")
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 67
+Last 80 unconsumed characters:
+ %valid-nameSYSTEM"valid-system-literal">]>
+ DETAIL
+ end
+ end
+
+ def test_empty
+ exception = assert_raise(REXML::ParseException) do
+ parse(<<-INTERNAL_SUBSET)
+
+ INTERNAL_SUBSET
+ end
+ assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 5
+Position: 70
+Last 80 unconsumed characters:
+> ]>
+ DETAIL
+ end
+
+ def test_linear_performance_entity_value_gt
+ seq = [10000, 50000, 100000, 150000, 200000]
+ assert_linear_performance(seq, rehearsal: 10) do |n|
+ REXML::Document.new("" * n +
+ "\">]>")
+ end
+ end
+
+ def test_linear_performance_entity_value_gt_right_bracket
+ seq = [10000, 50000, 100000, 150000, 200000]
+ assert_linear_performance(seq, rehearsal: 10) do |n|
+ REXML::Document.new("]" * n +
+ "\">]>")
+ end
+ end
+
+ def test_linear_performance_system_literal_in_system_gt_right_bracket
+ seq = [10000, 50000, 100000, 150000, 200000]
+ assert_linear_performance(seq, rehearsal: 10) do |n|
+ REXML::Document.new("]" * n +
+ "\">]>")
+ end
+ end
+
+ def test_linear_performance_system_literal_in_public_gt_right_bracket
+ seq = [10000, 50000, 100000, 150000, 200000]
+ assert_linear_performance(seq, rehearsal: 10) do |n|
+ REXML::Document.new("]" * n +
+ "\">]>")
+ end
+ end
+ end
+end
diff --git a/test/parse/test_notation_declaration.rb b/test/parse/test_notation_declaration.rb
index 19a0536d..9e81b6a4 100644
--- a/test/parse/test_notation_declaration.rb
+++ b/test/parse/test_notation_declaration.rb
@@ -35,7 +35,7 @@ def test_no_name
Line: 5
Position: 72
Last 80 unconsumed characters:
- ]>
+ ]>
DETAIL
end
diff --git a/test/parse/test_processing_instruction.rb b/test/parse/test_processing_instruction.rb
index f0c0c24e..ba381dc4 100644
--- a/test/parse/test_processing_instruction.rb
+++ b/test/parse/test_processing_instruction.rb
@@ -1,8 +1,12 @@
require "test/unit"
+require "core_assertions"
+
require "rexml/document"
module REXMLTests
- class TestParseProcessinInstruction < Test::Unit::TestCase
+ class TestParseProcessingInstruction < Test::Unit::TestCase
+ include Test::Unit::CoreAssertions
+
def parse(xml)
REXML::Document.new(xml)
end
@@ -13,31 +17,110 @@ def test_no_name
parse("")
end
assert_equal(<<-DETAIL.chomp, exception.to_s)
-Invalid processing instruction node
+Malformed XML: Invalid processing instruction node: invalid name
Line: 1
Position: 4
Last 80 unconsumed characters:
-
+?>
+ DETAIL
+ end
+
+ def test_unclosed_content
+ exception = assert_raise(REXML::ParseException) do
+ parse("')
+ while parser.has_next?
+ parser.pull
+ end
+ end
+
+ assert_equal(<<~DETAIL.chomp, exception.to_s)
+ Malformed XML: XML declaration is not at the start
+ Line: 1
+ Position: 25
+ Last 80 unconsumed characters:
+
DETAIL
end
+ end
- def test_garbage_text
- # TODO: This should be parse error.
- # Create test/parse/test_document.rb or something and move this to it.
- doc = parse(<<-XML)
-x?>
- XML
- pi = doc.children[1]
- assert_equal([
- "x",
- "y\n"]],
+ [[doc.children[0].target, doc.children[0].content],
+ [doc.children[1].target, doc.children[1].content]])
+ end
+
+ def test_before_root
+ parser = REXML::Parsers::BaseParser.new('')
+
+ events = {}
+ while parser.has_next?
+ event = parser.pull
+ events[event[0]] = event[1]
+ end
+
+ assert_equal("abc", events[:processing_instruction])
+ end
+
+ def test_after_root
+ parser = REXML::Parsers::BaseParser.new('')
+
+ events = {}
+ while parser.has_next?
+ event = parser.pull
+ events[event[0]] = event[1]
+ end
+
+ assert_equal("abc", events[:processing_instruction])
+ end
+
+ def test_content_question
+ document = REXML::Document.new("")
+ assert_equal("con?tent", document.root.children.first.content)
+ end
+
+ def test_linear_performance_gt
+ seq = [10000, 50000, 100000, 150000, 200000]
+ assert_linear_performance(seq, rehearsal: 10) do |n|
+ REXML::Document.new("" * n + " ?>")
+ end
+ end
+
+ def test_linear_performance_tab
+ seq = [10000, 50000, 100000, 150000, 200000]
+ assert_linear_performance(seq, rehearsal: 10) do |n|
+ REXML::Document.new(" ?>")
end
end
end
diff --git a/test/parse/test_text.rb b/test/parse/test_text.rb
new file mode 100644
index 00000000..04f553ae
--- /dev/null
+++ b/test/parse/test_text.rb
@@ -0,0 +1,57 @@
+require "test/unit"
+require 'rexml/parsers/baseparser'
+
+module REXMLTests
+ class TestParseText < Test::Unit::TestCase
+ class TestInvalid < self
+ def test_before_root
+ exception = assert_raise(REXML::ParseException) do
+ parser = REXML::Parsers::BaseParser.new('b')
+ while parser.has_next?
+ parser.pull
+ end
+ end
+
+ assert_equal(<<~DETAIL.chomp, exception.to_s)
+ Malformed XML: Content at the start of the document (got 'b')
+ Line: 1
+ Position: 4
+ Last 80 unconsumed characters:
+
+ DETAIL
+ end
+
+ def test_after_root
+ exception = assert_raise(REXML::ParseException) do
+ parser = REXML::Parsers::BaseParser.new('c')
+ while parser.has_next?
+ parser.pull
+ end
+ end
+
+ assert_equal(<<~DETAIL.chomp, exception.to_s)
+ Malformed XML: Extra content at the end of the document (got 'c')
+ Line: 1
+ Position: 8
+ Last 80 unconsumed characters:
+
+ DETAIL
+ end
+ end
+
+ def test_whitespace_characters_after_root
+ parser = REXML::Parsers::BaseParser.new('b ')
+
+ events = []
+ while parser.has_next?
+ event = parser.pull
+ case event[0]
+ when :text
+ events << event[1]
+ end
+ end
+
+ assert_equal(["b"], events)
+ end
+ end
+end
diff --git a/test/parser/test_base_parser.rb b/test/parser/test_base_parser.rb
new file mode 100644
index 00000000..17d01979
--- /dev/null
+++ b/test/parser/test_base_parser.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: false
+
+require 'rexml/parsers/baseparser'
+
+module REXMLTests
+ class BaseParserTester < Test::Unit::TestCase
+ def test_large_xml
+ large_text = "a" * 100_000
+ xml = <<-XML
+
+
+ #{large_text}
+ #{large_text}
+
+ XML
+
+ parser = REXML::Parsers::BaseParser.new(xml)
+ while parser.has_next?
+ parser.pull
+ end
+
+ assert do
+ parser.position < xml.bytesize
+ end
+ end
+ end
+end
diff --git a/test/parser/test_ultra_light.rb b/test/parser/test_ultra_light.rb
index 44fd1d1e..b3f576ff 100644
--- a/test/parser/test_ultra_light.rb
+++ b/test/parser/test_ultra_light.rb
@@ -17,7 +17,6 @@ def test_entity_declaration
[:entitydecl, "name", "value"]
],
[:start_element, :parent, "root", {}],
- [:text, "\n"],
],
parse(<<-INTERNAL_SUBSET))
diff --git a/test/parser/test_xpath.rb b/test/parser/test_xpath.rb
new file mode 100644
index 00000000..9143d25c
--- /dev/null
+++ b/test/parser/test_xpath.rb
@@ -0,0 +1,115 @@
+# frozen_string_literal: false
+
+require "test/unit"
+require "rexml/parsers/xpathparser"
+
+module REXMLTests
+ class TestXPathParser < Test::Unit::TestCase
+ sub_test_case("#abbreviate") do
+ def abbreviate(xpath)
+ parser = REXML::Parsers::XPathParser.new
+ parser.abbreviate(xpath)
+ end
+
+ def test_document
+ assert_equal("/",
+ abbreviate("/"))
+ end
+
+ def test_descendant_or_self_only
+ assert_equal("//",
+ abbreviate("/descendant-or-self::node()/"))
+ end
+
+ def test_descendant_or_self_absolute
+ assert_equal("//a/b",
+ abbreviate("/descendant-or-self::node()/a/b"))
+ end
+
+ def test_descendant_or_self_relative
+ assert_equal("a//b",
+ abbreviate("a/descendant-or-self::node()/b"))
+ end
+
+ def test_descendant_or_self_not_node
+ assert_equal("/descendant-or-self::text()",
+ abbreviate("/descendant-or-self::text()"))
+ end
+
+ def test_self_absolute
+ assert_equal("/a/./b",
+ abbreviate("/a/self::node()/b"))
+ end
+
+ def test_self_relative
+ assert_equal("a/./b",
+ abbreviate("a/self::node()/b"))
+ end
+
+ def test_self_not_node
+ assert_equal("/self::text()",
+ abbreviate("/self::text()"))
+ end
+
+ def test_parent_absolute
+ assert_equal("/a/../b",
+ abbreviate("/a/parent::node()/b"))
+ end
+
+ def test_parent_relative
+ assert_equal("a/../b",
+ abbreviate("a/parent::node()/b"))
+ end
+
+ def test_parent_not_node
+ assert_equal("/a/parent::text()",
+ abbreviate("/a/parent::text()"))
+ end
+
+ def test_any_absolute
+ assert_equal("/*/a",
+ abbreviate("/*/a"))
+ end
+
+ def test_any_relative
+ assert_equal("a/*/b",
+ abbreviate("a/*/b"))
+ end
+
+ def test_following_sibling_absolute
+ assert_equal("/following-sibling::a/b",
+ abbreviate("/following-sibling::a/b"))
+ end
+
+ def test_following_sibling_relative
+ assert_equal("a/following-sibling::b/c",
+ abbreviate("a/following-sibling::b/c"))
+ end
+
+ def test_predicate_index
+ assert_equal("a[5]/b",
+ abbreviate("a[5]/b"))
+ end
+
+ def test_attribute_relative
+ assert_equal("a/@b",
+ abbreviate("a/attribute::b"))
+ end
+
+ def test_filter_attribute
+ assert_equal("a/b[@i = 1]/c",
+ abbreviate("a/b[attribute::i=1]/c"))
+ end
+
+ def test_filter_string_single_quote
+ assert_equal("a/b[@name = \"single ' quote\"]/c",
+ abbreviate("a/b[attribute::name=\"single ' quote\"]/c"))
+ end
+
+ def test_filter_string_double_quote
+ assert_equal("a/b[@name = 'double \" quote']/c",
+ abbreviate("a/b[attribute::name='double \" quote']/c"))
+ end
+ end
+ end
+end
diff --git a/test/test_attributes.rb b/test/test_attributes.rb
index 91fc68a5..09fde442 100644
--- a/test/test_attributes.rb
+++ b/test/test_attributes.rb
@@ -178,18 +178,27 @@ def test_amp_and_lf_attributes
attr_test('name','value with LF
& ampersand')
end
- def test_quoting
+ def test_quote_root
d = Document.new(%q{})
assert_equal( %q{}, d.to_s )
d.root.context[:attribute_quote] = :quote
assert_equal( %q{}, d.to_s )
+ end
+ def test_quote_sub_element
d = Document.new(%q{})
assert_equal( %q{}, d.to_s )
d.root.context[:attribute_quote] = :quote
assert_equal( %q{}, d.to_s )
end
+ def test_quote_to_s_value
+ doc = Document.new(%q{}, {attribute_quote: :quote})
+ assert_equal(%q{}, doc.to_s)
+ assert_equal("'", doc.root.attribute("a").value)
+ assert_equal(%q{}, doc.to_s)
+ end
+
def test_ticket_127
doc = Document.new
doc.add_element 'a', { 'v' => 'x & y' }
diff --git a/test/test_contrib.rb b/test/test_contrib.rb
index f3ad0b6c..23ee35b1 100644
--- a/test/test_contrib.rb
+++ b/test/test_contrib.rb
@@ -80,7 +80,7 @@ def test_bad_doctype_Tobias
# Peter Verhage
def test_namespace_Peter
- source = <<-EOF
+ source = <<~EOF
@@ -377,7 +377,7 @@ def test_various_xpath
end
def test_entities_Holden_Glova
- document = <<-EOL
+ document = <<~EOL
diff --git a/test/test_core.rb b/test/test_core.rb
index fd3af8c2..e1fba8a7 100644
--- a/test/test_core.rb
+++ b/test/test_core.rb
@@ -15,7 +15,7 @@ class Tester < Test::Unit::TestCase
include Helper::Fixture
include REXML
def setup
- @xsa_source = <<-EOL
+ @xsa_source = <<~EOL
+
+
+ XML
+
+ expected_names = %w[
+ root
+ 1_1 1_2 1_3
+ 2_1 2_2 2_3
+ ]
+
+ document = REXML::Document.new(xml_source)
+
+ # Node#each_recursive iterates elements only.
+ # This does not iterate XML declarations, comments, attributes, CDATA sections, etc.
+ actual_names = []
+ document.each_recursive do |element|
+ actual_names << element.attributes["name"]
+ end
+ assert_equal(expected_names, actual_names)
+ end
+
class WriteTest < Test::Unit::TestCase
def setup
- @document = REXML::Document.new(<<-EOX)
+ @document = REXML::Document.new(<<-EOX.chomp)
Hello world!
EOX
@@ -212,7 +249,7 @@ class ArgumentsTest < self
def test_output
output = ""
@document.write(output)
- assert_equal(<<-EOX, output)
+ assert_equal(<<-EOX.chomp, output)
Hello world!
EOX
@@ -235,7 +272,7 @@ def test_transitive
indent = 2
transitive = true
@document.write(output, indent, transitive)
- assert_equal(<<-EOX, output)
+ assert_equal(<<-EOX.chomp, output)
Hello world!
#{japanese_text}
EOX
@@ -275,7 +312,7 @@ class OptionsTest < self
def test_output
output = ""
@document.write(:output => output)
- assert_equal(<<-EOX, output)
+ assert_equal(<<-EOX.chomp, output)
Hello world!
EOX
@@ -295,7 +332,7 @@ def test_indent
def test_transitive
output = ""
@document.write(:output => output, :indent => 2, :transitive => true)
- assert_equal(<<-EOX, output)
+ assert_equal(<<-EOX.chomp, output)
Hello world! output, :encoding => encoding)
- assert_equal(<<-EOX.encode(encoding), output)
+ assert_equal(<<-EOX.chomp.encode(encoding), output)
#{japanese_text}
EOX
@@ -401,7 +438,7 @@ def test_utf_16
actual_xml = ""
document.write(actual_xml)
- expected_xml = <<-EOX.encode("UTF-16BE")
+ expected_xml = <<-EOX.chomp.encode("UTF-16BE")
\ufeff
Hello world!
EOX
diff --git a/test/test_encoding.rb b/test/test_encoding.rb
index 09495c58..6887ffbe 100644
--- a/test/test_encoding.rb
+++ b/test/test_encoding.rb
@@ -67,7 +67,7 @@ def test_in_different_out
# * Given an encoded document, accessing text and attribute nodes
# should provide UTF-8 text.
def test_in_different_access
- doc = Document.new <<-EOL
+ doc = Document.new <<~EOL
\xFF
EOL
@@ -79,7 +79,7 @@ def test_in_different_access
def test_ticket_89
- doc = Document.new <<-EOL
+ doc = Document.new <<~EOL
EOL
diff --git a/test/test_light.rb b/test/test_light.rb
index 54b2c52e..c556c978 100644
--- a/test/test_light.rb
+++ b/test/test_light.rb
@@ -62,7 +62,7 @@ def test_access_child_elements
assert_equal( 'c', a[1].name )
end
- def test_itterate_over_children
+ def test_iterate_over_children
foo = make_small_document
ctr = 0
foo[0].each { ctr += 1 }
diff --git a/test/test_pullparser.rb b/test/test_pullparser.rb
index 53a985ba..55205af8 100644
--- a/test/test_pullparser.rb
+++ b/test/test_pullparser.rb
@@ -62,6 +62,63 @@ def test_entity_replacement
end
end
+ def test_character_references
+ source = 'AB'
+ parser = REXML::Parsers::PullParser.new( source )
+
+ events = {}
+ element_name = ''
+ while parser.has_next?
+ event = parser.pull
+ case event.event_type
+ when :start_element
+ element_name = event[0]
+ when :text
+ events[element_name] = event[1]
+ end
+ end
+
+ assert_equal('A', events['a'])
+ assert_equal("B", events['b'])
+ end
+
+ def test_text_entity_references
+ source = '<P> <I> <B> Text </B> </I>'
+ parser = REXML::Parsers::PullParser.new( source )
+
+ events = []
+ while parser.has_next?
+ event = parser.pull
+ case event.event_type
+ when :text
+ events << event[1]
+ end
+ end
+
+ assert_equal(["
Text "], events)
+ end
+
+ def test_text_content_with_line_breaks
+ source = "AB\nC\r\n"
+ parser = REXML::Parsers::PullParser.new( source )
+
+ events = {}
+ element_name = ''
+ while parser.has_next?
+ event = parser.pull
+ case event.event_type
+ when :start_element
+ element_name = event[0]
+ when :text
+ events[element_name] = event[1]
+ end
+ end
+
+ assert_equal('A', events['a'])
+ assert_equal("B\n", events['b'])
+ assert_equal("C\n", events['c'])
+ end
+
def test_peek_unshift
source = ""
REXML::Parsers::PullParser.new(source)
@@ -98,5 +155,101 @@ def test_peek
end
assert_equal( 0, names.length )
end
+
+ class EntityExpansionLimitTest < Test::Unit::TestCase
+ def setup
+ @default_entity_expansion_limit = REXML::Security.entity_expansion_limit
+ end
+
+ def teardown
+ REXML::Security.entity_expansion_limit = @default_entity_expansion_limit
+ end
+
+ class GeneralEntityTest < self
+ def test_have_value
+ source = <<-XML
+
+
+
+
+
+
+]>
+
+&a;
+
+ XML
+
+ parser = REXML::Parsers::PullParser.new(source)
+ assert_raise(RuntimeError.new("entity expansion has grown too large")) do
+ while parser.has_next?
+ parser.pull
+ end
+ end
+ end
+
+ def test_empty_value
+ source = <<-XML
+
+
+
+
+
+
+]>
+
+&a;
+
+ XML
+
+ parser = REXML::Parsers::PullParser.new(source)
+ assert_raise(RuntimeError.new("number of entity expansions exceeded, processing aborted.")) do
+ while parser.has_next?
+ parser.pull
+ end
+ end
+
+ REXML::Security.entity_expansion_limit = 100
+ parser = REXML::Parsers::PullParser.new(source)
+ assert_raise(RuntimeError.new("number of entity expansions exceeded, processing aborted.")) do
+ while parser.has_next?
+ parser.pull
+ end
+ end
+ assert_equal(101, parser.entity_expansion_count)
+ end
+
+ def test_with_default_entity
+ source = <<-XML
+
+
+
+]>
+
+&a;
+&a2;
+<
+
+ XML
+
+ REXML::Security.entity_expansion_limit = 4
+ parser = REXML::Parsers::PullParser.new(source)
+ while parser.has_next?
+ parser.pull
+ end
+
+ REXML::Security.entity_expansion_limit = 3
+ parser = REXML::Parsers::PullParser.new(source)
+ assert_raise(RuntimeError.new("number of entity expansions exceeded, processing aborted.")) do
+ while parser.has_next?
+ parser.pull
+ end
+ end
+ end
+ end
+ end
end
end
diff --git a/test/test_sax.rb b/test/test_sax.rb
index 6f775183..5e3ad75b 100644
--- a/test/test_sax.rb
+++ b/test/test_sax.rb
@@ -31,6 +31,17 @@ def test_entity_replacement
assert_equal '--1234--', results[1]
end
+ def test_characters_predefined_entities
+ source = '<P> <I> <B> Text </B> </I>'
+
+ sax = Parsers::SAX2Parser.new( source )
+ results = []
+ sax.listen(:characters) {|x| results << x }
+ sax.parse
+
+ assert_equal(["
Text "], results)
+ end
+
def test_sax2
File.open(fixture_path("documentation.xml")) do |f|
parser = Parsers::SAX2Parser.new( f )
@@ -88,6 +99,92 @@ def test_sax2
end
end
+ class EntityExpansionLimitTest < Test::Unit::TestCase
+ def setup
+ @default_entity_expansion_limit = REXML::Security.entity_expansion_limit
+ end
+
+ def teardown
+ REXML::Security.entity_expansion_limit = @default_entity_expansion_limit
+ end
+
+ class GeneralEntityTest < self
+ def test_have_value
+ source = <<-XML
+
+
+
+
+
+
+]>
+
+&a;
+
+ XML
+
+ sax = REXML::Parsers::SAX2Parser.new(source)
+ assert_raise(RuntimeError.new("entity expansion has grown too large")) do
+ sax.parse
+ end
+ end
+
+ def test_empty_value
+ source = <<-XML
+
+
+
+
+
+
+]>
+
+&a;
+
+ XML
+
+ sax = REXML::Parsers::SAX2Parser.new(source)
+ assert_raise(RuntimeError.new("number of entity expansions exceeded, processing aborted.")) do
+ sax.parse
+ end
+
+ REXML::Security.entity_expansion_limit = 100
+ sax = REXML::Parsers::SAX2Parser.new(source)
+ assert_raise(RuntimeError.new("number of entity expansions exceeded, processing aborted.")) do
+ sax.parse
+ end
+ assert_equal(101, sax.entity_expansion_count)
+ end
+
+ def test_with_default_entity
+ source = <<-XML
+
+
+
+]>
+
+&a;
+&a2;
+<
+
+ XML
+
+ REXML::Security.entity_expansion_limit = 4
+ sax = REXML::Parsers::SAX2Parser.new(source)
+ sax.parse
+
+ REXML::Security.entity_expansion_limit = 3
+ sax = REXML::Parsers::SAX2Parser.new(source)
+ assert_raise(RuntimeError.new("number of entity expansions exceeded, processing aborted.")) do
+ sax.parse
+ end
+ end
+ end
+ end
+
# used by test_simple_doctype_listener
# submitted by Jeff Barczewski
class SimpleDoctypeListener
@@ -109,7 +206,7 @@ def doctype(name, pub_sys, long_name, uri)
# test simple non-entity doctype in sax listener
# submitted by Jeff Barczewski
def test_simple_doctype_listener
- xml = <<-END
+ xml = <<~END
Hello, world!
@@ -140,8 +237,8 @@ def test_simple_doctype_listener
# test doctype with missing name, should throw ParseException
# submitted by Jeff Barczewseki
- def test_doctype_with_mising_name_throws_exception
- xml = <<-END
+ def test_doctype_with_missing_name_throws_exception
+ xml = <<~END
Hello, world!
diff --git a/test/test_text_check.rb b/test/test_text_check.rb
new file mode 100644
index 00000000..11cf65a3
--- /dev/null
+++ b/test/test_text_check.rb
@@ -0,0 +1,121 @@
+# frozen_string_literal: false
+
+module REXMLTests
+ class TextCheckTester < Test::Unit::TestCase
+
+ def check(string)
+ REXML::Text.check(string, REXML::Text::NEEDS_A_SECOND_CHECK, nil)
+ end
+
+ def assert_check(string)
+ assert_nothing_raised { check(string) }
+ end
+
+ def assert_check_failed(string, illegal_part)
+ message = "Illegal character #{illegal_part.inspect} in raw string #{string.inspect}"
+ assert_raise(RuntimeError.new(message)) do
+ check(string)
+ end
+ end
+
+ class TestValid < self
+ def test_entity_name_start_char_colon
+ assert_check("&:;")
+ end
+
+ def test_entity_name_start_char_under_score
+ assert_check("&_;")
+ end
+
+ def test_entity_name_mix
+ assert_check("&A.b-0123;")
+ end
+
+ def test_character_reference_decimal
+ assert_check("¢")
+ end
+
+ def test_character_reference_hex
+ assert_check("")
+ end
+
+ def test_entity_name_non_ascii
+ # U+3042 HIRAGANA LETTER A
+ # U+3044 HIRAGANA LETTER I
+ assert_check("&\u3042\u3044;")
+ end
+
+ def test_normal_string
+ assert_check("foo")
+ end
+ end
+
+ class TestInvalid < self
+ def test_lt
+ assert_check_failed("<;", "<")
+ end
+
+ def test_lt_mix
+ assert_check_failed("ab
@@ -24,7 +24,7 @@ def test_validate
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
no_error( validator, %q{} )
@@ -33,7 +33,7 @@ def test_validate
def test_sequence
- rng = %q{
+ rng = <<-XML
@@ -45,7 +45,7 @@ def test_sequence
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -56,7 +56,7 @@ def test_sequence
def test_choice
- rng = %q{
+ rng = <<-XML
@@ -70,7 +70,7 @@ def test_choice
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -79,7 +79,7 @@ def test_choice
end
def test_optional
- rng = %q{
+ rng = <<-XML
@@ -90,7 +90,7 @@ def test_optional
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
no_error( validator, %q{} )
@@ -100,7 +100,7 @@ def test_optional
end
def test_zero_or_more
- rng = %q{
+ rng = <<-XML
@@ -111,7 +111,7 @@ def test_zero_or_more
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
no_error( validator, %q{} )
no_error( validator, %q{} )
@@ -119,7 +119,7 @@ def test_zero_or_more
error( validator, %q{} )
error( validator, %q{} )
- rng = %q{
+ rng = <<-XML
@@ -133,7 +133,7 @@ def test_zero_or_more
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
no_error( validator, %q{} )
@@ -143,7 +143,7 @@ def test_zero_or_more
end
def test_one_or_more
- rng = %q{
+ rng = <<-XML
@@ -154,7 +154,7 @@ def test_one_or_more
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -165,13 +165,13 @@ def test_one_or_more
end
def test_attribute
- rng = %q{
+ rng = <<-XML
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -181,7 +181,7 @@ def test_attribute
end
def test_choice_attributes
- rng = %q{
+ rng = <<-XML
@@ -189,7 +189,7 @@ def test_choice_attributes
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -199,7 +199,7 @@ def test_choice_attributes
end
def test_choice_attribute_element
- rng = %q{
+ rng = <<-XML
@@ -207,7 +207,7 @@ def test_choice_attribute_element
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -217,12 +217,12 @@ def test_choice_attribute_element
end
def test_empty
- rng = %q{
+ rng = <<-XML
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -231,12 +231,12 @@ def test_empty
end
def test_text_val
- rng = %q{
+ rng = <<-XML
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -245,7 +245,7 @@ def test_text_val
end
def test_choice_text
- rng = %q{
+ rng = <<-XML
@@ -253,7 +253,7 @@ def test_choice_text
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{Text} )
@@ -263,7 +263,7 @@ def test_choice_text
end
def test_group
- rng = %q{
+ rng = <<-XML
@@ -274,7 +274,7 @@ def test_group
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -282,7 +282,7 @@ def test_group
no_error( validator, %q{} )
no_error( validator, %q{} )
- rng = %q{
+ rng = <<-XML
@@ -291,7 +291,7 @@ def test_group
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -302,14 +302,14 @@ def test_group
def test_value
# Values as text nodes
- rng = %q{
+ rng = <<-XML
VaLuE
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{X} )
@@ -317,7 +317,7 @@ def test_value
no_error( validator, %q{VaLuE} )
# Values as text nodes, via choice
- rng = %q{
+ rng = <<-XML
@@ -327,7 +327,7 @@ def test_value
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -336,14 +336,14 @@ def test_value
no_error( validator, %q{Option 2} )
# Attribute values
- rng = %q{
+ rng = <<-XML
VaLuE
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -352,7 +352,7 @@ def test_value
no_error( validator, %q{} )
# Attribute values via choice
- rng = %q{
+ rng = <<-XML
@@ -362,7 +362,7 @@ def test_value
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -372,7 +372,7 @@ def test_value
end
def test_interleave
- rng = %q{
+ rng = <<-XML
@@ -383,7 +383,7 @@ def test_interleave
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -396,7 +396,7 @@ def test_interleave
end
def test_mixed
- rng = %q{
+ rng = <<-XML
@@ -405,7 +405,7 @@ def test_mixed
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
no_error( validator, %q{Text} )
@@ -413,7 +413,7 @@ def test_mixed
end
def test_ref_sequence
- rng = %q{
+ rng = <<-XML
@@ -429,7 +429,7 @@ def test_ref_sequence
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
no_error( validator, %q{} )
@@ -437,7 +437,7 @@ def test_ref_sequence
end
def test_ref_choice
- rng = %q{
+ rng = <<-XML
@@ -453,7 +453,7 @@ def test_ref_choice
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -461,7 +461,7 @@ def test_ref_choice
no_error( validator, %q{} )
no_error( validator, %q{} )
- rng = %q{
+ rng = <<-XML
@@ -477,7 +477,7 @@ def test_ref_choice
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -485,7 +485,7 @@ def test_ref_choice
no_error( validator, %q{} )
no_error( validator, %q{} )
- rng = %q{
+ rng = <<-XML
@@ -502,7 +502,7 @@ def test_ref_choice
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -513,7 +513,7 @@ def test_ref_choice
def test_ref_zero_plus
- rng = %q{
+ rng = <<-XML
@@ -530,7 +530,7 @@ def test_ref_zero_plus
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -538,7 +538,7 @@ def test_ref_zero_plus
no_error( validator, %q{} )
no_error( validator, %q{} )
- rng = %q{
+ rng = <<-XML
@@ -555,7 +555,7 @@ def test_ref_zero_plus
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -566,7 +566,7 @@ def test_ref_zero_plus
def test_ref_one_plus
- rng = %q{
+ rng = <<-XML
@@ -583,7 +583,7 @@ def test_ref_one_plus
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -591,7 +591,7 @@ def test_ref_one_plus
no_error( validator, %q{} )
no_error( validator, %q{} )
- rng = %q{
+ rng = <<-XML
@@ -608,7 +608,7 @@ def test_ref_one_plus
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -618,7 +618,7 @@ def test_ref_one_plus
end
def test_ref_interleave
- rng = %q{
+ rng = <<-XML
@@ -634,7 +634,7 @@ def test_ref_interleave
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -643,7 +643,7 @@ def test_ref_interleave
no_error( validator, %q{} )
no_error( validator, %q{} )
- rng = %q{
+ rng = <<-XML
@@ -659,7 +659,7 @@ def test_ref_interleave
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -668,7 +668,7 @@ def test_ref_interleave
no_error( validator, %q{} )
no_error( validator, %q{} )
- rng = %q{
+ rng = <<-XML
@@ -687,7 +687,7 @@ def test_ref_interleave
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -698,7 +698,7 @@ def test_ref_interleave
end
def test_ref_recurse
- rng = %q{
+ rng = <<-XML
@@ -715,7 +715,7 @@ def test_ref_recurse
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
error( validator, %q{} )
@@ -724,7 +724,7 @@ def test_ref_recurse
end
def test_ref_optional
- rng = %q{
+ rng = <<-XML
@@ -740,7 +740,7 @@ def test_ref_optional
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
no_error( validator, %q{} )
@@ -748,7 +748,7 @@ def test_ref_optional
error( validator, %q{} )
error( validator, %q{} )
- rng = %q{
+ rng = <<-XML
@@ -764,7 +764,7 @@ def test_ref_optional
- }
+ XML
validator = REXML::Validation::RelaxNG.new( rng )
no_error( validator, %q{} )
diff --git a/test/test_xml_declaration.rb b/test/test_xml_declaration.rb
index 6db54bab..6a1f4df0 100644
--- a/test/test_xml_declaration.rb
+++ b/test/test_xml_declaration.rb
@@ -6,7 +6,7 @@
module REXMLTests
class TestXmlDeclaration < Test::Unit::TestCase
def setup
- xml = <<-XML
+ xml = <<~XML
diff --git a/test/xpath/test_base.rb b/test/xpath/test_base.rb
index 5156bbbe..1dacd69d 100644
--- a/test/xpath/test_base.rb
+++ b/test/xpath/test_base.rb
@@ -451,6 +451,46 @@ def test_following
# puts results
#end
+ def test_nested_predicates
+ doc = Document.new <<-EOF
+
+
+ ab
+ cd
+
+
+ ef
+ gh
+
+
+ hi
+
+
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy