Move compact index tests to test/lib directory

Author: jenshenny

test/helpers/compact_index_helpers.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module CompactIndexHelpers
+  def build_version(**args)
+    name = args.fetch(:name, "test_gem")
+    number = args.fetch(:number, "1.0")
+    CompactIndex::GemVersion.new(
+      number,
+      args[:platform],
+      args.fetch(:checksum, "sum+#{name}+#{number}"),
+      args.fetch(:info_checksum, "info+#{name}+#{number}"),
+      args[:dependencies],
+      args[:ruby_version],
+      args[:rubygems_version]
+    )
+  end
+end

test/lib/compact_index/dependency_test.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "compact_index"
+
+class CompactIndex::DependencyTest < ActiveSupport::TestCase
+  context "#version_and_platform" do
+    should "include platform for non-ruby platform" do
+      dep = CompactIndex::Dependency.new("foo", "=1.0", "jruby", "abc")
+
+      assert_equal "=1.0-jruby", dep.version_and_platform
+    end
+
+    should "exclude platform for ruby platform" do
+      dep = CompactIndex::Dependency.new("foo", "=1.0", "ruby", "abc")
+
+      assert_equal "=1.0", dep.version_and_platform
+    end
+  end
+end

test/lib/compact_index/gem_version_test.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "compact_index"
+require "helpers/compact_index_helpers"
+
+class CompactIndex::GemVersionTest < ActiveSupport::TestCase
+  include CompactIndexHelpers
+
+  context "#<=>" do
+    should "sort by number" do
+      v1 = build_version(number: "1.0")
+      v2 = build_version(number: "2.0")
+
+      assert_equal(-1, v1 <=> v2)
+      assert_equal 1, v2 <=> v1
+    end
+
+    should "sort by platform when numbers are equal" do
+      v1 = build_version(number: "1.0", platform: "java")
+      v2 = build_version(number: "1.0", platform: "ruby")
+
+      assert_equal(-1, v1 <=> v2)
+    end
+
+    should "return zero for equal versions" do
+      v1 = build_version(number: "1.0", platform: "ruby")
+      v2 = build_version(number: "1.0", platform: "ruby")
+
+      assert_equal 0, v1 <=> v2
+    end
+  end
+end

…unit/compact_index_versions_file_test.rb …/lib/compact_index/versions_file_test.rbtest/unit/compact_index_versions_file_test.rb renamed to test/lib/compact_index/versions_file_test.rb test/unit/compact_index_versions_file_test.rb renamed to test/lib/compact_index/versions_file_test.rb

@@ -2,8 +2,11 @@
 
 require "test_helper"
 require "compact_index"
+require "helpers/compact_index_helpers"
+
+class CompactIndex::VersionsFileTest < ActiveSupport::TestCase
+  include CompactIndexHelpers
 
-class CompactIndexVersionsFileTest < ActiveSupport::TestCase
   setup do
     @file_contents = "gem1 1.1,1.2\ngem2 2.1,2.1-jruby\n"
     @file = Tempfile.new("versions.list")
@@ -17,9 +20,16 @@ class CompactIndexVersionsFileTest < ActiveSupport::TestCase
   end
 
   context "#create" do
+    setup do
+      @create_file = Tempfile.new("create_versions.list")
+      @create_versions_file = CompactIndex::VersionsFile.new(@create_file.path)
+    end
+
+    teardown do
+      @create_file&.unlink
+    end
+
     should "write one line per gem" do
-      file = Tempfile.new("create_versions.list")
-      versions_file = CompactIndex::VersionsFile.new(file.path)
       gem2_versions = [
         build_version(name: "gem2", number: "1.0.1"),
         build_version(name: "gem2", number: "1.0.2", platform: "arch")
@@ -30,48 +40,42 @@ class CompactIndexVersionsFileTest < ActiveSupport::TestCase
       ]
 
       freeze_time do
-        versions_file.create(gems)
+        @create_versions_file.create(gems)
         expected = "created_at: #{Time.now.iso8601}\n---\n" \
                    "gem2 1.0.1,1.0.2-arch info+gem2+1.0.2\n" \
                    "gem5 1.0.1 info+gem5+1.0.1\n"
 
-        assert_equal expected, file.open.read
+        assert_equal expected, @create_file.open.read
       end
     end
 
     should "add the date on top" do
-      file = Tempfile.new("create_versions.list")
-      versions_file = CompactIndex::VersionsFile.new(file.path)
       gems = [CompactIndex::Gem.new("gem1", [build_version])]
 
       freeze_time do
-        versions_file.create(gems)
+        @create_versions_file.create(gems)
 
-        assert file.open.read.start_with?("created_at: #{Time.now.iso8601}\n")
+        assert @create_file.open.read.start_with?("created_at: #{Time.now.iso8601}\n")
       end
     end
 
     should "order gems by name" do
-      file = Tempfile.new("versions-sort")
-      versions_file = CompactIndex::VersionsFile.new(file.path)
       gems = [
         CompactIndex::Gem.new("gem_b", [build_version]),
         CompactIndex::Gem.new("gem_a", [build_version])
       ]
 
       freeze_time do
-        versions_file.create(gems)
+        @create_versions_file.create(gems)
         expected = "created_at: #{Time.now.iso8601}\n---\n" \
                    "gem_a 1.0 info+test_gem+1.0\n" \
                    "gem_b 1.0 info+test_gem+1.0\n"
 
