summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/rexml/test_contrib.rb2
-rw-r--r--test/rexml/test_jaxen.rb6
-rw-r--r--test/rexml/xpath/test_base.rb10
-rw-r--r--test/rss/test_1.0.rb8
-rw-r--r--test/rss/test_dublincore.rb2
5 files changed, 10 insertions, 18 deletions
diff --git a/test/rexml/test_contrib.rb b/test/rexml/test_contrib.rb
index 28b96a4972..8462b3c23f 100644
--- a/test/rexml/test_contrib.rb
+++ b/test/rexml/test_contrib.rb
@@ -451,7 +451,7 @@ EOL
end
def test_external_entity
- xp = '//*:channel/*:title'
+ xp = '//channel/title'
%w{working.rss broken.rss}.each do |path|
File.open(File.join(fixture_path(path))) do |file|
diff --git a/test/rexml/test_jaxen.rb b/test/rexml/test_jaxen.rb
index 81cef500a3..9640b8290b 100644
--- a/test/rexml/test_jaxen.rb
+++ b/test/rexml/test_jaxen.rb
@@ -84,7 +84,7 @@ module REXMLTests
def process_value_of(context, variables, namespaces, value_of)
expected = value_of.text
xpath = value_of.attributes["select"]
- matched = XPath.match(context, xpath, namespaces, variables)
+ matched = XPath.match(context, xpath, namespaces, variables, strict: true)
message = user_message(context, xpath, matched)
assert_equal(expected || "",
@@ -95,7 +95,7 @@ module REXMLTests
# processes a tests/document/context/test node ( where @exception is false or doesn't exist )
def process_nominal_test(context, variables, namespaces, test)
xpath = test.attributes["select"]
- matched = XPath.match(context, xpath, namespaces, variables)
+ matched = XPath.match(context, xpath, namespaces, variables, strict: true)
# might be a test with no count attribute, but nested valueOf elements
expected = test.attributes["count"]
if expected
@@ -113,7 +113,7 @@ module REXMLTests
def process_exceptional_test(context, variables, namespaces, test)
xpath = test.attributes["select"]
assert_raise(REXML::ParseException) do
- XPath.match(context, xpath, namespaces, variables)
+ XPath.match(context, xpath, namespaces, variables, strict: true)
end
end
diff --git a/test/rexml/xpath/test_base.rb b/test/rexml/xpath/test_base.rb
index 790dcaea22..5a03087ca6 100644
--- a/test/rexml/xpath/test_base.rb
+++ b/test/rexml/xpath/test_base.rb
@@ -880,10 +880,12 @@ module REXMLTests
<tada xmlns=''>xb</tada>
</tag1>
XML
- x = d.root
- num = 0
- x.each_element('tada') { num += 1 }
- assert_equal(1, num)
+ actual = []
+ d.root.each_element('tada') do |element|
+ actual << element.to_s
+ end
+ assert_equal(["<tada>xa</tada>", "<tada xmlns=''>xb</tada>"],
+ actual)
end
def test_ticket_39
diff --git a/test/rss/test_1.0.rb b/test/rss/test_1.0.rb
index 5be6a0587f..33ae29141b 100644
--- a/test/rss/test_1.0.rb
+++ b/test/rss/test_1.0.rb
@@ -54,8 +54,6 @@ module RSS
end
def test_channel
- skip # FIXME
-
about = "http://hoge.com"
resource = "http://hoge.com/hoge.png"
@@ -207,8 +205,6 @@ EOR
end
def test_image
- skip # FIXME
-
about = "http://hoge.com"
h = {
'title' => "fugafuga",
@@ -234,8 +230,6 @@ EOR
end
def test_item
- skip # FIXME
-
about = "http://hoge.com"
h = {
'title' => "fugafuga",
@@ -261,8 +255,6 @@ EOR
end
def test_textinput
- skip # FIXME
-
about = "http://hoge.com"
h = {
'title' => "fugafuga",
diff --git a/test/rss/test_dublincore.rb b/test/rss/test_dublincore.rb
index cd22a00bc4..37ef177199 100644
--- a/test/rss/test_dublincore.rb
+++ b/test/rss/test_dublincore.rb
@@ -103,8 +103,6 @@ EOR
end
def test_to_s
- skip # FIXME
-
assert_dc_to_s(@rss10_source, @rss10_parents, false)
assert_dc_to_s(@rss10_source, @rss10_parents, true)