admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Simplify version comparison tests

Browse Source 
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Jack Nagel 2012-08-18 16:03:43 -05:00
parent c924de7086
commit 23cc14f9a1
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Library/Homebrew/test/test_versions.rb
View File

@ -15,20 +15,22 @@ class VersionComparisonTests < Test::Unit::TestCase
include VersionAssertions include VersionAssertions
def test_version_comparisons def test_version_comparisons
assert_version_comparison '0.1', '==', '0.1.0' assert_equal 0, version('0.1') <=> version('0.1.0')
assert_version_comparison '0.1', '!=', '0.2' assert_equal -1, version('0.1') <=> version('0.2')
assert_version_comparison '1.2.3', '>', '1.2.2' assert_equal 1, version('1.2.3') <=> version('1.2.2')
assert_version_comparison '1.2.3-p34', '>', '1.2.3-p33' assert_equal 1, version('1.2.3-p34') <=> version('1.2.3-p33')
assert_version_comparison '1.2.4', '<', '1.2.4.1' assert_equal -1, version('1.2.4') <=> version('1.2.4.1')
assert_version_comparison 'HEAD', '==', 'HEAD' assert_equal 0, version('HEAD') <=> version('HEAD')
assert_version_comparison 'HEAD', '>', '1.2.3' assert_equal 1, version('HEAD') <=> version('1.2.3')
assert_version_comparison '1.2.3', '<', 'HEAD' assert_equal -1, version('1.2.3') <=> version('HEAD')
assert_version_comparison '3.2.0b4', '<', '3.2.0' assert_equal -1, version('3.2.0b4') <=> version('3.2.0')
assert_version_comparison '1.0beta6', '<', '1.0b7' assert_equal -1, version('1.0beta6') <=> version('1.0b7')
assert_version_comparison '1.0b6', '<', '1.0beta7' assert_equal -1, version('1.0b6') <=> version('1.0beta7')
assert_version_comparison '1.1alpha4', '<', '1.1beta2' assert_equal -1, version('1.1alpha4') <=> version('1.1beta2')
assert_version_comparison '1.1beta2', '<', '1.1rc1' assert_equal -1, version('1.1beta2') <=> version('1.1rc1')
assert_nil Version.new('1.0') <=> 'foo' assert_equal -1, version('1.0.0beta7') <=> version('1.0.0')
assert_equal 1, version('3.2.1') <=> version('3.2beta4')
assert_nil version('1.0') <=> 'foo'
end end
def test_macos_version_comparison def test_macos_version_comparison
@ -45,7 +47,7 @@ class VersionParsingTests < Test::Unit::TestCase
def test_pathname_version def test_pathname_version
d = HOMEBREW_CELLAR/'foo-0.1.9' d = HOMEBREW_CELLAR/'foo-0.1.9'
d.mkpath d.mkpath
assert_version_equal '0.1.9', d.version assert_equal 0, version('0.1.9') <=> d.version
end end
def test_no_version def test_no_version

8
Library/Homebrew/test/testing_env.rb
View File

@ -67,6 +67,10 @@ require 'extend/ENV'
ENV.extend(HomebrewEnvExtension) ENV.extend(HomebrewEnvExtension)
module VersionAssertions module VersionAssertions
def version v
Version.new(v)
end
def assert_version_equal expected, actual def assert_version_equal expected, actual
assert_equal Version.new(expected), actual assert_equal Version.new(expected), actual
end end
@ -78,8 +82,4 @@ module VersionAssertions
def assert_version_nil url def assert_version_nil url
assert_nil Version.parse(url) assert_nil Version.parse(url)
end end
def assert_version_comparison a, comparison, b
eval "assert Version.new(a) #{comparison} Version.new(b)"
end
end end