1 files changed, 27 insertions, 18 deletions
diff --git a/spec/ruby/core/encoding/locale_charmap_spec.rb b/spec/ruby/core/encoding/locale_charmap_spec.rb
index 12b93c2562..0d77bf227b 100644
--- a/spec/ruby/core/encoding/locale_charmap_spec.rb
+++ b/spec/ruby/core/encoding/locale_charmap_spec.rb
@@ -1,46 +1,55 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
-with_feature :encoding do
-  describe "Encoding.locale_charmap" do
-    it "returns a String" do
-      Encoding.locale_charmap.should be_an_instance_of(String)
+describe "Encoding.locale_charmap" do
+  it "returns a String" do
+    Encoding.locale_charmap.should.instance_of?(String)
+  end
+
+  describe "when setting LC_ALL=C" do
+    before :each do
+      @old_lc_all = ENV['LC_ALL']
+    end
+
+    after :each do
+      ENV['LC_ALL'] = @old_lc_all
     end
 
     # FIXME: Get this working on Windows
     platform_is :linux do
-      it "returns a value based on the LC_ALL environment variable" do
-        old_lc_all = ENV['LC_ALL']
-        ENV['LC_ALL'] = 'C'
-        ruby_exe("print Encoding.locale_charmap").should == 'ANSI_X3.4-1968'
-        ENV['LC_ALL'] = old_lc_all
+      platform_is_not :android do
+        it "returns a value based on the LC_ALL environment variable" do
+          ENV['LC_ALL'] = 'C'
+          ruby_exe("print Encoding.locale_charmap").should == 'ANSI_X3.4-1968'
+        end
       end
     end
 
-    platform_is :freebsd, :darwin do
+    platform_is :freebsd, :openbsd, :darwin do
       it "returns a value based on the LC_ALL environment variable" do
-        old_lc_all = ENV['LC_ALL']
         ENV['LC_ALL'] = 'C'
         ruby_exe("print Encoding.locale_charmap").should == 'US-ASCII'
-        ENV['LC_ALL'] = old_lc_all
       end
     end
 
-    platform_is :netbsd, :openbsd do
+    platform_is :netbsd do
       it "returns a value based on the LC_ALL environment variable" do
-        old_lc_all = ENV['LC_ALL']
         ENV['LC_ALL'] = 'C'
         ruby_exe("print Encoding.locale_charmap").should == '646'
-        ENV['LC_ALL'] = old_lc_all
+      end
+    end
+
+    platform_is :android do
+      it "always returns UTF-8" do
+        ENV['LC_ALL'] = 'C'
+        ruby_exe("print Encoding.locale_charmap").should == 'UTF-8'
       end
     end
 
     platform_is :bsd, :darwin, :linux do
       it "is unaffected by assigning to ENV['LC_ALL'] in the same process" do
         old_charmap = Encoding.locale_charmap
-        old_lc_all = ENV['LC_ALL']
         ENV['LC_ALL'] = 'C'
         Encoding.locale_charmap.should == old_charmap
-        ENV['LC_ALL'] = old_lc_all
       end
     end
   end