diff options
author | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-22 09:38:06 +0000 |
---|---|---|
committer | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-22 09:38:06 +0000 |
commit | 7a6f34103de55678241471aef582a5aa24622496 (patch) | |
tree | 21114b0a07b18173fca0af800073f0f0dfeb3718 /test/rexml | |
parent | 4d15e619eb1838daafd1510e86c1c8076fb9b227 (diff) |
rexml: Fix XPath bug of //#{ELEMENT_NAME}[#{POSITION}]
The position should be counted for each nodeset but the previous
implementation counts position for union-ed nodeset.
For example, "/a/*/*[1]" should be matched to "<c1/>" and "<c2/>" with
the following XML.
<a>
<b>
<c1/>
</b>
<b>
<c2/>
</b>
</a>
But the previous implementation just returns only "<c1/>".
* lib/rexml/element.rb (REXML::Attributes#each_attribute):
Support Enumerator for no block use.
* lib/rexml/element.rb (REXML::Attributes#each):
Support Enumerator for no block use.
* lib/rexml/functions.rb (REXML::Functions.string):
Support NaN again.
* lib/rexml/xpath_parser.rb: Re-implement "Step" evaluator.
It should evaluate "AxisSpecifier", "NodeTest" and "Predicate" in one
step to respect position for each nodeset.
* test/rexml/test_jaxen.rb: Enable more tests. Remained tests should
be also enabled but it'll not be near future.
* test/rexml/xpath/test_base.rb: Fix expected value.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rexml')
-rw-r--r-- | test/rexml/test_jaxen.rb | 9 | ||||
-rw-r--r-- | test/rexml/xpath/test_base.rb | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/test/rexml/test_jaxen.rb b/test/rexml/test_jaxen.rb index 0f8653c956..81cef500a3 100644 --- a/test/rexml/test_jaxen.rb +++ b/test/rexml/test_jaxen.rb @@ -24,14 +24,17 @@ module REXMLTests # document() function for XSLT isn't supported def _test_message ; process_test_case("message") ; end def test_moreover ; process_test_case("moreover") ; end - def _test_much_ado ; process_test_case("much_ado") ; end - def _test_namespaces ; process_test_case("namespaces") ; end - def _test_nitf ; process_test_case("nitf") ; end + def test_much_ado ; process_test_case("much_ado") ; end + def test_namespaces ; process_test_case("namespaces") ; end + def test_nitf ; process_test_case("nitf") ; end + # Exception should be considered def _test_numbers ; process_test_case("numbers") ; end def test_pi ; process_test_case("pi") ; end def test_pi2 ; process_test_case("pi2") ; end def test_simple ; process_test_case("simple") ; end + # TODO: namespace node is needed def _test_testNamespaces ; process_test_case("testNamespaces") ; end + # document() function for XSLT isn't supported def _test_text ; process_test_case("text") ; end def test_underscore ; process_test_case("underscore") ; end def _test_web ; process_test_case("web") ; end diff --git a/test/rexml/xpath/test_base.rb b/test/rexml/xpath/test_base.rb index 497bd9fc8f..790dcaea22 100644 --- a/test/rexml/xpath/test_base.rb +++ b/test/rexml/xpath/test_base.rb @@ -713,7 +713,7 @@ module REXMLTests XML d = REXML::Document.new( source ) r = REXML::XPath.match( d, %q{/a/*/*[1]} ) - assert_equal(["1"], + assert_equal(["1", "3"], r.collect {|element| element.attribute("id").value}) end @@ -849,7 +849,7 @@ module REXMLTests EOL d = REXML::Document.new( string ) cs = XPath.match( d, '/a/*/*[1]' ) - assert_equal(["c1"], cs.collect(&:name)) + assert_equal(["c1", "c2"], cs.collect(&:name)) end def test_sum |