1 files changed, 30 insertions, 15 deletions
diff --git a/test/rubygems/test_gem_version.rb b/test/rubygems/test_gem_version.rb
index f3692682b6..a3fbe24f15 100644
--- a/test/rubygems/test_gem_version.rb
+++ b/test/rubygems/test_gem_version.rb
@@ -1,5 +1,11 @@
-require_relative 'gemutilities'
-require 'rubygems/version'
+######################################################################
+# This file is imported from the rubygems project.
+# DO NOT make modifications in this repo. They _will_ be reverted!
+# File a patch instead and assign it to Ryan Davis or Eric Hodel.
+######################################################################
+
+require "test/rubygems/gemutilities"
+require "rubygems/version"
 
 class TestGemVersion < RubyGemTestCase
 
@@ -11,6 +17,10 @@ class TestGemVersion < RubyGemTestCase
     assert_bumped_version_equal "5.3", "5.2.4.a"
   end
 
+  def test_bump_alphanumeric
+    assert_bumped_version_equal "5.3", "5.2.4.a10"
+  end
+
   def test_bump_trailing_zeros
     assert_bumped_version_equal "5.1", "5.0.0"
   end
@@ -32,14 +42,16 @@ class TestGemVersion < RubyGemTestCase
   end
 
   def test_eql_eh
-    assert_version_eql "1.2", "1.2"
-    refute_version_eql "1.2", "1.2.0"
-    refute_version_eql "1.2", "1.3"
+    assert_version_eql "1.2",    "1.2"
+    refute_version_eql "1.2",    "1.2.0"
+    refute_version_eql "1.2",    "1.3"
+    refute_version_eql "1.2.b1", "1.2.b.1"
   end
 
-  def test_equals
-    assert_version_equal "1.2", "1.2"
-    refute_version_equal "1.2", "1.3"
+  def test_equals2
+    assert_version_equal "1.2",    "1.2"
+    refute_version_equal "1.2",    "1.3"
+    assert_version_equal "1.2.b1", "1.2.b.1"
   end
 
   # REVISIT: consider removing as too impl-bound
@@ -88,13 +100,16 @@ class TestGemVersion < RubyGemTestCase
   end
 
   def test_spaceship
-    assert_equal( 0, v("1.0")     <=> v("1.0.0"))
-    assert_equal( 1, v("1.0")     <=> v("1.0.a"))
-    assert_equal( 1, v("1.8.2")   <=> v("0.0.0"))
-    assert_equal( 1, v("1.8.2")   <=> v("1.8.2.a"))
-    assert_equal( 1, v("1.8.2.b") <=> v("1.8.2.a"))
-    assert_equal(-1, v("1.8.2.a") <=> v("1.8.2"))
-    assert_equal( 0, v("")        <=> v("0"))
+    assert_equal( 0, v("1.0")       <=> v("1.0.0"))
+    assert_equal( 1, v("1.0")       <=> v("1.0.a"))
+    assert_equal( 1, v("1.8.2")     <=> v("0.0.0"))
+    assert_equal( 1, v("1.8.2")     <=> v("1.8.2.a"))
+    assert_equal( 1, v("1.8.2.b")   <=> v("1.8.2.a"))
+    assert_equal(-1, v("1.8.2.a")   <=> v("1.8.2"))
+    assert_equal( 1, v("1.8.2.a10") <=> v("1.8.2.a9"))
+    assert_equal( 0, v("")          <=> v("0"))
+
+    assert_nil v("1.0") <=> "whatever"
   end
 
   def test_spermy_recommendation