From 1f6f832c005e7385cf0202ca00b9b82a5bec1548 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Sat, 16 Jul 2016 21:07:25 +0100
Subject: [PATCH] test_dependency_collector: port to generic layer.

---
 .../test/test_dependency_collector.rb         | 10 ---------
 .../test/test_os_mac_dependency_collector.rb  | 22 +++++++++++++++++++
 2 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 Library/Homebrew/test/test_os_mac_dependency_collector.rb

diff --git a/Library/Homebrew/test/test_dependency_collector.rb b/Library/Homebrew/test/test_dependency_collector.rb
index 4e02fbdca0..a784a10bcb 100644
--- a/Library/Homebrew/test/test_dependency_collector.rb
+++ b/Library/Homebrew/test/test_dependency_collector.rb
@@ -76,16 +76,6 @@ class DependencyCollectorTests < Homebrew::TestCase
     assert_predicate dep, :optional?
   end
 
-  def test_ld64_dep_pre_leopard
-    MacOS.stubs(:version).returns(MacOS::Version.new("10.4"))
-    assert_equal LD64Dependency.new, @d.build(:ld64)
-  end
-
-  def test_ld64_dep_leopard_or_newer
-    MacOS.stubs(:version).returns(MacOS::Version.new("10.5"))
-    assert_nil @d.build(:ld64)
-  end
-
   def test_raises_typeerror_for_unknown_classes
     assert_raises(TypeError) { @d.add(Class.new) }
   end
diff --git a/Library/Homebrew/test/test_os_mac_dependency_collector.rb b/Library/Homebrew/test/test_os_mac_dependency_collector.rb
new file mode 100644
index 0000000000..37b6191015
--- /dev/null
+++ b/Library/Homebrew/test/test_os_mac_dependency_collector.rb
@@ -0,0 +1,22 @@
+require "testing_env"
+require "dependency_collector"
+
+class OSMacDependencyCollectorTests < Homebrew::TestCase
+  def setup
+    @d = DependencyCollector.new
+  end
+
+  def teardown
+    DependencyCollector.clear_cache
+  end
+
+  def test_ld64_dep_pre_leopard
+    MacOS.stubs(:version).returns(MacOS::Version.new("10.4"))
+    assert_equal LD64Dependency.new, @d.build(:ld64)
+  end
+
+  def test_ld64_dep_leopard_or_newer
+    MacOS.stubs(:version).returns(MacOS::Version.new("10.5"))
+    assert_nil @d.build(:ld64)
+  end
+end