* encoding.c (rb_enc_compatible): empty strings are always compatible.

* string.c (rb_enc_cr_str_buf_cat): ditto.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15506 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 41 insertions, 1 deletions

diff --git a/test/ruby/test_utf16.rb b/test/ruby/test_utf16.rb
index 6e4fb4016..9074aa723 100644
--- a/test/ruby/test_utf16.rb
+++ b/test/ruby/test_utf16.rb
@@ -169,9 +169,49 @@ EOT
     enccall("aa".force_encoding("UTF-16BE"), :slice!, -1)
   end
 
-  def test_concat
+  def test_plus_empty1
     s1 = ""
     s2 = "aa".force_encoding("utf-16be")
+    assert_nothing_raised("#{encdump s1} << #{encdump s2}") {
+      s1 + s2
+    }
+  end
+
+  def test_plus_empty2
+    s1 = "aa"
+    s2 = "".force_encoding("utf-16be")
+    assert_nothing_raised("#{encdump s1} << #{encdump s2}") {
+      s1 + s2
+    }
+  end
+
+  def test_plus_nonempty
+    s1 = "aa"
+    s2 = "bb".force_encoding("utf-16be")
+    assert_raise(ArgumentError, "#{encdump s1} << #{encdump s2}") {
+      s1 + s2
+    }
+  end
+
+  def test_concat_empty1
+    s1 = ""
+    s2 = "aa".force_encoding("utf-16be")
+    assert_nothing_raised("#{encdump s1} << #{encdump s2}") {
+      s1 << s2
+    }
+  end
+
+  def test_concat_empty2
+    s1 = "aa"
+    s2 = "".force_encoding("utf-16be")
+    assert_nothing_raised("#{encdump s1} << #{encdump s2}") {
+      s1 << s2
+    }
+  end
+
+  def test_concat_nonempty
+    s1 = "aa"
+    s2 = "bb".force_encoding("utf-16be")
     assert_raise(ArgumentError, "#{encdump s1} << #{encdump s2}") {
       s1 << s2
     }