Fix tests for latest mruby

Author: Asmod4n

Rakefile

@@ -1,7 +1,7 @@
 MRUBY_CONFIG=File.expand_path(ENV["MRUBY_CONFIG"] || "build_config.rb")
 
 file :mruby do
-  sh "git clone --depth=1 git://github.com/mruby/mruby.git"
+  sh "git clone --depth=1 https://github.com/mruby/mruby.git"
 end
 
 desc "compile binary"

build_config.rb.lock

@@ -1,12 +1,5 @@
 ---
 mruby:
-  version: 3.0.0
-  release_no: 30000
-  git_commit: 01a21085f6348b1f1b070f2c64a6ed71b6d5afce
-builds:
-  host:
-    https://github.com/iij/mruby-errno.git:
-      url: https://github.com/iij/mruby-errno.git
-      branch: HEAD
-      commit: b4415207ff6ea62360619c89a1cff83259dc4db0
-      version: 0.0.0
+  version: 3.3.0
+  release_no: 30300
+  git_commit: a8694bdefb62e5a4183d5b34637591879ef5e0f2

src/mrb_msgpack.c

@@ -617,7 +617,6 @@ mrb_msgpack_unpack(mrb_state *mrb, mrb_value data)
     mrb_msgpack_unpack_m_cb_data cb_data = {data, RSTRING_PTR(data), RSTRING_LEN(data), mrb_nil_value(), &result};
     mrb_value cb_data_cptr = mrb_cptr_value(mrb, &cb_data);
     mrb_value unpack_return = mrb_ensure(mrb, mrb_msgpack_unpack_m_cb, cb_data_cptr, mrb_msgpack_unpack_m_ensure, cb_data_cptr);
-    mrb_gc_protect(mrb, unpack_return);
     return unpack_return;
 }
 

test/msgpack.c

@@ -21,4 +21,6 @@ mrb_mruby_simplemsgpack_gem_test(mrb_state *mrb)
   struct RClass *msgpack_test = mrb_define_module(mrb, "MessagePackTest");
   mrb_define_module_function(mrb, msgpack_test, "test_pack", mrb_msgpack_test_pack, MRB_ARGS_NONE());
   mrb_define_module_function(mrb, msgpack_test, "test_unpack", mrb_msgpack_test_unpack, MRB_ARGS_REQ(1));
+  mrb_define_const(mrb, msgpack_test, "FIXNUM_MAX", mrb_int_value(mrb, MRB_INT_MAX));
+  mrb_define_const(mrb, msgpack_test, "FIXNUM_MIN", mrb_int_value(mrb, MRB_INT_MIN));
 }

test/msgpack.rb

@@ -14,28 +14,18 @@
 end
 
 assert("Integer#to_msgpack") do
-  [Mrbtest::FIXNUM_MIN, -1, 0, 1, Mrbtest::FIXNUM_MAX].each do |int|
-    expected = int
-
-    actual = MessagePack.unpack(int.to_msgpack)
-    assert_true actual.equal?(expected), "Expected identity", assertion_diff(expected, actual)
-
-    actual = MessagePack.unpack(MessagePack.pack(int))
-    assert_true actual.equal?(expected), "Expected identity", assertion_diff(expected, actual)
+  [MessagePackTest::FIXNUM_MIN, -1, 0, 1, MessagePackTest::FIXNUM_MAX].each do |int|
+    assert_equal(int, MessagePack.unpack(int.to_msgpack))
+    assert_equal(int, MessagePack.unpack(MessagePack.pack(int)))
   end
 end
 
 if Object.const_defined? "Float"
   assert("Float#to_msgpack") do
     floats = [2.2250738585072014e-308, -1.7976931348623157e+308, 1.192092896e-07, 3.402823466e+38, 1.175494351e-38, 1.7976931348623157e+308, -2.2250738585072014e-308]
     floats.each do |float|
-      expected = float
-
-      actual = MessagePack.unpack(float.to_msgpack)
-      assert_true actual.equal?(expected), "Expected identity", assertion_diff(expected, actual)
-
-      actual = MessagePack.unpack(MessagePack.pack(float))
-      assert_true actual.equal?(expected), "Expected identity", assertion_diff(expected, actual)
+      assert_equal(float, MessagePack.unpack(float.to_msgpack))
+      assert_equal(float, MessagePack.unpack(MessagePack.pack(float)))
     end
   end
 end
@@ -208,4 +198,3 @@ class Cls; include Mod end
 assert("C Packing and unpacking") do
   assert_equal("hallo", MessagePackTest.test_unpack(MessagePackTest.test_pack))
 end
-