8 files changed, 28 insertions, 29 deletions
diff --git a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
index ddfe42b375..0eb1cc511e 100644
--- a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
@@ -49,13 +49,11 @@ module ActiveRecord
       end
 
       def test_tables_quoting
-        begin
-          @conn.tables(nil, "foo-bar", nil)
-          flunk
-        rescue => e
-          # assertion for *quoted* database properly
-          assert_match(/database 'foo-bar'/, e.inspect)
-        end
+        @conn.tables(nil, "foo-bar", nil)
+        flunk
+      rescue => e
+        # assertion for *quoted* database properly
+        assert_match(/database 'foo-bar'/, e.inspect)
       end
 
       def test_pk_and_sequence_for
diff --git a/activerecord/test/cases/adapters/mysql2/schema_test.rb b/activerecord/test/cases/adapters/mysql2/schema_test.rb
index 2c0ed73c92..94429e772f 100644
--- a/activerecord/test/cases/adapters/mysql2/schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/schema_test.rb
@@ -37,13 +37,11 @@ module ActiveRecord
       end
 
       def test_tables_quoting
-        begin
-          @connection.tables(nil, "foo-bar", nil)
-          flunk
-        rescue => e
-          # assertion for *quoted* database properly
-          assert_match(/database 'foo-bar'/, e.inspect)
-        end
+        @connection.tables(nil, "foo-bar", nil)
+        flunk
+      rescue => e
+        # assertion for *quoted* database properly
+        assert_match(/database 'foo-bar'/, e.inspect)
       end
 
     end
diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb
index b2eac0349b..aa5b27623e 100644
--- a/activerecord/test/cases/ar_schema_test.rb
+++ b/activerecord/test/cases/ar_schema_test.rb
@@ -7,6 +7,7 @@ if ActiveRecord::Base.connection.supports_migrations?
 
     def setup
       @connection = ActiveRecord::Base.connection
+      ActiveRecord::SchemaMigration.drop_table
     end
 
     def teardown
@@ -45,5 +46,4 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_nothing_raised { @connection.select_all "SELECT * FROM fruits" }
     end
   end
-
 end
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 5cf597b9f2..4f46459ab3 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -300,13 +300,11 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_initialize_with_invalid_attribute
-    begin
-      Topic.new({ "title" => "test",
-        "last_read(1i)" => "2005", "last_read(2i)" => "2", "last_read(3i)" => "31"})
-    rescue ActiveRecord::MultiparameterAssignmentErrors => ex
-      assert_equal(1, ex.errors.size)
-      assert_equal("last_read", ex.errors[0].attribute)
-    end
+    Topic.new({ "title" => "test",
+      "last_read(1i)" => "2005", "last_read(2i)" => "2", "last_read(3i)" => "31"})
+  rescue ActiveRecord::MultiparameterAssignmentErrors => ex
+    assert_equal(1, ex.errors.size)
+    assert_equal("last_read", ex.errors[0].attribute)
   end
 
   def test_create_after_initialize_without_block
diff --git a/activerecord/test/cases/column_test.rb b/activerecord/test/cases/column_test.rb
index dc1b30261c..adbe51f430 100644
--- a/activerecord/test/cases/column_test.rb
+++ b/activerecord/test/cases/column_test.rb
@@ -57,6 +57,12 @@ module ActiveRecord
         assert_nil column.type_cast(Object.new)
       end
 
+      def test_type_cast_nan_and_infinity_to_integer
+        column = Column.new("field", nil, "integer")
+        assert_nil column.type_cast(Float::NAN)
+        assert_nil column.type_cast(1.0/0.0)
+      end
+
       def test_type_cast_time
         column = Column.new("field", nil, "time")
         assert_equal nil, column.type_cast('')
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 9cb64a6a71..187c6e8447 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -24,7 +24,7 @@ class MigrationTest < ActiveRecord::TestCase
 
   def setup
     super
-    %w(reminders people_reminders prefix_reminders_suffix).each do |table|
+    %w(reminders people_reminders prefix_reminders_suffix p_things_s).each do |table|
       Reminder.connection.drop_table(table) rescue nil
     end
     Reminder.reset_column_information
diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb
index 9574678e38..94837341fc 100644
--- a/activerecord/test/cases/nested_attributes_test.rb
+++ b/activerecord/test/cases/nested_attributes_test.rb
@@ -311,7 +311,7 @@ class TestNestedAttributesOnAHasOneAssociation < ActiveRecord::TestCase
   end
 
   def test_should_also_work_with_a_HashWithIndifferentAccess
-    @pirate.ship_attributes = HashWithIndifferentAccess.new(:id => @ship.id, :name => 'Davy Jones Gold Dagger')
+    @pirate.ship_attributes = ActiveSupport::HashWithIndifferentAccess.new(:id => @ship.id, :name => 'Davy Jones Gold Dagger')
 
     assert @pirate.ship.persisted?
     assert_equal 'Davy Jones Gold Dagger', @pirate.ship.name
@@ -593,7 +593,7 @@ module NestedAttributesOnACollectionAssociationTests
   end
 
   def test_should_also_work_with_a_HashWithIndifferentAccess
-    @pirate.send(association_setter, HashWithIndifferentAccess.new('foo' => HashWithIndifferentAccess.new(:id => @child_1.id, :name => 'Grace OMalley')))
+    @pirate.send(association_setter, ActiveSupport::HashWithIndifferentAccess.new('foo' => ActiveSupport::HashWithIndifferentAccess.new(:id => @child_1.id, :name => 'Grace OMalley')))
     @pirate.save
     assert_equal 'Grace OMalley', @child_1.reload.name
   end
diff --git a/activerecord/test/cases/store_test.rb b/activerecord/test/cases/store_test.rb
index 562ca8d9ff..43bf285ba9 100644
--- a/activerecord/test/cases/store_test.rb
+++ b/activerecord/test/cases/store_test.rb
@@ -67,9 +67,9 @@ class StoreTest < ActiveRecord::TestCase
   end
 
   test "preserve store attributes data in HashWithIndifferentAccess format without any conversion" do
-    @john.json_data = HashWithIndifferentAccess.new(:height => 'tall', 'weight' => 'heavy')
+    @john.json_data = ActiveSupport::HashWithIndifferentAccess.new(:height => 'tall', 'weight' => 'heavy')
     @john.height = 'low'
-    assert_equal true, @john.json_data.instance_of?(HashWithIndifferentAccess)
+    assert_equal true, @john.json_data.instance_of?(ActiveSupport::HashWithIndifferentAccess)
     assert_equal 'low', @john.json_data[:height]
     assert_equal 'low', @john.json_data['height']
     assert_equal 'heavy', @john.json_data[:weight]
@@ -95,7 +95,7 @@ class StoreTest < ActiveRecord::TestCase
   test "convert store attributes from any format other than Hash or HashWithIndifferent access losing the data" do
     @john.json_data = "somedata"
     @john.height = 'low'
-    assert_equal true, @john.json_data.instance_of?(HashWithIndifferentAccess)
+    assert_equal true, @john.json_data.instance_of?(ActiveSupport::HashWithIndifferentAccess)
     assert_equal 'low', @john.json_data[:height]
     assert_equal 'low', @john.json_data['height']
     assert_equal false, @john.json_data.delete_if { |k, v| k == 'height' }.any?
@@ -143,5 +143,4 @@ class StoreTest < ActiveRecord::TestCase
     assert_raise(NoMethodError) { @john.stored_attributes = Hash.new }
     assert_raise(NoMethodError) { @john.stored_attributes }
   end
-
 end