From 82aef2ae509361c08498c1a4ca07bf03866b5ecb Mon Sep 17 00:00:00 2001
From: kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 3 Nov 2012 04:58:03 +0000
Subject: [PATCH] * test/rexml/test_document.rb: Fix tests that expect encoding
 name   isn't normalized.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37448 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                   |  5 +++++
 test/rexml/test_document.rb | 10 ++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 957d55b2dd..647825b201 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Nov  3 13:46:49 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_document.rb: Fix tests that expect encoding name
+	  isn't normalized.
+
 Sat Nov  3 13:26:00 2012  Zachary Scott  <zachary@zacharyscott.net>
 
 	* dir.c (Dir#glob):
diff --git a/test/rexml/test_document.rb b/test/rexml/test_document.rb
index b78b310f00..0e154db20f 100644
--- a/test/rexml/test_document.rb
+++ b/test/rexml/test_document.rb
@@ -167,13 +167,12 @@ EOX
         ie_hack = false
         encoding = "Windows-31J"
 
-        xml_declaration_encoding = "Shift_JIS"
-        @document.xml_decl.encoding = xml_declaration_encoding
+        @document.xml_decl.encoding = "Shift_JIS"
         japanese_text = "こんにちは"
         @document.root.text = japanese_text
         @document.write(output, indent, transitive, ie_hack, encoding)
         assert_equal(<<-EOX.encode(encoding), output)
-<?xml version='1.0' encoding='#{xml_declaration_encoding}'?>
+<?xml version='1.0' encoding='SHIFT_JIS'?>
 <message>#{japanese_text}</message>
 EOX
       end
@@ -221,13 +220,12 @@ EOX
       def test_encoding
         output = ""
         encoding = "Windows-31J"
-        xml_declaration_encoding = "Shift_JIS"
-        @document.xml_decl.encoding = xml_declaration_encoding
+        @document.xml_decl.encoding = "Shift_JIS"
         japanese_text = "こんにちは"
         @document.root.text = japanese_text
         @document.write(:output => output, :encoding => encoding)
         assert_equal(<<-EOX.encode(encoding), output)
-<?xml version='1.0' encoding='#{xml_declaration_encoding}'?>
+<?xml version='1.0' encoding='SHIFT_JIS'?>
 <message>#{japanese_text}</message>
 EOX
       end