diff --git a/mrbgems/mruby-bin-debugger/bintest/print.rb b/mrbgems/mruby-bin-debugger/bintest/print.rb index c475cf688..27a20e2f2 100644 --- a/mrbgems/mruby-bin-debugger/bintest/print.rb +++ b/mrbgems/mruby-bin-debugger/bintest/print.rb @@ -434,10 +434,10 @@ SRC tc << {:cmd=>'p {}', :exp=>'$1 = {}'} tc << {:cmd=>'p {"one"=>1,"two"=>2}', :exp=>'$2 = {"one" => 1, "two" => 2}'} - tc << {:cmd=>'p {:eins=>"1", :zwei=>"2",}', :exp=>'$3 = {:eins => "1", :zwei => "2"}'} - tc << {:cmd=>'p {uno:"one", dos: 2}', :exp=>'$4 = {:uno => "one", :dos => 2}'} - tc << {:cmd=>'p {"one"=>1, :zwei=>2, tres:3}', :exp=>'$5 = {"one" => 1, :zwei => 2, :tres => 3}'} - tc << {:cmd=>'p {:foo=>"#{foo}",:bar=>"#{bar}"}', :exp=>'$6 = {:foo => "foo", :bar => "bar"}'} + tc << {:cmd=>'p {eins: "1", zwei: "2",}', :exp=>'$3 = {eins: "1", zwei: "2"}'} + tc << {:cmd=>'p {uno: "one", dos: 2}', :exp=>'$4 = {uno: "one", dos: 2}'} + tc << {:cmd=>'p {"one"=>1, zwei: 2, tres: 3}', :exp=>'$5 = {"one" => 1, zwei: 2, tres: 3}'} + tc << {:cmd=>'p {foo: "#{foo}",bar: "#{bar}"}', :exp=>'$6 = {foo: "foo", bar: "bar"}'} BinTest_MrubyBinDebugger.test(src, tc) end diff --git a/test/t/array.rb b/test/t/array.rb index 240aeb86e..57a6b6b69 100644 --- a/test/t/array.rb +++ b/test/t/array.rb @@ -33,7 +33,7 @@ assert('Array#*', '15.2.12.5.2') do assert_equal([1, 1, 1], [1].*(3)) assert_equal([], [1].*(0)) assert_equal('abc', ['a', 'b', 'c'].*('')) - assert_equal('0, 0, 1, {:foo => 0}', [0, [0, 1], {foo: 0}].*(', ')) + assert_equal('0, 0, 1, {foo: 0}', [0, [0, 1], {foo: 0}].*(', ')) end assert('Array#<<', '15.2.12.5.3') do diff --git a/test/t/hash.rb b/test/t/hash.rb index 17342433e..3f09ceae7 100644 --- a/test/t/hash.rb +++ b/test/t/hash.rb @@ -857,10 +857,10 @@ end assert("Hash##{meth}") do assert_equal('{}', Hash.new.__send__(meth)) - h1 = {:s => 0, :a => [1,2], 37 => :b, :d => "del", "c" => nil} + h1 = {s: 0, a: [1,2], 37 => :b, d: "del", "c" => nil} h1.shift h1.delete(:d) - s1 = ':a => [1, 2], 37 => :b, "c" => nil' + s1 = 'a: [1, 2], 37 => :b, "c" => nil' h2 = Hash.new(100) (1..14).each{h2[_1] = _1 * 2} @@ -874,7 +874,7 @@ end hh = {} hh[:recur] = hh h.each{|k, v| hh[k] = v} - assert_equal("{:recur => {...}, #{s}}", hh.__send__(meth)) + assert_equal("{recur: {...}, #{s}}", hh.__send__(meth)) hh = h.dup hh[hh] = :recur diff --git a/test/t/literals.rb b/test/t/literals.rb index 54bcbc716..03f0cb699 100644 --- a/test/t/literals.rb +++ b/test/t/literals.rb @@ -233,8 +233,8 @@ ZZZ assert_equal " iii\n", i assert_equal [" j1j\n", " j2j\n", " j\#{3}j\n"], j assert_equal 123, k - assert_equal ["x{:x => \"mm3\\n\"}y\nmm1\n", "mm2\n"], m - assert_equal ({:x=>"mm3\n"}), m2 + assert_equal ["x{x: \"mm3\\n\"}y\nmm1\n", "mm2\n"], m + assert_equal ({x: "mm3\n"}), m2 assert_equal [1, "nn1\n", 3, 4], n assert_equal "a $ q\n $ c $ d", q1 assert_equal "l $ mqq\nn $ o", q2 diff --git a/test/t/vformat.rb b/test/t/vformat.rb index dbf0114d3..956870e02 100644 --- a/test/t/vformat.rb +++ b/test/t/vformat.rb @@ -39,7 +39,7 @@ assert('mrb_vformat') do assert_equal 'Class', vf.v('%Y', sclass({})) assert_match '#>', vf.v('%v', sclass("")) assert_equal '`v`: 1...3', vf.v('`v`: %v', 1...3) - assert_equal '`S`: {:a => 1, "b" => "c"}', vf.v('`S`: %S', {a: 1, "b" => ?c}) + assert_equal '`S`: {a: 1, "b" => "c"}', vf.v('`S`: %S', {a: 1, "b" => ?c}) assert_equal 'percent: %', vf.z('percent: %%') assert_equal '"I": inspect char', vf.c('%!c: inspect char', ?I) assert_equal '709: inspect mrb_int', vf.i('%!d: inspect mrb_int', 709)