[rubygems/rubygems] Extract alias variables for long name class

https://github.com/rubygems/rubygems/commit/33caea928e

12 files changed, 138 insertions, 181 deletions

diff --git a/test/rubygems/test_gem_dependency_resolution_error.rb b/test/rubygems/test_gem_dependency_resolution_error.rb
index 07970ff475..98a6b6b8fd 100644
--- a/test/rubygems/test_gem_dependency_resolution_error.rb
+++ b/test/rubygems/test_gem_dependency_resolution_error.rb
@@ -6,16 +6,14 @@ class TestGemDependencyResolutionError < Gem::TestCase
   def setup
     super
 
-    @DR = Gem::Resolver
-
     @spec = util_spec "a", 2
 
-    @a1_req = @DR::DependencyRequest.new dep("a", "= 1"), nil
-    @a2_req = @DR::DependencyRequest.new dep("a", "= 2"), nil
+    @a1_req = Gem::Resolver::DependencyRequest.new dep("a", "= 1"), nil
+    @a2_req = Gem::Resolver::DependencyRequest.new dep("a", "= 2"), nil
 
-    @activated = @DR::ActivationRequest.new @spec, @a2_req
+    @activated = Gem::Resolver::ActivationRequest.new @spec, @a2_req
 
-    @conflict = @DR::Conflict.new @a1_req, @activated
+    @conflict = Gem::Resolver::Conflict.new @a1_req, @activated
 
     @error = Gem::DependencyResolutionError.new @conflict
   end
diff --git a/test/rubygems/test_gem_request_set.rb b/test/rubygems/test_gem_request_set.rb
index 2282287ef9..c8197676da 100644
--- a/test/rubygems/test_gem_request_set.rb
+++ b/test/rubygems/test_gem_request_set.rb
@@ -8,8 +8,6 @@ class TestGemRequestSet < Gem::TestCase
     super
 
     Gem::RemoteFetcher.fetcher = @fetcher = Gem::FakeFetcher.new
-
-    @DR = Gem::Resolver
   end
 
   def test_gem
@@ -415,7 +413,7 @@ ruby "0"
 
     assert_equal %w[a-1], names
 
-    assert_equal [@DR::BestSet, @DR::GitSet, @DR::VendorSet, @DR::SourceSet],
+    assert_equal [Gem::Resolver::BestSet, Gem::Resolver::GitSet, Gem::Resolver::VendorSet, Gem::Resolver::SourceSet],
                  rs.sets.map(&:class)
   end
 
@@ -479,7 +477,7 @@ ruby "0"
 
     assert_equal ["a-1", "b-2"], names
 
-    assert_equal [@DR::BestSet, @DR::GitSet, @DR::VendorSet, @DR::SourceSet],
+    assert_equal [Gem::Resolver::BestSet, Gem::Resolver::GitSet, Gem::Resolver::VendorSet, Gem::Resolver::SourceSet],
                  rs.sets.map(&:class)
   end
 
diff --git a/test/rubygems/test_gem_request_set_gem_dependency_api.rb b/test/rubygems/test_gem_request_set_gem_dependency_api.rb
index cd925710cc..876d695c4e 100644
--- a/test/rubygems/test_gem_request_set_gem_dependency_api.rb
+++ b/test/rubygems/test_gem_request_set_gem_dependency_api.rb
@@ -7,14 +7,12 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   def setup
     super
 
-    @GDA = Gem::RequestSet::GemDependencyAPI
-
     @set = Gem::RequestSet.new
 
     @git_set    = Gem::Resolver::GitSet.new
     @vendor_set = Gem::Resolver::VendorSet.new
 
-    @gda = @GDA.new @set, "gem.deps.rb"
+    @gda = Gem::RequestSet::GemDependencyAPI.new @set, "gem.deps.rb"
     @gda.instance_variable_set :@git_set,    @git_set
     @gda.instance_variable_set :@vendor_set, @vendor_set
   end
@@ -264,7 +262,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     with_engine_version "ruby", "2.0.0" do
       set = Gem::RequestSet.new
-      gda = @GDA.new set, "gem.deps.rb"
+      gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb"
       gda.gem "a", :platforms => :ruby
 
       refute_empty set.dependencies
@@ -272,7 +270,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     with_engine_version "rbx", "2.0.0" do
       set = Gem::RequestSet.new
-      gda = @GDA.new set, "gem.deps.rb"
+      gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb"
       gda.gem "a", :platforms => :ruby
 
       refute_empty set.dependencies
@@ -280,7 +278,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     with_engine_version "truffleruby", "2.0.0" do
       set = Gem::RequestSet.new
-      gda = @GDA.new set, "gem.deps.rb"
+      gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb"
       gda.gem "a", :platforms => :ruby
 
       refute_empty set.dependencies
@@ -288,7 +286,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     with_engine_version "jruby", "1.7.6" do
       set = Gem::RequestSet.new
-      gda = @GDA.new set, "gem.deps.rb"
+      gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb"
       gda.gem "a", :platforms => :ruby
 
       assert_empty set.dependencies
@@ -298,7 +296,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     with_engine_version "ruby", "2.0.0" do
       set = Gem::RequestSet.new
-      gda = @GDA.new set, "gem.deps.rb"
+      gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb"
       gda.gem "a", :platforms => :ruby
 
       assert_empty set.dependencies
