diff options
| author | Misty De Meo | 2012-10-23 17:09:57 -0500 |
|---|---|---|
| committer | Misty De Meo | 2012-10-23 17:10:12 -0500 |
| commit | 18f5bf109219145fbf3b906f56ac5cb29b677c1a (patch) | |
| tree | 12dc432bca19a8994c81199775691e8dfb7f1ae9 /Library | |
| parent | e99ca2d59f59bc91506a62256429a5f7e9b3dbe0 (diff) | |
| download | brew-18f5bf109219145fbf3b906f56ac5cb29b677c1a.tar.bz2 | |
Fix Keg tests
* unreverse expected/actuals
* don't assume linked file order is guaranteed - it wasn't!
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/test/test_keg.rb | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Library/Homebrew/test/test_keg.rb b/Library/Homebrew/test/test_keg.rb index c9e5990a0..e4fa4f277 100644 --- a/Library/Homebrew/test/test_keg.rb +++ b/Library/Homebrew/test/test_keg.rb @@ -19,26 +19,25 @@ class LinkTests < Test::Unit::TestCase end def test_linking_keg - assert_equal @keg.link, 3 + assert_equal 3, @keg.link end def test_unlinking_keg @keg.link - assert_equal @keg.unlink, 3 + assert_equal 3, @keg.unlink end def test_link_dry_run mode = OpenStruct.new mode.dry_run = true - assert_equal @keg.link(mode), 0 + assert_equal 0, @keg.link(mode) assert !@keg.linked? - assert_equal $stdout.string, <<-EOS.undent - /private/tmp/testbrew/prefix/bin/hiworld - /private/tmp/testbrew/prefix/bin/helloworld - /private/tmp/testbrew/prefix/bin/goodbye_cruel_world - EOS + ['hiworld', 'helloworld', 'goodbye_cruel_world'].each do |file| + assert_match "/private/tmp/testbrew/prefix/bin/#{file}", $stdout.string + end + assert_equal 3, $stdout.string.lines.count end def test_linking_fails_when_already_linked @@ -59,7 +58,7 @@ class LinkTests < Test::Unit::TestCase FileUtils.touch HOMEBREW_PREFIX/"bin/helloworld" mode = OpenStruct.new mode.overwrite = true - assert_equal @keg.link(mode), 3 + assert_equal 3, @keg.link(mode) end def test_link_overwrite_dryrun @@ -68,10 +67,10 @@ class LinkTests < Test::Unit::TestCase mode.overwrite = true mode.dry_run = true - assert_equal @keg.link(mode), 0 + assert_equal 0, @keg.link(mode) assert !@keg.linked? - assert_equal $stdout.string, "/private/tmp/testbrew/prefix/bin/helloworld\n" + assert_equal "/private/tmp/testbrew/prefix/bin/helloworld\n", $stdout.string end def teardown |