-        assert_equal expected, file.open.read
+        assert_equal expected, @create_file.open.read
       end
     end
 
     should "use the given version order" do
-      file = Tempfile.new("versions-sort")
-      versions_file = CompactIndex::VersionsFile.new(file.path)
       versions = [
         build_version(number: "1.3.0"),
         build_version(number: "2.2"),
@@ -80,18 +84,16 @@ class CompactIndexVersionsFileTest < ActiveSupport::TestCase
         build_version(number: "2.1.2")
       ]
       gems = [CompactIndex::Gem.new("test", versions)]
-      versions_file.create(gems)
+      @create_versions_file.create(gems)
 
-      assert_includes file.open.read, "test 1.3.0,2.2,1.1.1,1.1.1,2.1.2 info+test_gem+2.1.2"
+      assert_includes @create_file.open.read, "test 1.3.0,2.2,1.1.1,1.1.1,2.1.2 info+test_gem+2.1.2"
     end
 
     should "use a custom timestamp when provided" do
-      file = Tempfile.new("create_versions.list")
-      versions_file = CompactIndex::VersionsFile.new(file.path)
       ts = Time.new(1999, 9, 9).iso8601
-      versions_file.create([], ts)
+      @create_versions_file.create([], ts)
 
-      assert file.open.read.start_with?("created_at: #{ts}")
+      assert @create_file.open.read.start_with?("created_at: #{ts}")
     end
   end
 
@@ -111,6 +113,8 @@ class CompactIndexVersionsFileTest < ActiveSupport::TestCase
       versions_file = CompactIndex::VersionsFile.new(file.path)
 
       assert_equal DateTime.parse("2015-08-23T17:22:53-07:00"), versions_file.updated_at
+    ensure
+      file&.unlink
     end
   end
 
@@ -157,20 +161,4 @@ class CompactIndexVersionsFileTest < ActiveSupport::TestCase
                    @versions_file.contents(gems, calculate_info_checksums: true))
     end
   end
-
-  private
-
-  def build_version(**args)
-    name = args.fetch(:name, "test_gem")
-    number = args.fetch(:number, "1.0")
-    CompactIndex::GemVersion.new(
-      number,
-      args[:platform],
-      args.fetch(:checksum, "sum+#{name}+#{number}"),
-      args.fetch(:info_checksum, "info+#{name}+#{number}"),
-      args[:dependencies],
-      args[:ruby_version],
-      args[:rubygems_version]
-    )
-  end
 end

test/unit/compact_index_lib_test.rb test/lib/compact_index_test.rbtest/unit/compact_index_lib_test.rb renamed to test/lib/compact_index_test.rb

@@ -2,10 +2,11 @@
 
 require "test_helper"
 require "compact_index"
+require "helpers/compact_index_helpers"
+
+class CompactIndexTest < ActiveSupport::TestCase
+  include CompactIndexHelpers
 
-# Named CompactIndexLibTest to avoid superclass mismatch with
-# CompactIndexTest < ActionDispatch::IntegrationTest in test/integration/api/compact_index_test.rb
-class CompactIndexLibTest < ActiveSupport::TestCase
   context ".names" do
     should "return the gem list for one gem name" do
       assert_equal "---\ngem\n", CompactIndex.names(["gem"])
@@ -121,58 +122,4 @@ class CompactIndexLibTest < ActiveSupport::TestCase
       assert_equal "---\n1.0.1-jruby |checksum:sum+test_gem+1.0.1\n", CompactIndex.info(param)
     end
   end
-
-  context "GemVersion#<=>" do
-    should "sort by number" do
-      v1 = build_version(number: "1.0")
-      v2 = build_version(number: "2.0")
-
-      assert_equal(-1, v1 <=> v2)
-      assert_equal 1, v2 <=> v1
-    end
-
-    should "sort by platform when numbers are equal" do
-      v1 = build_version(number: "1.0", platform: "java")
-      v2 = build_version(number: "1.0", platform: "ruby")
-
-      assert_equal(-1, v1 <=> v2)
-    end
-
-    should "return zero for equal versions" do
-      v1 = build_version(number: "1.0", platform: "ruby")
-      v2 = build_version(number: "1.0", platform: "ruby")
-
-      assert_equal 0, v1 <=> v2
-    end
-  end
-
-  context "Dependency#version_and_platform" do
-    should "include platform for non-ruby platform" do
-      dep = CompactIndex::Dependency.new("foo", "=1.0", "jruby", "abc")
-
-      assert_equal "=1.0-jruby", dep.version_and_platform
-    end
-
-    should "exclude platform for ruby platform" do
-      dep = CompactIndex::Dependency.new("foo", "=1.0", "ruby", "abc")
-
-      assert_equal "=1.0", dep.version_and_platform
-    end
-  end
-
-  private
-
-  def build_version(**args)
-    name = args.fetch(:name, "test_gem")
-    number = args.fetch(:number, "1.0")
-    CompactIndex::GemVersion.new(
-      number,
-      args[:platform],
-      args.fetch(:checksum, "sum+#{name}+#{number}"),
-      args.fetch(:info_checksum, "info+#{name}+#{number}"),
-      args[:dependencies],
-      args[:ruby_version],
-      args[:rubygems_version]
-    )
-  end
 end