@@ -327,13 +325,13 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     with_engine_version "maglev", "1.0.0" do
       set = Gem::RequestSet.new
-      gda = @GDA.new set, "gem.deps.rb"
+      gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb"
       gda.gem "a", :platforms => :ruby
 
       refute_empty set.dependencies
 
       set = Gem::RequestSet.new
-      gda = @GDA.new set, "gem.deps.rb"
+      gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb"
       gda.gem "a", :platforms => :maglev
 
       refute_empty set.dependencies
@@ -345,13 +343,13 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   def test_gem_platforms_truffleruby
     with_engine_version "truffleruby", "1.0.0" do
       set = Gem::RequestSet.new
-      gda = @GDA.new set, "gem.deps.rb"
+      gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb"
       gda.gem "a", :platforms => :truffleruby
 
       refute_empty set.dependencies
 
       set = Gem::RequestSet.new
-      gda = @GDA.new set, "gem.deps.rb"
+      gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb"
       gda.gem "a", :platforms => :maglev
 
       assert_empty set.dependencies
@@ -457,7 +455,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   def test_gem_source_mismatch
     name, _, directory = vendor_gem
 
-    gda = @GDA.new @set, nil
+    gda = Gem::RequestSet::GemDependencyAPI.new @set, nil
     gda.gem name
 
     e = assert_raise ArgumentError do
@@ -467,7 +465,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     assert_equal "duplicate source path: #{directory} for gem #{name}",
                  e.message
 
-    gda = @GDA.new @set, nil
+    gda = Gem::RequestSet::GemDependencyAPI.new @set, nil
     gda.instance_variable_set :@vendor_set, @vendor_set
     gda.gem name, :path => directory
 
@@ -482,7 +480,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   def test_gem_deps_file
     assert_equal "gem.deps.rb", @gda.gem_deps_file
 
-    gda = @GDA.new @set, "foo/Gemfile"
+    gda = Gem::RequestSet::GemDependencyAPI.new @set, "foo/Gemfile"
 
     assert_equal "Gemfile", gda.gem_deps_file
   end
@@ -647,7 +645,7 @@ end
       GEM_DEPS
       io.flush
 
-      gda = @GDA.new @set, io.path
+      gda = Gem::RequestSet::GemDependencyAPI.new @set, io.path
 
       assert_equal gda, gda.load
 
@@ -658,7 +656,7 @@ end
   end
 
   def test_pin_gem_source
-    gda = @GDA.new @set, nil
+    gda = Gem::RequestSet::GemDependencyAPI.new @set, nil
 
     gda.send :pin_gem_source, "a"
     gda.send :pin_gem_source, "a"
@@ -703,7 +701,7 @@ end
     win_platform = Gem.win_platform?
     Gem.win_platform = false
 
-    gda = @GDA.new @set, nil
+    gda = Gem::RequestSet::GemDependencyAPI.new @set, nil
 
     with_engine_version "ruby", "1.8.7" do
       gda.platform :mri_19, :mri_20 do
@@ -713,7 +711,7 @@ end
 
     assert_empty @set.dependencies
 
-    gda = @GDA.new @set, nil
+    gda = Gem::RequestSet::GemDependencyAPI.new @set, nil
 
     with_engine_version "ruby", "2.0.0" do
       gda.platform :mri_19, :mri_20 do
diff --git a/test/rubygems/test_gem_resolver.rb b/test/rubygems/test_gem_resolver.rb
index ada0808bcb..c2bdc5332c 100644
--- a/test/rubygems/test_gem_resolver.rb
+++ b/test/rubygems/test_gem_resolver.rb
@@ -3,12 +3,6 @@
 require_relative "helper"
 
 class TestGemResolver < Gem::TestCase
-  def setup
-    super
-
-    @DR = Gem::Resolver
-  end
-
   def make_dep(name, *req)
     Gem::Dependency.new(name, *req)
   end
@@ -37,18 +31,18 @@ class TestGemResolver < Gem::TestCase
   end
 
   def test_self_compose_sets_best_set
-    best_set = @DR::BestSet.new
+    best_set = Gem::Resolver::BestSet.new
 
-    composed = @DR.compose_sets best_set
+    composed = Gem::Resolver.compose_sets best_set
 
     assert_equal best_set, composed
   end
 
   def test_self_compose_sets_multiple
-    index_set  = @DR::IndexSet.new
-    vendor_set = @DR::VendorSet.new
+    index_set  = Gem::Resolver::IndexSet.new
+    vendor_set = Gem::Resolver::VendorSet.new
 
-    composed = @DR.compose_sets index_set, vendor_set
+    composed = Gem::Resolver.compose_sets index_set, vendor_set
 
     assert_kind_of Gem::Resolver::ComposedSet, composed
 
@@ -56,14 +50,14 @@ class TestGemResolver < Gem::TestCase
   end
 
   def test_self_compose_sets_nest
-    index_set  = @DR::IndexSet.new
-    vendor_set = @DR::VendorSet.new
+    index_set  = Gem::Resolver::IndexSet.new
+    vendor_set = Gem::Resolver::VendorSet.new
 
-    inner = @DR.compose_sets index_set, vendor_set
+    inner = Gem::Resolver.compose_sets index_set, vendor_set
 
