1 files changed, 23 insertions, 28 deletions

diff --git a/test/rubygems/test_gem_resolver_index_set.rb b/test/rubygems/test_gem_resolver_index_set.rb
index 2de766f60a..8ff1acbf1e 100644
--- a/test/rubygems/test_gem_resolver_index_set.rb
+++ b/test/rubygems/test_gem_resolver_index_set.rb
@@ -1,15 +1,10 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
 
-class TestGemResolverIndexSet < Gem::TestCase
-  def setup
-    super
-
-    @DR = Gem::Resolver
-  end
+require_relative "helper"
 
+class TestGemResolverIndexSet < Gem::TestCase
   def test_initialize
-    set = @DR::IndexSet.new
+    set = Gem::Resolver::IndexSet.new
 
     fetcher = set.instance_variable_get :@f
 
@@ -17,7 +12,7 @@ class TestGemResolverIndexSet < Gem::TestCase
   end
 
   def test_initialize_source
-    set = @DR::IndexSet.new 'http://alternate.example'
+    set = Gem::Resolver::IndexSet.new "http://alternate.example"
 
     fetcher = set.instance_variable_get :@f
 
@@ -28,49 +23,49 @@ class TestGemResolverIndexSet < Gem::TestCase
 
   def test_find_all
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1
-      fetcher.spec 'a', 2
-      fetcher.spec 'b', 1
+      fetcher.spec "a", 1
+      fetcher.spec "a", 2
+      fetcher.spec "b", 1
     end
 
-    set = @DR::IndexSet.new
+    set = Gem::Resolver::IndexSet.new
 
-    dependency = dep 'a', '~> 1'
+    dependency = dep "a", "~> 1"
 
-    req = @DR::DependencyRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
 
     found = set.find_all req
 
-    assert_equal %w[a-1], found.map {|s| s.full_name }
+    assert_equal %w[a-1], found.map(&:full_name)
   end
 
   def test_find_all_local
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1
-      fetcher.spec 'a', 2
-      fetcher.spec 'b', 1
+      fetcher.spec "a", 1
+      fetcher.spec "a", 2
+      fetcher.spec "b", 1
     end
 
-    set = @DR::IndexSet.new
+    set = Gem::Resolver::IndexSet.new
     set.remote = false
 
-    dependency = dep 'a', '~> 1'
+    dependency = dep "a", "~> 1"
 
-    req = @DR::DependencyRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
 
     assert_empty set.find_all req
   end
 
   def test_find_all_prerelease
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', '1.a'
+      fetcher.spec "a", "1.a"
     end
 
-    set = @DR::IndexSet.new
+    set = Gem::Resolver::IndexSet.new
 
-    dependency = dep 'a'
+    dependency = dep "a"
 
-    req = @DR::DependencyRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
 
     found = set.find_all req
 
@@ -78,10 +73,10 @@ class TestGemResolverIndexSet < Gem::TestCase
 
     dependency.prerelease = true
 
-    req = @DR::DependencyRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
 
     found = set.find_all req
 
-    assert_equal %w[a-1.a], found.map {|s| s.full_name }
+    assert_equal %w[a-1.a], found.map(&:full_name)
   end
 end