Cleanup encoding tests

Author: byroot

test/helper.rb

@@ -61,17 +61,6 @@ def silent
     end
   end
 
-  def with_external_encoding(encoding)
-    original_encoding = Encoding.default_external
-
-    begin
-      silent { Encoding.default_external = Encoding.find(encoding) }
-      yield
-    ensure
-      silent { Encoding.default_external = original_encoding }
-    end
-  end
-
   class Version
     include Comparable
 

test/lint/strings.rb

@@ -27,13 +27,11 @@ def test_set_and_get_with_non_string_value
     end
 
     def test_set_and_get_with_ascii_characters
-      with_external_encoding("ASCII-8BIT") do
-        (0..255).each do |i|
-          str = "#{i.chr}---#{i.chr}"
-          r.set("foo", str)
+      (0..255).each do |i|
+        str = "#{i.chr}---#{i.chr}"
+        r.set("foo", str)
 
-          assert_equal str, r.get("foo")
-        end
+        assert_equal str, r.get("foo")
       end
     end
 
@@ -363,23 +361,21 @@ def test_msetnx_mapped
     end
 
     def test_bitop
-      with_external_encoding('UTF-8') do
-        r.set('foo{1}', 'a')
-        r.set('bar{1}', 'b')
-
-        r.bitop(:and, 'foo&bar{1}', 'foo{1}', 'bar{1}')
-        assert_equal "\x60", r.get('foo&bar{1}')
-
-        r.bitop(:and, 'foo&bar{1}', ['foo{1}', 'bar{1}'])
-        assert_equal "\x60", r.get('foo&bar{1}')
-
-        r.bitop(:or, 'foo|bar{1}', 'foo{1}', 'bar{1}')
-        assert_equal "\x63", r.get('foo|bar{1}')
-        r.bitop(:xor, 'foo^bar{1}', 'foo{1}', 'bar{1}')
-        assert_equal "\x03", r.get('foo^bar{1}')
-        r.bitop(:not, '~foo{1}', 'foo{1}')
-        assert_equal "\x9E".b, r.get('~foo{1}')
-      end
+      r.set('foo{1}', 'a')
+      r.set('bar{1}', 'b')
+
+      r.bitop(:and, 'foo&bar{1}', 'foo{1}', 'bar{1}')
+      assert_equal "\x60", r.get('foo&bar{1}')
+
+      r.bitop(:and, 'foo&bar{1}', ['foo{1}', 'bar{1}'])
+      assert_equal "\x60", r.get('foo&bar{1}')
+
+      r.bitop(:or, 'foo|bar{1}', 'foo{1}', 'bar{1}')
+      assert_equal "\x63", r.get('foo|bar{1}')
+      r.bitop(:xor, 'foo^bar{1}', 'foo{1}', 'bar{1}')
+      assert_equal "\x03", r.get('foo^bar{1}')
+      r.bitop(:not, '~foo{1}', 'foo{1}')
+      assert_equal "\x9E".b, r.get('~foo{1}')
     end
   end
 end

test/redis/encoding_test.rb

@@ -6,10 +6,14 @@ class TestEncoding < Minitest::Test
   include Helper::Client
 
   def test_returns_properly_encoded_strings
-    with_external_encoding("UTF-8") do
-      r.set "foo", "שלום"
+    r.set "foo", "שלום"
 
-      assert_equal "Shalom שלום", "Shalom #{r.get('foo')}"
-    end
+    assert_equal "Shalom שלום", "Shalom #{r.get('foo')}"
+
+    refute_predicate "\xFF", :valid_encoding?
+    r.set("bar", "\xFF")
+    bytes = r.get("bar")
+    assert_equal "\xFF".b, bytes
+    assert_predicate bytes, :valid_encoding?
   end
 end