-    current_set = @DR::CurrentSet.new
+    current_set = Gem::Resolver::CurrentSet.new
 
-    composed = @DR.compose_sets inner, current_set
+    composed = Gem::Resolver.compose_sets inner, current_set
 
     assert_kind_of Gem::Resolver::ComposedSet, composed
 
@@ -71,23 +65,23 @@ class TestGemResolver < Gem::TestCase
   end
 
   def test_self_compose_sets_nil
-    index_set = @DR::IndexSet.new
+    index_set = Gem::Resolver::IndexSet.new
 
-    composed = @DR.compose_sets index_set, nil
+    composed = Gem::Resolver.compose_sets index_set, nil
 
     assert_same index_set, composed
 
     e = assert_raise ArgumentError do
-      @DR.compose_sets nil
+      Gem::Resolver.compose_sets nil
     end
 
     assert_equal "one set in the composition must be non-nil", e.message
   end
 
   def test_self_compose_sets_single
-    index_set = @DR::IndexSet.new
+    index_set = Gem::Resolver::IndexSet.new
 
-    composed = @DR.compose_sets index_set
+    composed = Gem::Resolver.compose_sets index_set
 
     assert_same index_set, composed
   end
diff --git a/test/rubygems/test_gem_resolver_activation_request.rb b/test/rubygems/test_gem_resolver_activation_request.rb
index a346033c13..53875b72cb 100644
--- a/test/rubygems/test_gem_resolver_activation_request.rb
+++ b/test/rubygems/test_gem_resolver_activation_request.rb
@@ -6,24 +6,22 @@ class TestGemResolverActivationRequest < Gem::TestCase
   def setup
     super
 
-    @DR = Gem::Resolver
-
-    @dep = @DR::DependencyRequest.new dep("a", ">= 0"), nil
+    @dep = Gem::Resolver::DependencyRequest.new dep("a", ">= 0"), nil
 
     source   = Gem::Source::Local.new
     platform = Gem::Platform::RUBY
 
-    @a3 = @DR::IndexSpecification.new nil, "a", v(3), source, platform
+    @a3 = Gem::Resolver::IndexSpecification.new nil, "a", v(3), source, platform
 
-    @req = @DR::ActivationRequest.new @a3, @dep
+    @req = Gem::Resolver::ActivationRequest.new @a3, @dep
   end
 
   def test_development_eh
     refute @req.development?
 
-    dep_req = @DR::DependencyRequest.new dep("a", ">= 0", :development), nil
+    dep_req = Gem::Resolver::DependencyRequest.new dep("a", ">= 0", :development), nil
 
-    act_req = @DR::ActivationRequest.new @a3, dep_req
+    act_req = Gem::Resolver::ActivationRequest.new @a3, dep_req
 
     assert act_req.development?
   end
@@ -36,7 +34,7 @@ class TestGemResolverActivationRequest < Gem::TestCase
   def test_installed_eh
     v_spec = Gem::Resolver::VendorSpecification.new nil, @a3
 
-    @req = @DR::ActivationRequest.new v_spec, @dep
+    @req = Gem::Resolver::ActivationRequest.new v_spec, @dep
 
     assert @req.installed?
   end
diff --git a/test/rubygems/test_gem_resolver_api_set.rb b/test/rubygems/test_gem_resolver_api_set.rb
index e047717424..b82f00a190 100644
--- a/test/rubygems/test_gem_resolver_api_set.rb
+++ b/test/rubygems/test_gem_resolver_api_set.rb
@@ -6,12 +6,11 @@ class TestGemResolverAPISet < Gem::TestCase
   def setup
     super
 
-    @DR = Gem::Resolver
     @dep_uri = URI "#{@gem_repo}info/"
   end
 
   def test_initialize
-    set = @DR::APISet.new
+    set = Gem::Resolver::APISet.new
 
     assert_equal URI("https://index.rubygems.org/info/"),            set.dep_uri
     assert_equal URI("https://index.rubygems.org/"),                 set.uri
@@ -19,7 +18,7 @@ class TestGemResolverAPISet < Gem::TestCase
   end
 
   def test_initialize_deeper_uri
-    set = @DR::APISet.new "https://rubygemsserver.com/mygems/info"
+    set = Gem::Resolver::APISet.new "https://rubygemsserver.com/mygems/info"
 
     assert_equal URI("https://rubygemsserver.com/mygems/info"),       set.dep_uri
     assert_equal URI("https://rubygemsserver.com/"),                  set.uri
@@ -27,7 +26,7 @@ class TestGemResolverAPISet < Gem::TestCase
   end
 
   def test_initialize_uri
-    set = @DR::APISet.new @dep_uri
+    set = Gem::Resolver::APISet.new @dep_uri
 
     assert_equal URI("#{@gem_repo}info/"), set.dep_uri
     assert_equal URI(@gem_repo.to_s), set.uri
@@ -45,12 +44,12 @@ class TestGemResolverAPISet < Gem::TestCase
 
     @fetcher.data["#{@dep_uri}a"] = "---\n1  "
 
-    set = @DR::APISet.new @dep_uri
+    set = Gem::Resolver::APISet.new @dep_uri
 
