X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dcfe326f6515cc7aeb9c02b7536e69863c60cd01..0a3b052cf617955571fa88b1bba4290cd27d38d6:/test/models/message_test.rb diff --git a/test/models/message_test.rb b/test/models/message_test.rb index 9c321d3c3..d5391c6f8 100644 --- a/test/models/message_test.rb +++ b/test/models/message_test.rb @@ -32,7 +32,7 @@ class MessageTest < ActiveSupport::TestCase end def test_utf8_roundtrip - (1..255).each do |i| + [1, 255].each do |i| assert_message_ok("c", i) assert_message_ok(EURO, i) end @@ -51,7 +51,7 @@ class MessageTest < ActiveSupport::TestCase "\xC2\xC2", # 2-byte multibyte identifier, followed by another one "\x4a\x82", # plain ASCII, followed by multibyte continuation "\x82\x82", # multibyte continuations without multibyte identifier - "\xe1\x82\x4a"] # three-byte identifier, contination and (incorrectly) plain ASCII + "\xe1\x82\x4a"] # three-byte identifier, continuation and (incorrectly) plain ASCII invalid_sequences.each do |char| # create a message and save to the database msg = make_message(char, 1) @@ -63,8 +63,8 @@ class MessageTest < ActiveSupport::TestCase # its OK to accept invalid UTF-8 as long as we return it unmodified. db_msg = msg.class.find(msg.id) assert_equal char, db_msg.title, "Database silently truncated message title" - rescue ArgumentError => ex - assert_equal ex.to_s, "invalid byte sequence in UTF-8" + rescue ArgumentError => e + assert_equal("invalid byte sequence in UTF-8", e.to_s) end end @@ -186,7 +186,7 @@ class MessageTest < ActiveSupport::TestCase def assert_message_ok(char, count) message = make_message(char, count) assert message.save! - response = message.class.find(message.id) # stand by for some über-generalisation... + response = message.class.find(message.id) # stand by for some uber-generalisation... assert_equal char * count, response.title, "message with #{count} #{char} chars (i.e. #{char.length * count} bytes) fails" end end