summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/rexml/xpath/test_attribute.rb (renamed from test/rexml/test_xpath_attribute_query.rb)6
-rw-r--r--test/rexml/xpath/test_axis_preceding_sibling.rb (renamed from test/rexml/test_xpath_msw.rb)2
-rw-r--r--test/rexml/xpath/test_base.rb (renamed from test/rexml/test_xpath.rb)4
-rw-r--r--test/rexml/xpath/test_predicate.rb (renamed from test/rexml/test_xpath_pred.rb)2
-rw-r--r--test/rexml/xpath/test_text.rb (renamed from test/rexml/test_xpathtext.rb)2
6 files changed, 11 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index ccb4f8d..c4aa5b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 20:24:43 2014 Kouhei Sutou <kou@cozmixng.org>
+
+ * test/rexml/test_xpath*.rb: Move to ...
+ * test/rexml/xpath/*.rb: ... here.
+
Sat Feb 22 20:04:41 2014 Kouhei Sutou <kou@cozmixng.org>
* test/rexml/listener.rb: Untabify.
diff --git a/test/rexml/test_xpath_attribute_query.rb b/test/rexml/xpath/test_attribute.rb
index c0ad2c2..9af83a3 100644
--- a/test/rexml/test_xpath_attribute_query.rb
+++ b/test/rexml/xpath/test_attribute.rb
@@ -1,11 +1,7 @@
-# rexml_xpath_attribute_query.rb
-# May 16, 2007
-#
-
require 'test/unit'
require 'rexml/document'
-class TestRexmlXpathAttributeQuery < Test::Unit::TestCase
+class TestXPathAttribute < Test::Unit::TestCase
# xmlstr1 and xmlstr2 only differ in the second line - namespaces in the root element
@@xmlstr1 = '<?xml version="1.0" encoding="UTF-8"?>
diff --git a/test/rexml/test_xpath_msw.rb b/test/rexml/xpath/test_axis_preceding_sibling.rb
index d0b474f..d2981b3 100644
--- a/test/rexml/test_xpath_msw.rb
+++ b/test/rexml/xpath/test_axis_preceding_sibling.rb
@@ -1,7 +1,7 @@
require "test/unit/testcase"
require "rexml/document"
-class XPathAxesTester < Test::Unit::TestCase
+class TestXPathAxisPredcedingSibling < Test::Unit::TestCase
include REXML
SOURCE = <<-EOF
<a id='1'>
diff --git a/test/rexml/test_xpath.rb b/test/rexml/xpath/test_base.rb
index 927909a..26cd3f7 100644
--- a/test/rexml/test_xpath.rb
+++ b/test/rexml/xpath/test_base.rb
@@ -1,8 +1,8 @@
-require_relative "rexml_test_utils"
+require_relative "../rexml_test_utils"
require "rexml/document"
-class XPathTester < Test::Unit::TestCase
+class TestXPathBase < Test::Unit::TestCase
include REXMLTestUtils
include REXML
SOURCE = <<-EOF
diff --git a/test/rexml/test_xpath_pred.rb b/test/rexml/xpath/test_predicate.rb
index 5843589..5c196b9 100644
--- a/test/rexml/test_xpath_pred.rb
+++ b/test/rexml/xpath/test_predicate.rb
@@ -3,7 +3,7 @@ require "rexml/document"
require "rexml/xpath"
require "rexml/parsers/xpathparser"
-class XPathPredicateTester < Test::Unit::TestCase
+class TestXPathPredicate < Test::Unit::TestCase
include REXML
SRC=<<-EOL
<article>
diff --git a/test/rexml/test_xpathtext.rb b/test/rexml/xpath/test_text.rb
index 87441cb..c6a8691 100644
--- a/test/rexml/test_xpathtext.rb
+++ b/test/rexml/xpath/test_text.rb
@@ -3,7 +3,7 @@ require 'rexml/document'
require 'rexml/element'
require 'rexml/xpath'
-class XpathTestCase < Test::Unit::TestCase
+class TestXPathText < Test::Unit::TestCase
def setup
@doc = REXML::Document.new
end