Move inreplace tests to separate file.

3 files changed, 17 insertions, 13 deletions

diff --git a/Library/Homebrew/test/test_inreplace.rb b/Library/Homebrew/test/test_inreplace.rb
index d2d2d4cfc..520b41ad6 100644
--- a/Library/Homebrew/test/test_inreplace.rb
+++ b/Library/Homebrew/test/test_inreplace.rb
@@ -1,18 +1,21 @@
+require 'testing_env'
+require 'utils'
+
 class InreplaceTest < Test::Unit::TestCase
   def test_change_make_var
     # Replace flag
-    s1="FLAG = abc"
+    s1="OTHER=def\nFLAG = abc\nFLAG2=abc"
     s1.extend(HomebrewInreplaceExtension)
     s1.change_make_var! "FLAG", "def"
-    assert_equal "FLAG=def", s1
+    assert_equal "OTHER=def\nFLAG=def\nFLAG2=abc", s1
   end
 
   def test_change_make_var_empty
     # Replace empty flag
-    s1="FLAG = \nFLAG2=abc"
+    s1="OTHER=def\nFLAG = \nFLAG2=abc"
     s1.extend(HomebrewInreplaceExtension)
     s1.change_make_var! "FLAG", "def"
-    assert_equal "FLAG=def\nFLAG2=abc", s1
+    assert_equal "OTHER=def\nFLAG=def\nFLAG2=abc", s1
   end
     
   def test_change_make_var_empty_2
@@ -25,33 +28,33 @@ class InreplaceTest < Test::Unit::TestCase
     
   def test_change_make_var_append
     # Append to flag
-    s1="FLAG = abc"
+    s1="OTHER=def\nFLAG = abc\nFLAG2=abc"
     s1.extend(HomebrewInreplaceExtension)
     s1.change_make_var! "FLAG", "\\1 def"
-    assert_equal "FLAG=abc def", s1
+    assert_equal "OTHER=def\nFLAG=abc def\nFLAG2=abc", s1
   end
   
   def test_change_make_var_shell_style
     # Shell variables have no spaces around =
-    s1="FLAG=abc"
+    s1="OTHER=def\nFLAG=abc\nFLAG2=abc"
     s1.extend(HomebrewInreplaceExtension)
     s1.change_make_var! "FLAG", "def"
-    assert_equal "FLAG=def", s1
+    assert_equal "OTHER=def\nFLAG=def\nFLAG2=abc", s1
   end
 
   def test_remove_make_var
     # Replace flag
-    s1="FLAG = abc\nFLAG2 = def"
+    s1="OTHER=def\nFLAG = abc\nFLAG2 = def"
     s1.extend(HomebrewInreplaceExtension)
     s1.remove_make_var! "FLAG"
-    assert_equal "FLAG2 = def", s1
+    assert_equal "OTHER=def\nFLAG2 = def", s1
   end
 
   def test_remove_make_vars
     # Replace flag
-    s1="FLAG = abc\nFLAG2 = def"
+    s1="OTHER=def\nFLAG = abc\nFLAG2 = def\nOTHER2=def"
     s1.extend(HomebrewInreplaceExtension)
     s1.remove_make_var! ["FLAG", "FLAG2"]
-    assert_equal "", s1
+    assert_equal "OTHER=def\nOTHER2=def", s1
   end
 end
diff --git a/Library/Homebrew/test/tests b/Library/Homebrew/test/tests
index 6653b10a9..4afc72621 100755
--- a/Library/Homebrew/test/tests
+++ b/Library/Homebrew/test/tests
@@ -9,6 +9,8 @@
 # Bulk of the tests
 ruby unittest.rb $*
 
+ruby test_inreplace.rb $*
+
 # Test hardware sniffers
 ruby test_hardware.rb $*
 
diff --git a/Library/Homebrew/test/unittest.rb b/Library/Homebrew/test/unittest.rb
index 0c924f77b..b6573c8bd 100755
--- a/Library/Homebrew/test/unittest.rb
+++ b/Library/Homebrew/test/unittest.rb
@@ -111,4 +111,3 @@ ARGV.extend ExtendArgvPlusYeast
 require 'test/test_versions'
 require 'test/test_checksums'
 require 'test/test_bucket'
-require 'test/test_inreplace'