-    a_dep = @DR::DependencyRequest.new dep("a"), nil
+    a_dep = Gem::Resolver::DependencyRequest.new dep("a"), nil
 
     expected = [
-      @DR::APISpecification.new(set, data.first),
+      Gem::Resolver::APISpecification.new(set, data.first),
     ]
 
     assert_equal expected, set.find_all(a_dep)
@@ -72,14 +71,14 @@ class TestGemResolverAPISet < Gem::TestCase
 
     @fetcher.data["#{@dep_uri}a"] = "---\n1\n2.a"
 
-    set = @DR::APISet.new @dep_uri
+    set = Gem::Resolver::APISet.new @dep_uri
     set.prerelease = true
 
-    a_dep = @DR::DependencyRequest.new dep("a"), nil
+    a_dep = Gem::Resolver::DependencyRequest.new dep("a"), nil
 
     expected = [
-      @DR::APISpecification.new(set, data.first),
-      @DR::APISpecification.new(set, data.last),
+      Gem::Resolver::APISpecification.new(set, data.first),
+      Gem::Resolver::APISpecification.new(set, data.last),
     ]
 
     assert_equal expected, set.find_all(a_dep)
@@ -97,14 +96,14 @@ class TestGemResolverAPISet < Gem::TestCase
 
     @fetcher.data["#{@dep_uri}a"] = "---\n1  "
 
-    set = @DR::APISet.new @dep_uri
+    set = Gem::Resolver::APISet.new @dep_uri
 
-    a_dep = @DR::DependencyRequest.new dep("a"), nil
+    a_dep = Gem::Resolver::DependencyRequest.new dep("a"), nil
 
     set.prefetch [a_dep]
 
     expected = [
-      @DR::APISpecification.new(set, data.first),
+      Gem::Resolver::APISpecification.new(set, data.first),
     ]
 
     assert_equal expected, set.find_all(a_dep)
@@ -113,10 +112,10 @@ class TestGemResolverAPISet < Gem::TestCase
   end
 
   def test_find_all_local
-    set = @DR::APISet.new @dep_uri
+    set = Gem::Resolver::APISet.new @dep_uri
     set.remote = false
 
-    a_dep = @DR::DependencyRequest.new dep("a"), nil
+    a_dep = Gem::Resolver::DependencyRequest.new dep("a"), nil
 
     assert_empty set.find_all(a_dep)
   end
@@ -126,9 +125,9 @@ class TestGemResolverAPISet < Gem::TestCase
 
     @fetcher.data["#{@dep_uri}a"] = "---"
 
-    set = @DR::APISet.new @dep_uri
+    set = Gem::Resolver::APISet.new @dep_uri
 
-    a_dep = @DR::DependencyRequest.new dep("a"), nil
+    a_dep = Gem::Resolver::DependencyRequest.new dep("a"), nil
 
     assert_empty set.find_all(a_dep)
 
@@ -143,10 +142,10 @@ class TestGemResolverAPISet < Gem::TestCase
     @fetcher.data["#{@dep_uri}a"] = "---\n1  \n"
     @fetcher.data["#{@dep_uri}b"] = "---"
 
-    set = @DR::APISet.new @dep_uri
+    set = Gem::Resolver::APISet.new @dep_uri
 
-    a_dep = @DR::DependencyRequest.new dep("a"), nil
-    b_dep = @DR::DependencyRequest.new dep("b"), nil
+    a_dep = Gem::Resolver::DependencyRequest.new dep("a"), nil
+    b_dep = Gem::Resolver::DependencyRequest.new dep("b"), nil
 
     set.prefetch [a_dep, b_dep]
 
@@ -159,10 +158,10 @@ class TestGemResolverAPISet < Gem::TestCase
 
     @fetcher.data["#{@dep_uri}a"] = "---\n1  \n"
 
-    set = @DR::APISet.new @dep_uri
+    set = Gem::Resolver::APISet.new @dep_uri
 
-    a_dep = @DR::DependencyRequest.new dep("a"), nil
-    b_dep = @DR::DependencyRequest.new dep("b"), nil
+    a_dep = Gem::Resolver::DependencyRequest.new dep("a"), nil
+    b_dep = Gem::Resolver::DependencyRequest.new dep("b"), nil
 
     set.prefetch [a_dep]
 
@@ -178,10 +177,10 @@ class TestGemResolverAPISet < Gem::TestCase
     @fetcher.data["#{@dep_uri}a"] = "---\n1  \n"
     @fetcher.data["#{@dep_uri}b"] = "---"
 
-    set = @DR::APISet.new @dep_uri
+    set = Gem::Resolver::APISet.new @dep_uri
 
-    a_dep = @DR::DependencyRequest.new dep("a"), nil
-    b_dep = @DR::DependencyRequest.new dep("b"), nil
+    a_dep = Gem::Resolver::DependencyRequest.new dep("a"), nil
+    b_dep = Gem::Resolver::DependencyRequest.new dep("b"), nil
 
     set.prefetch [a_dep, b_dep]
 
@@ -197,11 +196,11 @@ class TestGemResolverAPISet < Gem::TestCase
     @fetcher.data["#{@dep_uri}a"] = "---\n1  \n"
     @fetcher.data["#{@dep_uri}b"] = "---"
 
-    set = @DR::APISet.new @dep_uri
+    set = Gem::Resolver::APISet.new @dep_uri
     set.remote = false
 
