From 6ef82943978ea5816a91c32e9ff822c73d1935f9 Mon Sep 17 00:00:00 2001
From: Kouhei Sutou <kou@clear-code.com>
Date: Sat, 25 May 2019 17:06:53 +0900
Subject: [ruby/rexml] xpath: fix a bug for equality or relational expressions

GitHub: fix #17

There is a bug when they are used against node set. They should return
boolean value but they returned node set.

Reported by Mirko Budszuhn. Thanks!!!

https://github.com/ruby/rexml/commit/a02bf38440
---
 test/rexml/xpath/test_base.rb     | 12 ++++--
 test/rexml/xpath/test_node_set.rb | 84 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+), 4 deletions(-)
 create mode 100644 test/rexml/xpath/test_node_set.rb

(limited to 'test/rexml/xpath')

diff --git a/test/rexml/xpath/test_base.rb b/test/rexml/xpath/test_base.rb
index 5a03087ca6..210d6c7c81 100644
--- a/test/rexml/xpath/test_base.rb
+++ b/test/rexml/xpath/test_base.rb
@@ -369,11 +369,15 @@ module REXMLTests
       assert_equal 2, c
     end
 
+    def match(xpath)
+      XPath.match(@@doc, xpath).collect(&:to_s)
+    end
+
     def test_grouping
-      t = XPath.first( @@doc, "a/d/*[name()='d' and (name()='f' or name()='q')]" )
-      assert_nil t
-      t = XPath.first( @@doc, "a/d/*[(name()='d' and name()='f') or name()='q']" )
-      assert_equal 'q', t.name
+      assert_equal([],
+                   match("a/d/*[name()='d' and (name()='f' or name()='q')]"))
+      assert_equal(["<q id='19'/>"],
+                   match("a/d/*[(name()='d' and name()='f') or name()='q']"))
     end
 
     def test_preceding
diff --git a/test/rexml/xpath/test_node_set.rb b/test/rexml/xpath/test_node_set.rb
new file mode 100644
index 0000000000..77f26f7a6d
--- /dev/null
+++ b/test/rexml/xpath/test_node_set.rb
@@ -0,0 +1,84 @@
+# frozen_string_literal: false
+
+require_relative "../rexml_test_utils"
+
+require "rexml/document"
+
+module REXMLTests
+  class TestXPathNodeSet < Test::Unit::TestCase
+    def match(xml, xpath)
+      document = REXML::Document.new(xml)
+      REXML::XPath.match(document, xpath)
+    end
+
+    def test_boolean_true
+      xml = <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <child/>
+  <child/>
+</root>
+      XML
+      assert_equal([true],
+                   match(xml, "/root/child=true()"))
+    end
+
+    def test_boolean_false
+      xml = <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+</root>
+      XML
+      assert_equal([false],
+                   match(xml, "/root/child=true()"))
+    end
+
+    def test_number_true
+      xml = <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <child>100</child>
+  <child>200</child>
+</root>
+      XML
+      assert_equal([true],
+                   match(xml, "/root/child=100"))
+    end
+
+    def test_number_false
+      xml = <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <child>100</child>
+  <child>200</child>
+</root>
+      XML
+      assert_equal([false],
+                   match(xml, "/root/child=300"))
+    end
+
+    def test_string_true
+      xml = <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <child>text</child>
+  <child>string</child>
+</root>
+      XML
+      assert_equal([true],
+                   match(xml, "/root/child='string'"))
+    end
+
+    def test_string_false
+      xml = <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <child>text</child>
+  <child>string</child>
+</root>
+      XML
+      assert_equal([false],
+                   match(xml, "/root/child='nonexistent'"))
+    end
+  end
+end
-- 
cgit v1.2.3