From a7d74df430a8dfba7bc701c5b526e5d2887c5e1c Mon Sep 17 00:00:00 2001
From: Adam Vandenberg <flangy@gmail.com>
Date: Mon, 8 Mar 2010 22:27:08 -0800
Subject: [PATCH] Move ARGV tests to separate file.

---
 Library/Homebrew/test/test_ARGV.rb   | 35 ++++++++++++++++++++++++++++
 Library/Homebrew/test/test_bucket.rb | 17 +++-----------
 Library/Homebrew/test/tests          |  3 +++
 Library/Homebrew/test/unittest.rb    | 11 ---------
 4 files changed, 41 insertions(+), 25 deletions(-)
 create mode 100644 Library/Homebrew/test/test_ARGV.rb

diff --git a/Library/Homebrew/test/test_ARGV.rb b/Library/Homebrew/test/test_ARGV.rb
new file mode 100644
index 0000000000..f6a74d45fc
--- /dev/null
+++ b/Library/Homebrew/test/test_ARGV.rb
@@ -0,0 +1,35 @@
+require 'testing_env'
+
+require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
+ARGV.extend(HomebrewArgvExtension)
+
+
+module ExtendArgvPlusYeast
+  def reset
+    @named = nil
+    @downcased_unique_named = nil
+    @formulae = nil
+    @kegs = nil
+    ARGV.shift while ARGV.length > 0
+  end
+end
+ARGV.extend ExtendArgvPlusYeast
+
+
+class ARGVTests < Test::Unit::TestCase
+
+  def test_ARGV
+    assert_raises(FormulaUnspecifiedError) { ARGV.formulae }
+    assert_raises(KegUnspecifiedError) { ARGV.kegs }
+    assert ARGV.named.empty?
+    
+    (HOMEBREW_CELLAR+'mxcl/10.0').mkpath
+    
+    ARGV.reset
+    ARGV.unshift 'mxcl'
+    assert_equal 1, ARGV.named.length
+    assert_equal 1, ARGV.kegs.length
+    assert_raises(FormulaUnavailableError) { ARGV.formulae }
+  end
+  
+end
diff --git a/Library/Homebrew/test/test_bucket.rb b/Library/Homebrew/test/test_bucket.rb
index c93c5db390..46d24ec8bd 100644
--- a/Library/Homebrew/test/test_bucket.rb
+++ b/Library/Homebrew/test/test_bucket.rb
@@ -1,3 +1,6 @@
+require 'extend/ARGV' # needs to be after test/unit to avoid conflict with OptionsParser
+ARGV.extend(HomebrewArgvExtension)
+
 # All other tests so far -- feel free to break them out into
 # separate TestCase classes.
 
@@ -71,20 +74,6 @@ class BeerTasting < Test::Unit::TestCase
   #   assert_equal 1, n
   # end
   
-  def test_ARGV
-    assert_raises(FormulaUnspecifiedError) { ARGV.formulae }
-    assert_raises(KegUnspecifiedError) { ARGV.kegs }
-    assert ARGV.named.empty?
-    
-    (HOMEBREW_CELLAR+'mxcl/10.0').mkpath
-    
-    ARGV.reset
-    ARGV.unshift 'mxcl'
-    assert_equal 1, ARGV.named.length
-    assert_equal 1, ARGV.kegs.length
-    assert_raises(FormulaUnavailableError) { ARGV.formulae }
-  end
-  
   def test_brew_h
     nostdout do
       assert_nothing_raised do
diff --git a/Library/Homebrew/test/tests b/Library/Homebrew/test/tests
index 44fba7a283..10cedae1e6 100755
--- a/Library/Homebrew/test/tests
+++ b/Library/Homebrew/test/tests
@@ -35,3 +35,6 @@ ruby test_pathname_install.rb $*
 
 # Test utility functions
 ruby test_utils.rb $*
+
+# Test ARGV extensions
+ruby test_ARGV.rb $*
diff --git a/Library/Homebrew/test/unittest.rb b/Library/Homebrew/test/unittest.rb
index 8e850705d8..5468729542 100755
--- a/Library/Homebrew/test/unittest.rb
+++ b/Library/Homebrew/test/unittest.rb
@@ -93,15 +93,4 @@ class TestBallOverrideBrew <Formula
   end
 end
 
-module ExtendArgvPlusYeast
-  def reset
-    @named = nil
-    @downcased_unique_named = nil
-    @formulae = nil
-    @kegs = nil
-    ARGV.shift while ARGV.length > 0
-  end
-end
-ARGV.extend ExtendArgvPlusYeast
-
 require 'test/test_bucket'