-    a_dep = @DR::DependencyRequest.new dep("a"), nil
-    b_dep = @DR::DependencyRequest.new dep("b"), nil
+    a_dep = Gem::Resolver::DependencyRequest.new dep("a"), nil
+    b_dep = Gem::Resolver::DependencyRequest.new dep("b"), nil
 
     set.prefetch [a_dep, b_dep]
 
diff --git a/test/rubygems/test_gem_resolver_best_set.rb b/test/rubygems/test_gem_resolver_best_set.rb
index 9a588123bd..80aa883364 100644
--- a/test/rubygems/test_gem_resolver_best_set.rb
+++ b/test/rubygems/test_gem_resolver_best_set.rb
@@ -3,14 +3,8 @@
 require_relative "helper"
 
 class TestGemResolverBestSet < Gem::TestCase
-  def setup
-    super
-
-    @DR = Gem::Resolver
-  end
-
   def test_initialize
-    set = @DR::BestSet.new
+    set = Gem::Resolver::BestSet.new
 
     assert_empty set.sets
   end
@@ -22,11 +16,11 @@ class TestGemResolverBestSet < Gem::TestCase
       fetcher.spec "b", 1
     end
 
-    set = @DR::BestSet.new
+    set = Gem::Resolver::BestSet.new
 
     dependency = dep "a", "~> 1"
 
-    req = @DR::DependencyRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
 
     found = set.find_all req
 
@@ -38,7 +32,7 @@ class TestGemResolverBestSet < Gem::TestCase
       fetcher.spec "a", 1
     end
 
-    set = @DR::BestSet.new
+    set = Gem::Resolver::BestSet.new
 
     api_uri = URI(@gem_repo)
 
@@ -46,7 +40,7 @@ class TestGemResolverBestSet < Gem::TestCase
 
     dependency = dep "a", "~> 1"
 
-    req = @DR::DependencyRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
 
     found = set.find_all req
 
@@ -60,12 +54,12 @@ class TestGemResolverBestSet < Gem::TestCase
       fetcher.spec "b", 1
     end
 
-    set = @DR::BestSet.new
+    set = Gem::Resolver::BestSet.new
     set.remote = false
 
     dependency = dep "a", "~> 1"
 
-    req = @DR::DependencyRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
 
     found = set.find_all req
 
@@ -77,7 +71,7 @@ class TestGemResolverBestSet < Gem::TestCase
       fetcher.spec "a", 1
     end
 
-    set = @DR::BestSet.new
+    set = Gem::Resolver::BestSet.new
 
     set.prefetch []
 
@@ -89,7 +83,7 @@ class TestGemResolverBestSet < Gem::TestCase
       fetcher.spec "a", 1
     end
 
-    set = @DR::BestSet.new
+    set = Gem::Resolver::BestSet.new
     set.remote = false
 
     set.prefetch []
@@ -98,7 +92,7 @@ class TestGemResolverBestSet < Gem::TestCase
   end
 
   def test_replace_failed_api_set
-    set = @DR::BestSet.new
+    set = Gem::Resolver::BestSet.new
 
     api_uri = URI(@gem_repo) + "./info/"
     api_set = Gem::Resolver::APISet.new api_uri
@@ -119,7 +113,7 @@ class TestGemResolverBestSet < Gem::TestCase
   end
 
   def test_replace_failed_api_set_no_api_set
-    set = @DR::BestSet.new
+    set = Gem::Resolver::BestSet.new
 
     index_set = Gem::Resolver::IndexSet.new Gem::Source.new @gem_repo
 
@@ -135,7 +129,7 @@ class TestGemResolverBestSet < Gem::TestCase
   end
 
   def test_replace_failed_api_set_uri_with_credentials
-    set = @DR::BestSet.new
+    set = Gem::Resolver::BestSet.new
 
     api_uri = URI(@gem_repo) + "./info/"
     api_uri.user = "user"
diff --git a/test/rubygems/test_gem_resolver_conflict.rb b/test/rubygems/test_gem_resolver_conflict.rb
index 46831c2983..5696ff266d 100644
--- a/test/rubygems/test_gem_resolver_conflict.rb
+++ b/test/rubygems/test_gem_resolver_conflict.rb
@@ -36,16 +36,14 @@ class TestGemResolverConflict < Gem::TestCase
   end
 
   def test_explanation_user_request
-    @DR = Gem::Resolver
-
     spec = util_spec "a", 2
 
-    a1_req = @DR::DependencyRequest.new dep("a", "= 1"), nil
-    a2_req = @DR::DependencyRequest.new dep("a", "= 2"), nil
+    a1_req = Gem::Resolver::DependencyRequest.new dep("a", "= 1"), nil
+    a2_req = Gem::Resolver::DependencyRequest.new dep("a", "= 2"), nil
 
-    activated = @DR::ActivationRequest.new spec, a2_req
+    activated = Gem::Resolver::ActivationRequest.new spec, a2_req
 
-    conflict = @DR::Conflict.new a1_req, activated
+    conflict = Gem::Resolver::Conflict.new a1_req, activated
 
     expected = <<-EXPECTED
   Activated a-2
diff --git a/test/rubygems/test_gem_resolver_dependency_request.rb b/test/rubygems/test_gem_resolver_dependency_request.rb
index d8836da0aa..3e14771da8 100644
--- a/test/rubygems/test_gem_resolver_dependency_request.rb
+++ b/test/rubygems/test_gem_resolver_dependency_request.rb
@@ -3,22 +3,16 @@
 require_relative "helper"
 
 class TestGemResolverDependencyRequest < Gem::TestCase
