1 files changed, 41 insertions, 27 deletions

diff --git a/activerecord/test/cases/json_shared_test_cases.rb b/activerecord/test/cases/json_shared_test_cases.rb
index ef5ca86874..5aa41b9d6d 100644
--- a/activerecord/test/cases/json_shared_test_cases.rb
+++ b/activerecord/test/cases/json_shared_test_cases.rb
@@ -9,12 +9,21 @@ module JSONSharedTestCases
     store_accessor :settings, :resolution
   end
 
+  def setup
+    @connection = ActiveRecord::Base.connection
+  end
+
+  def teardown
+    @connection.drop_table :json_data_type, if_exists: true
+    klass.reset_column_information
+  end
+
   def test_column
-    column = JsonDataType.columns_hash["payload"]
+    column = klass.columns_hash["payload"]
     assert_equal column_type, column.type
     assert_equal column_type.to_s, column.sql_type
 
-    type = JsonDataType.type_for_attribute("payload")
+    type = klass.type_for_attribute("payload")
     assert_not type.binary?
   end
 
@@ -22,8 +31,8 @@ module JSONSharedTestCases
     @connection.change_table("json_data_type") do |t|
       t.public_send column_type, "users"
     end
-    JsonDataType.reset_column_information
-    column = JsonDataType.columns_hash["users"]
+    klass.reset_column_information
+    column = klass.columns_hash["users"]
     assert_equal column_type, column.type
     assert_equal column_type.to_s, column.sql_type
   end
@@ -34,7 +43,7 @@ module JSONSharedTestCases
   end
 
   def test_cast_value_on_write
-    x = JsonDataType.new(payload: { "string" => "foo", :symbol => :bar })
+    x = klass.new(payload: { "string" => "foo", :symbol => :bar })
     assert_equal({ "string" => "foo", :symbol => :bar }, x.payload_before_type_cast)
     assert_equal({ "string" => "foo", "symbol" => "bar" }, x.payload)
     x.save!
@@ -42,7 +51,7 @@ module JSONSharedTestCases
   end
 
   def test_type_cast_json
-    type = JsonDataType.type_for_attribute("payload")
+    type = klass.type_for_attribute("payload")
 
     data = '{"a_key":"a_value"}'
     hash = type.deserialize(data)
@@ -56,75 +65,75 @@ module JSONSharedTestCases
 
   def test_rewrite
     @connection.execute(%q|insert into json_data_type (payload) VALUES ('{"k":"v"}')|)
-    x = JsonDataType.first
+    x = klass.first
     x.payload = { '"a\'' => "b" }
     assert x.save!
   end
 
   def test_select
     @connection.execute(%q|insert into json_data_type (payload) VALUES ('{"k":"v"}')|)
-    x = JsonDataType.first
+    x = klass.first
     assert_equal({ "k" => "v" }, x.payload)
   end
 
   def test_select_multikey
     @connection.execute(%q|insert into json_data_type (payload) VALUES ('{"k1":"v1", "k2":"v2", "k3":[1,2,3]}')|)
-    x = JsonDataType.first
+    x = klass.first
     assert_equal({ "k1" => "v1", "k2" => "v2", "k3" => [1, 2, 3] }, x.payload)
   end
 
   def test_null_json
     @connection.execute("insert into json_data_type (payload) VALUES(null)")
-    x = JsonDataType.first
+    x = klass.first
     assert_nil(x.payload)
   end
 
   def test_select_nil_json_after_create
-    json = JsonDataType.create!(payload: nil)
-    x = JsonDataType.where(payload: nil).first
+    json = klass.create!(payload: nil)
+    x = klass.where(payload: nil).first
     assert_equal(json, x)
   end
 
   def test_select_nil_json_after_update
-    json = JsonDataType.create!(payload: "foo")
-    x = JsonDataType.where(payload: nil).first
+    json = klass.create!(payload: "foo")
+    x = klass.where(payload: nil).first
     assert_nil(x)
 
     json.update_attributes(payload: nil)
-    x = JsonDataType.where(payload: nil).first
+    x = klass.where(payload: nil).first
     assert_equal(json.reload, x)
   end
 
   def test_select_array_json_value
     @connection.execute(%q|insert into json_data_type (payload) VALUES ('["v0",{"k1":"v1"}]')|)
-    x = JsonDataType.first
+    x = klass.first
     assert_equal(["v0", { "k1" => "v1" }], x.payload)
   end
 
   def test_rewrite_array_json_value
     @connection.execute(%q|insert into json_data_type (payload) VALUES ('["v0",{"k1":"v1"}]')|)
-    x = JsonDataType.first
+    x = klass.first
     x.payload = ["v1", { "k2" => "v2" }, "v3"]
     assert x.save!
   end
 
   def test_with_store_accessors
-    x = JsonDataType.new(resolution: "320×480")
+    x = klass.new(resolution: "320×480")
     assert_equal "320×480", x.resolution
 
     x.save!
-    x = JsonDataType.first
+    x = klass.first
     assert_equal "320×480", x.resolution
 
     x.resolution = "640×1136"
     x.save!
 
-    x = JsonDataType.first
+    x = klass.first
     assert_equal "640×1136", x.resolution
   end
 
   def test_duplication_with_store_accessors
-    x = JsonDataType.new(resolution: "320×480")
+    x = klass.new(resolution: "320×480")
     assert_equal "320×480", x.resolution
 
     y = x.dup
@@ -132,7 +141,7 @@ module JSONSharedTestCases
   end
 
   def test_yaml_round_trip_with_store_accessors
-    x = JsonDataType.new(resolution: "320×480")
+    x = klass.new(resolution: "320×480")
     assert_equal "320×480", x.resolution
 
     y = YAML.load(YAML.dump(x))
@@ -140,7 +149,7 @@ module JSONSharedTestCases
   end
 
   def test_changes_in_place
-    json = JsonDataType.new
+    json = klass.new
     assert_not json.changed?
 
     json.payload = { "one" => "two" }
@@ -162,7 +171,7 @@ module JSONSharedTestCases
 
   def test_changes_in_place_with_ruby_object
     time = Time.now.utc
-    json = JsonDataType.create!(payload: time)
+    json = klass.create!(payload: time)
 
     json.reload
     assert_not json.changed?
@@ -172,17 +181,22 @@ module JSONSharedTestCases
   end
 
   def test_assigning_string_literal
-    json = JsonDataType.create!(payload: "foo")
+    json = klass.create!(payload: "foo")
     assert_equal "foo", json.payload
   end
 
   def test_assigning_number
-    json = JsonDataType.create!(payload: 1.234)
+    json = klass.create!(payload: 1.234)
     assert_equal 1.234, json.payload
   end
 
   def test_assigning_boolean
-    json = JsonDataType.create!(payload: true)
+    json = klass.create!(payload: true)
     assert_equal true, json.payload
   end
+
+  private
+    def klass
+      JsonDataType
+    end
 end