Improve test methods

gogotanaka · gogotanaka · commit 1d479a261eee · 2014-12-03T09:07:48.000-08:00
diff --git a/test/java_test.rb b/test/java_test.rb
@@ -52,15 +52,15 @@ def test_long
 
   def test_float
     assert_correct_type :float, 1.0
-    assert_correct_type :float, Math::PI, "Math::PI"
+    assert_correct_type :float, Math::PI
     assert_wrong_type :float, 1
     assert_wrong_type :float, "not float"
     assert_wrong_type :float, nil
   end
 
   def test_double
     assert_correct_type :double, 1.0
-    assert_correct_type :double, Math::PI, "Math::PI"
+    assert_correct_type :double, Math::PI
     assert_wrong_type :double, 1
     assert_wrong_type :double, "not double"
     assert_wrong_type :double, nil
@@ -76,7 +76,7 @@ def test_bool
   def test_char
     assert_correct_type :char, 'a'
     assert_correct_type :char, '☃'
-    assert_correct_type :char, '☃', '"\u2603"'
+    assert_correct_type :char, '☃'
     assert_wrong_type :char, 1
     assert_wrong_type :char, "not char"
     assert_wrong_type :char, nil
@@ -88,28 +88,28 @@ def test_user_type
     user_type = new UserType()
     Type.define_new(:UserType, UserType)
 
-    assert_correct_type :UserType, user_type, "ObjectSpace._id2ref(#{user_type.__id__})"
+    assert_correct_type :UserType, user_type
     assert_wrong_type :UserType, 1
     assert_wrong_type :UserType, "not UserType"
     assert_wrong_type :UserType, nil
   end
 
   private
-    def define_test_method(type, val, raw_val = nil)
+    def define_test_method(type, val)
       klass = Class.new.class_eval <<-RUBY_CODE
         public #{type} def call
-          #{raw_val ? raw_val : val.inspect}
+          ObjectSpace._id2ref(#{val.__id__})
         end
       RUBY_CODE
 
       klass.new
     end
 
-    def assert_correct_type(type, val, raw_val = nil)
-      assert_equal val, define_test_method(type, val, raw_val).call
+    def assert_correct_type(type, val)
+      assert_equal val, define_test_method(type, val).call
     end
 
-    def assert_wrong_type(type, val, raw_val = nil)
-      assert_raises(TypeError) { define_test_method(type, val, raw_val).call }
+    def assert_wrong_type(type, val)
+      assert_raises(TypeError) { define_test_method(type, val).call }
     end
 end
