Update to ruby/spec@a6b8805

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

6 files changed, 126 insertions, 17 deletions

diff --git a/spec/ruby/core/symbol/capitalize_spec.rb b/spec/ruby/core/symbol/capitalize_spec.rb
index cf7e8a007f..73850a2a8c 100644
--- a/spec/ruby/core/symbol/capitalize_spec.rb
+++ b/spec/ruby/core/symbol/capitalize_spec.rb
@@ -21,6 +21,13 @@ describe "Symbol#capitalize" do
     end
   end
 
+  ruby_version_is '2.4' do
+    it "capitalizes the first character if it is Unicode" do
+      :"äöü".capitalize.should == :"Äöü"
+      :"aou".capitalize.should == :"Aou"
+    end
+  end
+
   it "converts subsequent uppercase ASCII characters to their lowercase equivalents" do
     :lOWER.capitalize.should == :Lower
   end
diff --git a/spec/ruby/core/symbol/casecmp_spec.rb b/spec/ruby/core/symbol/casecmp_spec.rb
index 942bd15998..352c5b99cb 100644
--- a/spec/ruby/core/symbol/casecmp_spec.rb
+++ b/spec/ruby/core/symbol/casecmp_spec.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# -*- encoding: utf-8 -*-
 require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Symbol#casecmp with Symbol" do
@@ -11,10 +11,10 @@ describe "Symbol#casecmp with Symbol" do
 
   it "doesn't consider non-ascii characters equal that aren't" do
     # -- Latin-1 --
-    upper_a_tilde  = :"\xC3"
-    upper_a_umlaut = :"\xC4"
-    lower_a_tilde  = :"\xE3"
-    lower_a_umlaut = :"\xE4"
+    upper_a_tilde  = "\xC3".b.to_sym
+    upper_a_umlaut = "\xC4".b.to_sym
+    lower_a_tilde  = "\xE3".b.to_sym
+    lower_a_umlaut = "\xE4".b.to_sym
 
     lower_a_tilde.casecmp(lower_a_umlaut).should_not == 0
     lower_a_umlaut.casecmp(lower_a_tilde).should_not == 0
@@ -22,10 +22,10 @@ describe "Symbol#casecmp with Symbol" do
     upper_a_umlaut.casecmp(upper_a_tilde).should_not == 0
 
     # -- UTF-8 --
-    upper_a_tilde  = :"\xC3\x83"
-    upper_a_umlaut = :"\xC3\x84"
-    lower_a_tilde  = :"\xC3\xA3"
-    lower_a_umlaut = :"\xC3\xA4"
+    upper_a_tilde  = :"Ã"
+    lower_a_tilde  = :"ã"
+    upper_a_umlaut = :"Ä"
+    lower_a_umlaut = :"ä"
 
     lower_a_tilde.casecmp(lower_a_umlaut).should_not == 0
     lower_a_umlaut.casecmp(lower_a_tilde).should_not == 0
@@ -35,10 +35,10 @@ describe "Symbol#casecmp with Symbol" do
 
   it "doesn't do case mapping for non-ascii characters" do
     # -- Latin-1 --
-    upper_a_tilde  = :"\xC3"
-    upper_a_umlaut = :"\xC4"
-    lower_a_tilde  = :"\xE3"
-    lower_a_umlaut = :"\xE4"
+    upper_a_tilde  = "\xC3".b.to_sym
+    upper_a_umlaut = "\xC4".b.to_sym
+    lower_a_tilde  = "\xE3".b.to_sym
+    lower_a_umlaut = "\xE4".b.to_sym
 
     upper_a_tilde.casecmp(lower_a_tilde).should == -1
     upper_a_umlaut.casecmp(lower_a_umlaut).should == -1
@@ -46,10 +46,10 @@ describe "Symbol#casecmp with Symbol" do
     lower_a_umlaut.casecmp(upper_a_umlaut).should == 1
 
     # -- UTF-8 --
-    upper_a_tilde  = :"\xC3\x83"
-    upper_a_umlaut = :"\xC3\x84"
-    lower_a_tilde  = :"\xC3\xA3"
-    lower_a_umlaut = :"\xC3\xA4"
+    upper_a_tilde  = :"Ã"
+    lower_a_tilde  = :"ã"
+    upper_a_umlaut = :"Ä"
+    lower_a_umlaut = :"ä"
 
     upper_a_tilde.casecmp(lower_a_tilde).should == -1
     upper_a_umlaut.casecmp(lower_a_umlaut).should == -1
@@ -72,3 +72,75 @@ describe "Symbol#casecmp" do
     :abc.casecmp(obj).should be_nil
   end
 end
