3 files changed, 30 insertions, 1 deletions
diff --git a/activemodel/test/cases/type/date_test.rb b/activemodel/test/cases/type/date_test.rb
index e8cf178612..2dd1a55616 100644
--- a/activemodel/test/cases/type/date_test.rb
+++ b/activemodel/test/cases/type/date_test.rb
@@ -12,8 +12,22 @@ module ActiveModel
         assert_nil type.cast(" ")
         assert_nil type.cast("ABC")
 
-        date_string = ::Time.now.utc.strftime("%F")
+        now = ::Time.now.utc
+        values_hash = { 1 => now.year, 2 => now.mon, 3 => now.mday }
+        date_string = now.strftime("%F")
         assert_equal date_string, type.cast(date_string).strftime("%F")
+        assert_equal date_string, type.cast(values_hash).strftime("%F")
+      end
+
+      def test_returns_correct_year
+        type = Type::Date.new
+
+        time = ::Time.utc(1, 1, 1)
+        date = ::Date.new(time.year, time.mon, time.mday)
+
+        values_hash_for_multiparameter_assignment = { 1 => 1, 2 => 1, 3 => 1 }
+
+        assert_equal date, type.cast(values_hash_for_multiparameter_assignment)
       end
     end
   end
diff --git a/activemodel/test/cases/type/integer_test.rb b/activemodel/test/cases/type/integer_test.rb
index df12098974..9bd0110099 100644
--- a/activemodel/test/cases/type/integer_test.rb
+++ b/activemodel/test/cases/type/integer_test.rb
@@ -50,6 +50,13 @@ module ActiveModel
         assert_equal 7200, type.cast(2.hours)
       end
 
+      test "casting empty string" do
+        type = Type::Integer.new
+        assert_nil type.cast("")
+        assert_nil type.serialize("")
+        assert_equal 0, type.deserialize("")
+      end
+
       test "changed?" do
         type = Type::Integer.new
 
diff --git a/activemodel/test/cases/type/string_test.rb b/activemodel/test/cases/type/string_test.rb
index 2d85556d20..9cc530e8db 100644
--- a/activemodel/test/cases/type/string_test.rb
+++ b/activemodel/test/cases/type/string_test.rb
@@ -12,6 +12,14 @@ module ActiveModel
         assert_equal "123", type.cast(123)
       end
 
+      test "type casting for database" do
+        type = Type::String.new
+        object, array, hash = Object.new, [true], { a: :b }
+        assert_equal object, type.serialize(object)
+        assert_equal array, type.serialize(array)
+        assert_equal hash, type.serialize(hash)
+      end
+
       test "cast strings are mutable" do
         type = Type::String.new