Merge remote-tracking branch 'upstream/pull/4671'

[rails.git] / test / lib / utf8_test.rb

diff --git a/test/lib/utf8_test.rb b/test/lib/utf8_test.rb
index 5762a83eb24acf7081fd84148c94a0aa2a002c57..0eac9253db7db8bfab941a5d4144874d18098b9f 100644 (file)
--- a/test/lib/utf8_test.rb
+++ b/test/lib/utf8_test.rb
@@ -1,18 +1,17 @@
-# -*- coding: utf-8 -*-

 require "test_helper"
 
 class UTF8Test < ActiveSupport::TestCase
   def test_valid?
 require "test_helper"
 
 class UTF8Test < ActiveSupport::TestCase
   def test_valid?

-    assert_equal true, UTF8.valid?("test")
-    assert_equal true, UTF8.valid?("vergrößern")
-    assert_equal true, UTF8.valid?("ルシステムにも対応します")
-    assert_equal true, UTF8.valid?("輕觸搖晃的遊戲")
+    assert UTF8.valid?("test")
+    assert UTF8.valid?("vergrößern")
+    assert UTF8.valid?("ルシステムにも対応します")
+    assert UTF8.valid?("輕觸搖晃的遊戲")

 
 

-    assert_equal false, UTF8.valid?("\xC0")         # always invalid utf8
-    assert_equal false, UTF8.valid?("\xC2\x4a")     # 2-byte multibyte identifier, followed by plain ASCII
-    assert_equal false, UTF8.valid?("\xC2\xC2")     # 2-byte multibyte identifier, followed by another one
-    assert_equal false, UTF8.valid?("\x4a\x82")     # plain ASCII, followed by multibyte continuation
-    assert_equal false, UTF8.valid?("\x82\x82")     # multibyte continuations without multibyte identifier
-    assert_equal false, UTF8.valid?("\xe1\x82\x4a") # three-byte identifier, contination and (incorrectly) plain ASCII
+    assert_not UTF8.valid?("\xC0")         # always invalid utf8
+    assert_not UTF8.valid?("\xC2\x4a")     # 2-byte multibyte identifier, followed by plain ASCII
+    assert_not UTF8.valid?("\xC2\xC2")     # 2-byte multibyte identifier, followed by another one
+    assert_not UTF8.valid?("\x4a\x82")     # plain ASCII, followed by multibyte continuation
+    assert_not UTF8.valid?("\x82\x82")     # multibyte continuations without multibyte identifier
+    assert_not UTF8.valid?("\xe1\x82\x4a") # three-byte identifier, continuation and (incorrectly) plain ASCII

   end
 end
   end
 end