-  def setup
-    super
-
-    @DR = Gem::Resolver::DependencyRequest
-  end
-
   def test_development_eh
     a_dep = dep "a", ">= 1"
 
-    a_dep_req = @DR.new a_dep, nil
+    a_dep_req = Gem::Resolver::DependencyRequest.new a_dep, nil
 
     refute a_dep_req.development?
 
     b_dep = dep "b", ">= 1", :development
 
-    b_dep_req = @DR.new b_dep, nil
+    b_dep_req = Gem::Resolver::DependencyRequest.new b_dep, nil
 
     assert b_dep_req.development?
   end
@@ -27,7 +21,7 @@ class TestGemResolverDependencyRequest < Gem::TestCase
     spec = util_spec "a", 1
     dependency = dep "a", ">= 1"
 
-    dr = @DR.new dependency, nil
+    dr = Gem::Resolver::DependencyRequest.new dependency, nil
 
     assert dr.match? spec
   end
@@ -36,12 +30,12 @@ class TestGemResolverDependencyRequest < Gem::TestCase
     spec = util_spec "a", "1.a"
 
     a_dep = dep "a", ">= 1"
-    a_dr = @DR.new a_dep, nil
+    a_dr = Gem::Resolver::DependencyRequest.new a_dep, nil
 
     refute a_dr.match? spec
 
     a_pre_dep = dep "a", ">= 1.a"
-    a_pre_dr = @DR.new a_pre_dep, nil
+    a_pre_dr = Gem::Resolver::DependencyRequest.new a_pre_dep, nil
 
     assert a_pre_dr.match? spec
   end
@@ -50,7 +44,7 @@ class TestGemResolverDependencyRequest < Gem::TestCase
     spec = util_spec "a", "2.a"
 
     a_dep = dep "a", ">= 1"
-    a_dr = @DR.new a_dep, nil
+    a_dr = Gem::Resolver::DependencyRequest.new a_dep, nil
 
     assert a_dr.match? spec, true
   end
@@ -59,7 +53,7 @@ class TestGemResolverDependencyRequest < Gem::TestCase
     spec = util_spec "a", 1
     dependency = dep "a", ">= 1"
 
-    dr = @DR.new dependency, nil
+    dr = Gem::Resolver::DependencyRequest.new dependency, nil
 
     assert dr.matches_spec? spec
   end
@@ -68,7 +62,7 @@ class TestGemResolverDependencyRequest < Gem::TestCase
     spec = util_spec "a", "1.a"
 
     dependency = dep "a", ">= 0"
-    dr = @DR.new dependency, nil
+    dr = Gem::Resolver::DependencyRequest.new dependency, nil
 
     assert dr.matches_spec? spec
   end
@@ -76,7 +70,7 @@ class TestGemResolverDependencyRequest < Gem::TestCase
   def test_requirement
     dependency = dep "a", ">= 1"
 
-    dr = @DR.new dependency, nil
+    dr = Gem::Resolver::DependencyRequest.new dependency, nil
 
     assert_equal dependency, dr.dependency
   end
diff --git a/test/rubygems/test_gem_resolver_index_set.rb b/test/rubygems/test_gem_resolver_index_set.rb
index 76217fe296..8ff1acbf1e 100644
--- a/test/rubygems/test_gem_resolver_index_set.rb
+++ b/test/rubygems/test_gem_resolver_index_set.rb
@@ -3,14 +3,8 @@
 require_relative "helper"
 
 class TestGemResolverIndexSet < Gem::TestCase
-  def setup
-    super
-
-    @DR = Gem::Resolver
-  end
-
   def test_initialize
-    set = @DR::IndexSet.new
+    set = Gem::Resolver::IndexSet.new
 
     fetcher = set.instance_variable_get :@f
 
@@ -18,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
 
@@ -34,11 +28,11 @@ class TestGemResolverIndexSet < Gem::TestCase
       fetcher.spec "b", 1
     end
 
-    set = @DR::IndexSet.new
+    set = Gem::Resolver::IndexSet.new
 
     dependency = dep "a", "~> 1"
 
-    req = @DR::DependencyRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
 
     found = set.find_all req
 
@@ -52,12 +46,12 @@ class TestGemResolverIndexSet < Gem::TestCase
       fetcher.spec "b", 1
     end
 
-    set = @DR::IndexSet.new
+    set = Gem::Resolver::IndexSet.new
     set.remote = false
 
     dependency = dep "a", "~> 1"
 
-    req = @DR::DependencyRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
 
     assert_empty set.find_all req
   end
@@ -67,11 +61,11 @@ class TestGemResolverIndexSet < Gem::TestCase
       fetcher.spec "a", "1.a"
     end
 
-    set = @DR::IndexSet.new
+    set = Gem::Resolver::IndexSet.new
 
     dependency = dep "a"
 
-    req = @DR::DependencyRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
 
     found = set.find_all req
 
@@ -79,7 +73,7 @@ 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
 
