From 8bfcdf0bd8b17aeb5b9152935cd6cb9c0209c676 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Wed, 5 Mar 2014 20:12:51 -0600
Subject: Remove special X11 proxy deps

---
 Library/Homebrew/test/test_dependency_collector.rb | 10 -----
 Library/Homebrew/test/test_x11_dependency.rb       | 46 ----------------------
 2 files changed, 56 deletions(-)

(limited to 'Library/Homebrew/test')

diff --git a/Library/Homebrew/test/test_dependency_collector.rb b/Library/Homebrew/test/test_dependency_collector.rb
index 0f07ba7e6..c6b34b684 100644
--- a/Library/Homebrew/test/test_dependency_collector.rb
+++ b/Library/Homebrew/test/test_dependency_collector.rb
@@ -101,16 +101,6 @@ class DependencyCollectorTests < Test::Unit::TestCase
     assert_nil @d.build(:libtool)
   end
 
-  def test_x11_proxy_dep_mountain_lion
-    MacOS.stubs(:version).returns(MacOS::Version.new("10.8"))
-    assert_equal Dependency.new("libpng"), @d.build(:libpng)
-  end
-
-  def test_x11_proxy_dep_lion_or_older
-    MacOS.stubs(:version).returns(MacOS::Version.new("10.7"))
-    assert_equal X11Dependency::Proxy.new(:libpng), @d.build(:libpng)
-  end
-
   def test_ld64_dep_pre_leopard
     MacOS.stubs(:version).returns(MacOS::Version.new("10.4"))
     assert_equal LD64Dependency.new, @d.build(:ld64)
diff --git a/Library/Homebrew/test/test_x11_dependency.rb b/Library/Homebrew/test/test_x11_dependency.rb
index 884a7cd27..6c56ac87f 100644
--- a/Library/Homebrew/test/test_x11_dependency.rb
+++ b/Library/Homebrew/test/test_x11_dependency.rb
@@ -19,35 +19,6 @@ class X11DependencyTests < Test::Unit::TestCase
     assert !y.eql?(x)
   end
 
-  def test_proxy_for
-    x = X11Dependency::Proxy.for("libpng")
-    assert_instance_of X11Dependency::Proxy::Libpng, x
-    assert_kind_of X11Dependency, x
-  end
-
-  def test_proxy_eql_instances_are_eql
-    x = X11Dependency::Proxy.for("libpng")
-    y = X11Dependency::Proxy.for("libpng")
-    assert x.eql?(y)
-    assert y.eql?(x)
-    assert x.hash == y.hash
-  end
-
-  def test_proxy_not_eql_when_hashes_differ
-    x = X11Dependency::Proxy.for("libpng")
-    y = X11Dependency::Proxy.for("fontconfig")
-    assert x.hash != y.hash
-    assert !x.eql?(y)
-    assert !y.eql?(x)
-  end
-
-  def test_x_never_eql_to_proxy_x11_dep
-    x = X11Dependency.new("libpng")
-    p = X11Dependency::Proxy.for("libpng")
-    assert !x.eql?(p)
-    assert !p.eql?(x)
-  end
-
   def test_x_env
     x = X11Dependency.new
     x.stubs(:satisfied?).returns(true)
@@ -55,20 +26,3 @@ class X11DependencyTests < Test::Unit::TestCase
     x.modify_build_environment
   end
 end
-
-class X11DepCollectionTests < Test::Unit::TestCase
-  def setup
-    @set = ComparableSet.new
-  end
-
-  def test_x_can_coxist_with_proxy
-    @set << X11Dependency.new << X11Dependency::Proxy.for("libpng")
-    assert_equal 2, @set.count
-  end
-
-  def test_multiple_proxies_can_coexist
-    @set << X11Dependency::Proxy.for("libpng")
-    @set << X11Dependency::Proxy.for("fontconfig")
-    assert_equal 2, @set.count
-  end
-end
-- 
cgit v1.2.3