Isolate ARGV extension tests

2 files changed, 32 insertions, 49 deletions

diff --git a/Library/Homebrew/test/test_ARGV.rb b/Library/Homebrew/test/test_ARGV.rb
index 18892b02b..428d81453 100644
--- a/Library/Homebrew/test/test_ARGV.rb
+++ b/Library/Homebrew/test/test_ARGV.rb
@@ -1,65 +1,57 @@
 require 'testing_env'
+require 'extend/ARGV'
 
-module ExtendArgvPlusYeast
-  def reset
-    @named = nil
-    @downcased_unique_named = nil
-    @formulae = nil
-    @kegs = nil
-    ARGV.shift while ARGV.length > 0
+class ArgvExtensionTests < Test::Unit::TestCase
+  def setup
+    @argv = [].extend(HomebrewArgvExtension)
   end
-end
-ARGV.extend ExtendArgvPlusYeast
-
-
-class ARGVTests < Test::Unit::TestCase
 
-  def teardown
-    ARGV.reset
+  def test_argv_formulae
+    @argv.unshift 'mxcl'
+    assert_raises(FormulaUnavailableError) { @argv.formulae }
   end
 
-  def test_ARGV
-    assert ARGV.named.empty?
+  def test_argv_kegs
+    keg = HOMEBREW_CELLAR + "mxcl/10.0"
+    keg.mkpath
+    @argv << 'mxcl'
+    assert_equal 1, @argv.kegs.length
+  ensure
+    keg.rmtree
+  end
 
-    (HOMEBREW_CELLAR+'mxcl/10.0').mkpath
+  def test_argv_named
+    @argv << 'mxcl' << '--debug' << '-v'
+    assert_equal 1, @argv.named.length
+  end
 
-    ARGV.reset
-    ARGV.unshift 'mxcl'
-    assert_equal 1, ARGV.named.length
-    assert_equal 1, ARGV.kegs.length
-    assert_raises(FormulaUnavailableError) { ARGV.formulae }
+  def test_empty_argv
+    assert_empty @argv.named
+    assert_empty @argv.kegs
+    assert_empty @argv.formulae
+    assert_empty @argv
   end
 
   def test_switch?
-    ARGV.unshift "-ns"
-    ARGV.unshift "-i"
-    ARGV.unshift "--bar"
-    assert ARGV.switch?('n')
-    assert ARGV.switch?('s')
-    assert ARGV.switch?('i')
-    assert !ARGV.switch?('b')
-    assert !ARGV.switch?('ns')
-    assert !ARGV.switch?('bar')
-    assert !ARGV.switch?('--bar')
-    assert !ARGV.switch?('-n')
+    @argv << "-ns" << "-i" << "--bar"
+    %w{n s i}.each { |s| assert @argv.switch?(s) }
+    %w{b ns bar --bar -n}.each { |s| assert !@argv.switch?(s) }
   end
 
   def test_filter_for_dependencies_clears_flags
-    ARGV.unshift("--debug")
-    ARGV.filter_for_dependencies do
-      assert ARGV.empty?
-    end
+    @argv << "--debug"
+    @argv.filter_for_dependencies { assert @argv.empty? }
   end
 
   def test_filter_for_dependencies_ensures_argv_restored
-    ARGV.expects(:replace).with(ARGV.clone)
+    @argv.expects(:replace).with(@argv.clone)
     begin
-      ARGV.filter_for_dependencies { raise Exception }
+      @argv.filter_for_dependencies { raise Exception }
     rescue Exception
     end
   end
 
   def test_filter_for_dependencies_returns_block_value
-    assert_equal 1, ARGV.filter_for_dependencies { 1 }
+    assert_equal 1, @argv.filter_for_dependencies { 1 }
   end
 end
diff --git a/Library/Homebrew/test/test_bucket.rb b/Library/Homebrew/test/test_bucket.rb
index 56b67b686..1a5b78c4b 100644
--- a/Library/Homebrew/test/test_bucket.rb
+++ b/Library/Homebrew/test/test_bucket.rb
@@ -54,15 +54,6 @@ class BeerTasting < Test::Unit::TestCase
     shutup { assert_nothing_raised { TestZip.new.brew {} } }
   end
 
-  # needs resurrecting
-  # def test_no_ARGV_dupes
-  #   ARGV.reset
-  #   ARGV << 'foo' << 'foo'
-  #   n=0
-  #   ARGV.named.each{|f| n+=1 if f == 'foo'}
-  #   assert_equal 1, n
-  # end
-
   def test_brew_h
     require 'cmd/info'
     require 'cmd/prune'