commit 3bbbf8b7c2d3633af47faf9eda9836e1bc3c681c Author: Yossef Mendelssohn Date: Thu Apr 16 00:59:30 2009 -0500 Spec changes for trailing zero version tweaks. The desire is for 1.0.0 > 1.0 Note this means quite a few specs need to be changed, since they assume trailing zeroes are insignificant. diff --git a/test/test_gem_version.rb b/test/test_gem_version.rb index 29b8b5b..1d417b4 100644 --- a/test/test_gem_version.rb +++ b/test/test_gem_version.rb @@ -42,7 +42,7 @@ class TestGemVersion < RubyGemTestCase def test_bad assert_inadequate( "", "> 0.1") assert_inadequate( "1.2.3", "!= 1.2.3") - assert_inadequate( "1.2.003.0.0", "!= 1.02.3") + assert_inadequate( "1.2.003", "!= 1.02.3") assert_inadequate( "4.5.6", "< 1.2.3") assert_inadequate( "1.0", "> 1.1") assert_inadequate( "0", ">") @@ -56,6 +56,10 @@ class TestGemVersion < RubyGemTestCase assert_inadequate( "9.3.1", ">= 9.3.2") assert_inadequate( "9.3.03", "<= 9.3.2") assert_inadequate( "1.0.0.1", "= 1.0") + assert_inadequate( "1.0", "= 1.0.0") + assert_inadequate( "1.0", "> 1.0.0") + assert_inadequate( "1.0.0", "= 1.0") + assert_inadequate( "1.0.0", "< 1.0") end def test_bump_trailing_zeros @@ -144,7 +148,7 @@ class TestGemVersion < RubyGemTestCase assert_equal [0], Gem::Version.new("").normalize.map { |part| part.value } assert_equal [0], Gem::Version.new("0").normalize.map { |part| part.value } assert_equal [1], Gem::Version.new("1").normalize.map { |part| part.value } - assert_equal [1], Gem::Version.new("1.0").normalize.map { |part| part.value } + assert_equal [1, 0], Gem::Version.new("1.0").normalize.map { |part| part.value } assert_equal [1, 1], Gem::Version.new("1.1").normalize.map { |part| part.value } assert_equal [1, 1, "a"], Gem::Version.new("1.1.a").normalize.map { |part| part.value } end @@ -160,7 +164,6 @@ class TestGemVersion < RubyGemTestCase assert_adequate( "0.0.0.0.0.2", "> 0.0.0") assert_adequate( "0.0.1.0", "> 0.0.0.1") assert_adequate( "10.3.2", "> 9.3.2") - assert_adequate( "1.0.0.0", "= 1.0") assert_adequate( "10.3.2", "!= 9.3.4") assert_adequate( "10.3.2", "> 9.3.2") assert_adequate( "10.3.2", "> 9.3.2") @@ -181,6 +184,8 @@ class TestGemVersion < RubyGemTestCase assert_adequate( "3.0.rc2", "< 3.0") assert_adequate( "3.0.rc2", "< 3.0.0") assert_adequate( "3.0.rc2", "< 3.0.1") + assert_adequate( "1.0.0", "> 1.0") + assert_adequate( "1.0", "< 1.0.0") end def test_parse_parts_from_version_string @@ -225,7 +230,7 @@ class TestGemVersion < RubyGemTestCase end def test_spaceship - assert_equal 0, Gem::Version.new('1.0') <=> Gem::Version.new('1.0.0') + assert_equal 0, Gem::Version.new('1.0') <=> Gem::Version.new('1.0') assert_equal 1, Gem::Version.new('1.0') <=> Gem::Version.new('1.0.a') assert_equal 1, Gem::Version.new('1.8.2') <=> Gem::Version.new('0.0.0') assert_equal 1, Gem::Version.new('1.8.2') <=> Gem::Version.new('1.8.2.a')