diff --git a/test/rubygems/test_gem_resolver_lock_specification.rb b/test/rubygems/test_gem_resolver_lock_specification.rb
index 7b5a03459c..402f5d1509 100644
--- a/test/rubygems/test_gem_resolver_lock_specification.rb
+++ b/test/rubygems/test_gem_resolver_lock_specification.rb
@@ -8,14 +8,12 @@ class TestGemResolverLockSpecification < Gem::TestCase
   def setup
     super
 
-    @LS = Gem::Resolver::LockSpecification
-
     @source = Gem::Source.new @gem_repo
     @set    = Gem::Resolver::LockSet.new [@source]
   end
 
   def test_initialize
-    spec = @LS.new @set, "a", v(2), [@source], Gem::Platform::RUBY
+    spec = Gem::Resolver::LockSpecification.new @set, "a", v(2), [@source], Gem::Platform::RUBY
 
     assert_equal "a",                 spec.name
     assert_equal v(2),                spec.version
@@ -25,7 +23,7 @@ class TestGemResolverLockSpecification < Gem::TestCase
   end
 
   def test_add_dependency
-    l_spec = @LS.new @set, "a", v(2), [@source], Gem::Platform::RUBY
+    l_spec = Gem::Resolver::LockSpecification.new @set, "a", v(2), [@source], Gem::Platform::RUBY
 
     b_dep = dep("b", ">= 0")
 
@@ -39,7 +37,7 @@ class TestGemResolverLockSpecification < Gem::TestCase
       fetcher.download "a", 2
     end
 
-    spec = @LS.new @set, "a", v(2), [@source], Gem::Platform::RUBY
+    spec = Gem::Resolver::LockSpecification.new @set, "a", v(2), [@source], Gem::Platform::RUBY
 
     called = false
 
@@ -51,7 +49,7 @@ class TestGemResolverLockSpecification < Gem::TestCase
   end
 
   def test_install_installed
-    spec = @LS.new @set, "a", v(2), [@source], Gem::Platform::RUBY
+    spec = Gem::Resolver::LockSpecification.new @set, "a", v(2), [@source], Gem::Platform::RUBY
 
     FileUtils.touch File.join(@gemhome, "specifications", spec.spec.spec_name)
 
@@ -67,7 +65,7 @@ class TestGemResolverLockSpecification < Gem::TestCase
   def test_spec
     version = v(2)
 
-    l_spec = @LS.new @set, "a", version, [@source], Gem::Platform::RUBY
+    l_spec = Gem::Resolver::LockSpecification.new @set, "a", version, [@source], Gem::Platform::RUBY
 
     b_dep = dep "b", ">= 0"
     c_dep = dep "c", "~> 1"
@@ -91,7 +89,7 @@ class TestGemResolverLockSpecification < Gem::TestCase
 
     version = v(2)
 
-    l_spec = @LS.new @set, "a", version, [@source], Gem::Platform::RUBY
+    l_spec = Gem::Resolver::LockSpecification.new @set, "a", version, [@source], Gem::Platform::RUBY
 
     assert_same real_spec, l_spec.spec
   end
diff --git a/test/rubygems/test_gem_security.rb b/test/rubygems/test_gem_security.rb
index 110d741310..82449a8626 100644
--- a/test/rubygems/test_gem_security.rb
+++ b/test/rubygems/test_gem_security.rb
@@ -19,17 +19,11 @@ class TestGemSecurity < Gem::TestCase
   CHILD_CERT     = load_cert "child"
   EXPIRED_CERT   = load_cert "expired"
 
-  def setup
-    super
-
-    @SEC = Gem::Security
-  end
-
   def test_class_create_cert
     name = PUBLIC_CERT.subject
     key = PRIVATE_KEY
 
-    cert = @SEC.create_cert name, key, 60, Gem::Security::EXTENSIONS, 5
+    cert = Gem::Security.create_cert name, key, 60, Gem::Security::EXTENSIONS, 5
 
     assert_kind_of OpenSSL::X509::Certificate, cert
 
@@ -62,7 +56,7 @@ class TestGemSecurity < Gem::TestCase
   def test_class_create_cert_self_signed
     subject = PUBLIC_CERT.subject
 
-    cert = @SEC.create_cert_self_signed subject, PRIVATE_KEY, 60
+    cert = Gem::Security.create_cert_self_signed subject, PRIVATE_KEY, 60
 
     assert_equal "/CN=nobody/DC=example", cert.issuer.to_s
     assert_equal "sha256WithRSAEncryption", cert.signature_algorithm
@@ -73,7 +67,7 @@ class TestGemSecurity < Gem::TestCase
     name = PUBLIC_CERT.subject
     key = PRIVATE_KEY
 
-    cert = @SEC.create_cert_email email, key, 60
+    cert = Gem::Security.create_cert_email email, key, 60
 
     assert_kind_of OpenSSL::X509::Certificate, cert
 
@@ -105,20 +99,20 @@ class TestGemSecurity < Gem::TestCase
   end
 
   def test_class_create_key
-    key = @SEC.create_key "rsa"
+    key = Gem::Security.create_key "rsa"
 
     assert_kind_of OpenSSL::PKey::RSA, key
   end
 
   def test_class_create_key_downcases
-    key = @SEC.create_key "DSA"
+    key = Gem::Security.create_key "DSA"
 
     assert_kind_of OpenSSL::PKey::DSA, key
   end
 
   def test_class_create_key_raises_unknown_algorithm
     e = assert_raise Gem::Security::Exception do
