1 files changed, 22 insertions, 6 deletions
diff --git a/Library/Homebrew/test/test_bucket.rb b/Library/Homebrew/test/test_bucket.rb
index 8492b4929..086297dd2 100644
--- a/Library/Homebrew/test/test_bucket.rb
+++ b/Library/Homebrew/test/test_bucket.rb
@@ -5,7 +5,6 @@ ARGV.extend(HomebrewArgvExtension)
 
 require 'test/testball'
 require 'utils'
-require 'brew.h'
 
 class MockFormula <Formula
   def initialize url
@@ -79,19 +78,24 @@ class BeerTasting < Test::Unit::TestCase
   # end
   
   def test_brew_h
+    require 'cmd/info'
+    require 'cmd/prune'
+    require 'cleaner'
+
     nostdout do
       assert_nothing_raised do
         f=TestBall.new
-        make f.url
-        info f
-        clean f
-        prune
+        Homebrew.info_formula f
+        Cleaner.new f
+        Homebrew.prune
         #TODO test diy function too
       end
     end
   end
 
   def test_brew_cleanup
+    require 'cmd/cleanup'
+
     f1=TestBall.new
     f1.instance_eval { @version = "0.1" }
     f2=TestBall.new
@@ -110,7 +114,7 @@ class BeerTasting < Test::Unit::TestCase
     assert f3.installed?
 
     nostdout do
-      cleanup f3
+      Homebrew.cleanup_formula f3
     end
 
     assert !f1.installed?
@@ -175,4 +179,16 @@ class BeerTasting < Test::Unit::TestCase
     assert_equal 'foo-0.1', foo1.stem
     assert_equal '0.1', foo1.version
   end
+
+  class MockMockFormula < Struct.new(:name); end
+
+  def test_formula_equality
+    f = MockFormula.new('http://example.com/test-0.1.tgz')
+    g = MockMockFormula.new('test')
+
+    assert f == f
+    assert f == g
+    assert f.eql? f
+    assert (not (f.eql? g))
+  end
 end