Decouple bottle tags from MacOS.cat

2 files changed, 44 insertions, 34 deletions

diff --git a/Library/Homebrew/test/test_bottle_tag.rb b/Library/Homebrew/test/test_bottle_tag.rb
new file mode 100644
index 000000000..50028c164
--- /dev/null
+++ b/Library/Homebrew/test/test_bottle_tag.rb
@@ -0,0 +1,44 @@
+require 'testing_env'
+require 'bottles'
+
+class BottleTagTests < Test::Unit::TestCase
+  def test_cat_tiger_ppc
+    MacOS.stubs(:version).returns(MacOS::Version.new(10.4))
+    Hardware::CPU.stubs(:type).returns(:ppc)
+    Hardware::CPU.stubs(:family).returns(:foo)
+    assert_equal :foo, bottle_tag
+  end
+
+  def test_cat_tiger_intel
+    MacOS.stubs(:version).returns(MacOS::Version.new(10.4))
+    Hardware::CPU.stubs(:type).returns(:intel)
+    assert_equal :tiger, bottle_tag
+  end
+
+  def test_cat_leopard
+    MacOS.stubs(:version).returns(MacOS::Version.new(10.5))
+    assert_equal :leopard, bottle_tag
+  end
+
+  def test_cat_snow_leopard_32
+    MacOS.stubs(:version).returns(MacOS::Version.new(10.6))
+    Hardware.stubs(:is_64_bit?).returns(false)
+    assert_equal :snow_leopard_32, bottle_tag
+  end
+
+  def test_cat_snow_leopard_64
+    MacOS.stubs(:version).returns(MacOS::Version.new(10.6))
+    Hardware.stubs(:is_64_bit?).returns(true)
+    assert_equal :snow_leopard, bottle_tag
+  end
+
+  def test_cat_lion
+    MacOS.stubs(:version).returns(MacOS::Version.new(10.7))
+    assert_equal :lion, bottle_tag
+  end
+
+  def test_cat_mountain_lion
+    MacOS.stubs(:version).returns(MacOS::Version.new(10.8))
+    assert_equal :mountain_lion, bottle_tag
+  end
+end
diff --git a/Library/Homebrew/test/test_version_subclasses.rb b/Library/Homebrew/test/test_version_subclasses.rb
index a855f9df5..6b18246ba 100644
--- a/Library/Homebrew/test/test_version_subclasses.rb
+++ b/Library/Homebrew/test/test_version_subclasses.rb
@@ -39,38 +39,4 @@ class MacOSVersionTests < Test::Unit::TestCase
     assert_operator @v, :===, Version.new(10.7)
     assert_operator @v, :<, Version.new(10.8)
   end
-
-  def test_cat_tiger
-    MacOS.stubs(:version).returns(MacOS::Version.new(10.4))
-    Hardware::CPU.stubs(:type).returns(:ppc)
-    Hardware::CPU.stubs(:family).returns(:foo)
-    assert_equal :foo, MacOS.uncached_cat
-  end
-
-  def test_cat_leopard
-    MacOS.stubs(:version).returns(MacOS::Version.new(10.5))
-    assert_equal :leopard, MacOS.uncached_cat
-  end
-
-  def test_cat_snow_leopard_32
-    MacOS.stubs(:version).returns(MacOS::Version.new(10.6))
-    Hardware.stubs(:is_64_bit?).returns(false)
-    assert_equal :snow_leopard_32, MacOS.uncached_cat
-  end
-
-  def test_cat_snow_leopard_64
-    MacOS.stubs(:version).returns(MacOS::Version.new(10.6))
-    Hardware.stubs(:is_64_bit?).returns(true)
-    assert_equal :snow_leopard, MacOS.uncached_cat
-  end
-
-  def test_cat_lion
-    MacOS.stubs(:version).returns(MacOS::Version.new(10.7))
-    assert_equal :lion, MacOS.uncached_cat
-  end
-
-  def test_cat_mountain_lion
-    MacOS.stubs(:version).returns(MacOS::Version.new(10.8))
-    assert_equal :mountain_lion, MacOS.uncached_cat
-  end
 end