-      @SEC.create_key "NOT_RSA"
+      Gem::Security.create_key "NOT_RSA"
     end
 
     assert_equal "NOT_RSA algorithm not found. RSA, DSA, and EC algorithms are supported.",
@@ -128,27 +122,27 @@ class TestGemSecurity < Gem::TestCase
   def test_class_get_public_key_rsa
     pkey_pem = PRIVATE_KEY.public_key.to_pem
 
-    assert_equal pkey_pem, @SEC.get_public_key(PRIVATE_KEY).to_pem
+    assert_equal pkey_pem, Gem::Security.get_public_key(PRIVATE_KEY).to_pem
   end
 
   def test_class_get_public_key_ec
-    pkey = @SEC.get_public_key(EC_KEY)
+    pkey = Gem::Security.get_public_key(EC_KEY)
 
     assert_respond_to pkey, :to_pem
   end
 
   def test_class_email_to_name
     assert_equal "/CN=nobody/DC=example",
-                 @SEC.email_to_name("nobody@example").to_s
+                 Gem::Security.email_to_name("nobody@example").to_s
 
     assert_equal "/CN=nobody/DC=example/DC=com",
-                 @SEC.email_to_name("nobody@example.com").to_s
+                 Gem::Security.email_to_name("nobody@example.com").to_s
 
     assert_equal "/CN=no.body/DC=example",
-                 @SEC.email_to_name("no.body@example").to_s
+                 Gem::Security.email_to_name("no.body@example").to_s
 
     assert_equal "/CN=no_body/DC=example",
-                 @SEC.email_to_name("no+body@example").to_s
+                 Gem::Security.email_to_name("no+body@example").to_s
   end
 
   def test_class_re_sign
@@ -188,11 +182,11 @@ class TestGemSecurity < Gem::TestCase
   end
 
   def test_class_reset
-    trust_dir = @SEC.trust_dir
+    trust_dir = Gem::Security.trust_dir
 
-    @SEC.reset
+    Gem::Security.reset
 
-    refute_equal trust_dir, @SEC.trust_dir
+    refute_equal trust_dir, Gem::Security.trust_dir
   end
 
   def test_class_sign
@@ -206,7 +200,7 @@ class TestGemSecurity < Gem::TestCase
     cert.subject    = signee
     cert.public_key = key.public_key
 
-    signed = @SEC.sign cert, key, PUBLIC_CERT, 60
+    signed = Gem::Security.sign cert, key, PUBLIC_CERT, 60
 
     assert_equal    key.public_key.to_pem, signed.public_key.to_pem
     assert_equal    signee.to_s,           signed.subject.to_s
@@ -241,9 +235,9 @@ class TestGemSecurity < Gem::TestCase
     issuer = PUBLIC_CERT.subject
     signee = OpenSSL::X509::Name.parse "/CN=signee/DC=example"
 
-    cert = @SEC.create_cert_email "signee@example", PRIVATE_KEY
+    cert = Gem::Security.create_cert_email "signee@example", PRIVATE_KEY
 
-    signed = @SEC.sign cert, PRIVATE_KEY, PUBLIC_CERT, 60
+    signed = Gem::Security.sign cert, PRIVATE_KEY, PUBLIC_CERT, 60
 
     assert_equal    PUBLIC_KEY.to_pem, signed.public_key.to_pem
     assert_equal    signee.to_s,       signed.subject.to_s
@@ -280,7 +274,7 @@ class TestGemSecurity < Gem::TestCase
   end
 
   def test_class_trust_dir
-    trust_dir = @SEC.trust_dir
+    trust_dir = Gem::Security.trust_dir
 
     expected = File.join Gem.user_home, ".gem/trust"
 
@@ -288,11 +282,11 @@ class TestGemSecurity < Gem::TestCase
   end
 
   def test_class_write
-    key = @SEC.create_key "rsa"
+    key = Gem::Security.create_key "rsa"
 
     path = File.join @tempdir, "test-private_key.pem"
 
-    @SEC.write key, path
+    Gem::Security.write key, path
 
     assert_path_exist path
 
@@ -302,13 +296,13 @@ class TestGemSecurity < Gem::TestCase
   end
 
   def test_class_write_encrypted
-    key = @SEC.create_key "rsa"
+    key = Gem::Security.create_key "rsa"
 
     path = File.join @tempdir, "test-private_encrypted_key.pem"
 
     passphrase = "It should be long."
 
-    @SEC.write key, path, 0o600, passphrase
+    Gem::Security.write key, path, 0o600, passphrase
 
     assert_path_exist path
 
@@ -318,7 +312,7 @@ class TestGemSecurity < Gem::TestCase
   end
 
   def test_class_write_encrypted_cipher
-    key = @SEC.create_key "rsa"
+    key = Gem::Security.create_key "rsa"
 
     path = File.join @tempdir, "test-private_encrypted__with_non_default_cipher_key.pem"
 
@@ -326,7 +320,7 @@ class TestGemSecurity < Gem::TestCase
 
     cipher = OpenSSL::Cipher.new "AES-192-CBC"
 
-    @SEC.write key, path, 0o600, passphrase, cipher
+    Gem::Security.write key, path, 0o600, passphrase, cipher
 
     assert_path_exist path