4 files changed, 19 insertions, 96 deletions
diff --git a/activesupport/test/core_ext/load_error_test.rb b/activesupport/test/core_ext/load_error_test.rb
index 5f804c749b..b2a75a2bcc 100644
--- a/activesupport/test/core_ext/load_error_test.rb
+++ b/activesupport/test/core_ext/load_error_test.rb
@@ -1,26 +1,11 @@
 require 'abstract_unit'
 require 'active_support/core_ext/load_error'
 
-class TestMissingSourceFile < ActiveSupport::TestCase
-  def test_with_require
-    assert_raise(MissingSourceFile) { require 'no_this_file_don\'t_exist' }
-  end
-  def test_with_load
-    assert_raise(MissingSourceFile) { load 'nor_does_this_one' }
-  end
-  def test_path
-    begin load 'nor/this/one.rb'
-    rescue MissingSourceFile => e
-      assert_equal 'nor/this/one.rb', e.path
-    end
-  end
 
-  def test_is_missing
-    begin load 'nor_does_this_one'
-    rescue MissingSourceFile => e
-      assert e.is_missing?('nor_does_this_one')
-      assert e.is_missing?('nor_does_this_one.rb')
-      assert_not e.is_missing?('some_other_file')
+class TestMissingSourceFile < ActiveSupport::TestCase
+  def test_it_is_deprecated
+    assert_deprecated do
+      MissingSourceFile.new
     end
   end
 end
diff --git a/activesupport/test/core_ext/thread_test.rb b/activesupport/test/core_ext/thread_test.rb
deleted file mode 100644
index 6a7c6e0604..0000000000
--- a/activesupport/test/core_ext/thread_test.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-require 'abstract_unit'
-require 'active_support/core_ext/thread'
-
-class ThreadExt < ActiveSupport::TestCase
-  def test_main_thread_variable_in_enumerator
-    assert_equal Thread.main, Thread.current
-
-    Thread.current.thread_variable_set :foo, "bar"
-
-    thread, value = Fiber.new {
-      Fiber.yield [Thread.current, Thread.current.thread_variable_get(:foo)]
-    }.resume
-
-    assert_equal Thread.current, thread
-    assert_equal Thread.current.thread_variable_get(:foo), value
-  end
-
-  def test_thread_variable_in_enumerator
-    Thread.new {
-      Thread.current.thread_variable_set :foo, "bar"
-
-      thread, value = Fiber.new {
-        Fiber.yield [Thread.current, Thread.current.thread_variable_get(:foo)]
-      }.resume
-
-      assert_equal Thread.current, thread
-      assert_equal Thread.current.thread_variable_get(:foo), value
-    }.join
-  end
-
-  def test_thread_variables
-    assert_equal [], Thread.new { Thread.current.thread_variables }.join.value
-
-    t = Thread.new {
-      Thread.current.thread_variable_set(:foo, "bar")
-      Thread.current.thread_variables
-    }
-    assert_equal [:foo], t.join.value
-  end
-
-  def test_thread_variable?
-    assert_not Thread.new { Thread.current.thread_variable?("foo") }.join.value
-    t = Thread.new {
-      Thread.current.thread_variable_set("foo", "bar")
-    }.join
-
-    assert t.thread_variable?("foo")
-    assert t.thread_variable?(:foo)
-    assert_not t.thread_variable?(:bar)
-  end
-
-  def test_thread_variable_strings_and_symbols_are_the_same_key
-    t = Thread.new {}.join
-    t.thread_variable_set("foo", "bar")
-    assert_equal "bar", t.thread_variable_get(:foo)
-  end
-
-  def test_thread_variable_frozen
-    t = Thread.new { }.join
-    t.freeze
-    assert_raises(RuntimeError) do
-      t.thread_variable_set(:foo, "bar")
-    end
-  end
-
-  def test_thread_variable_frozen_after_set
-    t = Thread.new { }.join
-    t.thread_variable_set :foo, "bar"
-    t.freeze
-    assert_raises(RuntimeError) do
-      t.thread_variable_set(:baz, "qux")
-    end
-  end
-
-end
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index 96e9bd1e65..d780acf5f9 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -72,7 +72,7 @@ class DependenciesTest < ActiveSupport::TestCase
   end
 
   def test_missing_dependency_raises_missing_source_file
-    assert_raise(MissingSourceFile) { require_dependency("missing_service") }
+    assert_raise(LoadError) { require_dependency("missing_service") }
   end
 
   def test_dependency_which_raises_exception_isnt_added_to_loaded_set
@@ -613,7 +613,7 @@ class DependenciesTest < ActiveSupport::TestCase
 
   def test_nested_load_error_isnt_rescued
     with_loading 'dependencies' do
-      assert_raise(MissingSourceFile) do
+      assert_raise(LoadError) do
         RequiresNonexistent1
       end
     end
diff --git a/activesupport/test/tagged_logging_test.rb b/activesupport/test/tagged_logging_test.rb
index 27f629474e..03a63e94e8 100644
--- a/activesupport/test/tagged_logging_test.rb
+++ b/activesupport/test/tagged_logging_test.rb
@@ -79,6 +79,19 @@ class TaggedLoggingTest < ActiveSupport::TestCase
     assert_equal "[OMG] Cool story bro\n[BCX] Funky time\n", @output.string
   end
 
+  test "keeps each tag in their own instance" do
+    @other_output = StringIO.new
+    @other_logger = ActiveSupport::TaggedLogging.new(MyLogger.new(@other_output))
+    @logger.tagged("OMG") do
+      @other_logger.tagged("BCX") do
+        @logger.info "Cool story bro"
+        @other_logger.info "Funky time"
+      end
+    end
+    assert_equal "[OMG] Cool story bro\n", @output.string
+    assert_equal "[BCX] Funky time\n", @other_output.string
+  end
+
   test "cleans up the taggings on flush" do
     @logger.tagged("BCX") do
       Thread.new do