+
+ruby_version_is "2.4" do
+  describe 'Symbol#casecmp?' do
+    it "compares symbols without regard to case" do
+      :abcdef.casecmp?(:abcde).should == false
+      :aBcDeF.casecmp?(:abcdef).should == true
+      :abcdef.casecmp?(:abcdefg).should == false
+      :abcdef.casecmp?(:ABCDEF).should == true
+    end
+
+    it "doesn't consider non-ascii characters equal that aren't" do
+      # -- Latin-1 --
+      upper_a_tilde  = "\xC3".b.to_sym
+      upper_a_umlaut = "\xC4".b.to_sym
+      lower_a_tilde  = "\xE3".b.to_sym
+      lower_a_umlaut = "\xE4".b.to_sym
+
+      lower_a_tilde.casecmp?(lower_a_umlaut).should_not == true
+      lower_a_umlaut.casecmp?(lower_a_tilde).should_not == true
+      upper_a_tilde.casecmp?(upper_a_umlaut).should_not == true
+      upper_a_umlaut.casecmp?(upper_a_tilde).should_not == true
+
+      # -- UTF-8 --
+      upper_a_tilde  = :"Ã"
+      lower_a_tilde  = :"ã"
+      upper_a_umlaut = :"Ä"
+      lower_a_umlaut = :"ä"
+
+      lower_a_tilde.casecmp?(lower_a_umlaut).should_not == true
+      lower_a_umlaut.casecmp?(lower_a_tilde).should_not == true
+      upper_a_tilde.casecmp?(upper_a_umlaut).should_not == true
+      upper_a_umlaut.casecmp?(upper_a_tilde).should_not == true
+    end
+
+    it "doesn't do case mapping for non-ascii and non-unicode characters" do
+      # -- Latin-1 --
+      upper_a_tilde  = "\xC3".b.to_sym
+      upper_a_umlaut = "\xC4".b.to_sym
+      lower_a_tilde  = "\xE3".b.to_sym
+      lower_a_umlaut = "\xE4".b.to_sym
+
+      upper_a_tilde.casecmp?(lower_a_tilde).should == false
+      upper_a_umlaut.casecmp?(lower_a_umlaut).should == false
+      lower_a_tilde.casecmp?(upper_a_tilde).should == false
+      lower_a_umlaut.casecmp?(upper_a_umlaut).should == false
+    end
+
+    it 'does case mapping for unicode characters' do
+      # -- UTF-8 --
+      upper_a_tilde  = :"Ã"
+      lower_a_tilde  = :"ã"
+      upper_a_umlaut = :"Ä"
+      lower_a_umlaut = :"ä"
+
+      upper_a_tilde.casecmp?(lower_a_tilde).should == true
+      upper_a_umlaut.casecmp?(lower_a_umlaut).should == true
+      lower_a_tilde.casecmp?(upper_a_tilde).should == true
+      lower_a_umlaut.casecmp?(upper_a_umlaut).should == true
+    end
+
+    it 'returns nil when comparing characters with different encodings' do
+      # -- Latin-1 --
+      upper_a_tilde = "\xC3".b.to_sym
+
+      # -- UTF-8 --
+      lower_a_tilde = :"ã"
+
+      upper_a_tilde.casecmp?(lower_a_tilde).should == nil
+      lower_a_tilde.casecmp?(upper_a_tilde).should == nil
+    end
+  end
+end
diff --git a/spec/ruby/core/symbol/downcase_spec.rb b/spec/ruby/core/symbol/downcase_spec.rb
index 0b2422ad3e..6eb19e087a 100644
--- a/spec/ruby/core/symbol/downcase_spec.rb
+++ b/spec/ruby/core/symbol/downcase_spec.rb
@@ -20,6 +20,13 @@ describe "Symbol#downcase" do
     end
   end
 
+  ruby_version_is '2.4' do
+    it "uncapitalizes all Unicode characters" do
+      "ÄÖÜ".to_sym.downcase.should == :"äöü"
+      "AOU".to_sym.downcase.should == :"aou"
+    end
+  end
+
   it "leaves non-alphabetic ASCII characters as they were" do
     "Glark?!?".to_sym.downcase.should == :"glark?!?"
   end
diff --git a/spec/ruby/core/symbol/dup_spec.rb b/spec/ruby/core/symbol/dup_spec.rb
new file mode 100644
index 0000000000..2ca4d84078
--- /dev/null
+++ b/spec/ruby/core/symbol/dup_spec.rb
@@ -0,0 +1,9 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+ruby_version_is '2.4' do
+  describe "Symbol#dup" do
+    it "returns self" do
+      :a_symbol.dup.should equal(:a_symbol)
+    end
+  end
+end
diff --git a/spec/ruby/core/symbol/swapcase_spec.rb b/spec/ruby/core/symbol/swapcase_spec.rb
index fdc42ec477..3124f782bc 100644
--- a/spec/ruby/core/symbol/swapcase_spec.rb
+++ b/spec/ruby/core/symbol/swapcase_spec.rb
@@ -28,6 +28,13 @@ describe "Symbol#swapcase" do
     end
   end
 
+  ruby_version_is '2.4' do
+    it "swaps the case for Unicode characters" do
+      "äÖü".to_sym.swapcase.should == :"ÄöÜ"
+      "aOu".to_sym.swapcase.should == :"AoU"
+    end
+  end
+
   it "leaves non-alphabetic ASCII characters as they were" do
     "Glark?!?".to_sym.swapcase.should == :"gLARK?!?"
   end
diff --git a/spec/ruby/core/symbol/upcase_spec.rb b/spec/ruby/core/symbol/upcase_spec.rb
index fce62af100..fe2c88d294 100644
--- a/spec/ruby/core/symbol/upcase_spec.rb
+++ b/spec/ruby/core/symbol/upcase_spec.rb
@@ -16,6 +16,13 @@ describe "Symbol#upcase" do
     end
   end
 
+  ruby_version_is '2.4' do
+    it "capitalizes all Unicode characters" do
+      "äöü".to_sym.upcase.should == :"ÄÖÜ"
+      "aou".to_sym.upcase.should == :"AOU"
+    end
+  end
+
   it "leaves non-alphabetic ASCII characters as they were" do
     "Glark?!?".to_sym.upcase.should == :"GLARK?!?"
   end