cancel subversion backfire. sorry

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 37 insertions, 17 deletions

diff --git a/test/rubygems/test_gem_dependency_list.rb b/test/rubygems/test_gem_dependency_list.rb
index 92966ace08..688455475b 100644
--- a/test/rubygems/test_gem_dependency_list.rb
+++ b/test/rubygems/test_gem_dependency_list.rb
@@ -14,17 +14,17 @@ class TestGemDependencyList < Gem::TestCase
 
     @deplist = Gem::DependencyList.new
 
-    @a1 = quick_gem 'a', '1'
-    @a2 = quick_gem 'a', '2'
-    @a3 = quick_gem 'a', '3'
+    @a1 = quick_spec 'a', '1'
+    @a2 = quick_spec 'a', '2'
+    @a3 = quick_spec 'a', '3'
 
-    @b1 = quick_gem 'b', '1' do |s| s.add_dependency 'a', '>= 1' end
-    @b2 = quick_gem 'b', '2' do |s| s.add_dependency 'a', '>= 1' end
+    @b1 = quick_spec 'b', '1' do |s| s.add_dependency 'a', '>= 1' end
+    @b2 = quick_spec 'b', '2' do |s| s.add_dependency 'a', '>= 1' end
 
-    @c1 = quick_gem 'c', '1' do |s| s.add_dependency 'b', '>= 1' end
-    @c2 = quick_gem 'c', '2'
+    @c1 = quick_spec 'c', '1' do |s| s.add_dependency 'b', '>= 1' end
+    @c2 = quick_spec 'c', '2'
 
-    @d1 = quick_gem 'd', '1' do |s| s.add_dependency 'c', '>= 1' end
+    @d1 = quick_spec 'd', '1' do |s| s.add_dependency 'c', '>= 1' end
   end
 
   def test_self_from_source_index
@@ -72,9 +72,9 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_dependency_order_development
-    e1 = quick_gem 'e', '1'
-    f1 = quick_gem 'f', '1'
-    g1 = quick_gem 'g', '1'
+    e1 = quick_spec 'e', '1'
+    f1 = quick_spec 'f', '1'
+    g1 = quick_spec 'g', '1'
 
     @a1.add_dependency 'e'
     @a1.add_dependency 'f'
@@ -100,7 +100,7 @@ class TestGemDependencyList < Gem::TestCase
 
   def test_dependency_order_diamond
     util_diamond
-    e1 = quick_gem 'e', '1'
+    e1 = quick_spec 'e', '1'
     @deplist.add e1
     @a1.add_dependency 'e', '>= 1'
 
@@ -128,6 +128,8 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_ok_eh
+    util_clear_gems
+
     assert @deplist.ok?, 'no dependencies'
 
     @deplist.add @b2
@@ -139,14 +141,30 @@ class TestGemDependencyList < Gem::TestCase
     assert @deplist.ok?, 'satisfied dependency'
   end
 
+  def test_why_not_ok_eh
+    util_clear_gems
+
+    assert_equal({},  @deplist.why_not_ok?)
+
+    @deplist.add @b2
+
+    exp = {
+      "b" => [
+              Gem::Dependency.new("a", ">= 1")
+             ]
+    }
+
+    assert_equal exp, @deplist.why_not_ok?
+  end
+
   def test_ok_eh_mismatch
-    a1 = quick_gem 'a', '1'
-    a2 = quick_gem 'a', '2'
+    a1 = quick_spec 'a', '1'
+    a2 = quick_spec 'a', '2'
 
-    b = quick_gem 'b', '1' do |s| s.add_dependency 'a', '= 1' end
-    c = quick_gem 'c', '1' do |s| s.add_dependency 'a', '= 2' end
+    b = quick_spec 'b', '1' do |s| s.add_dependency 'a', '= 1' end
+    c = quick_spec 'c', '1' do |s| s.add_dependency 'a', '= 2' end
 
-    d = quick_gem 'd', '1' do |s|
+    d = quick_spec 'd', '1' do |s|
       s.add_dependency 'b'
       s.add_dependency 'c'
     end
@@ -192,6 +210,8 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_remove_by_name
+    util_clear_gems
+
     @deplist.add @a1, @b2
 
     @deplist.remove_by_name "a-1"