coverband 4.2.0 → 4.2.4

data/test/coverband/adapters/base_test.rb

@@ -3,49 +3,80 @@
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
 class AdaptersBaseTest < Minitest::Test
-  def setup
-    super
-    @test_file_path = '/tmp/coverband_filestore_test_path.json'
-    @store = Coverband::Adapters::FileStore.new(@test_file_path)
-    mock_file_hash
+
+  def test_abstract_methods
+    abstract_methods = %w(clear! clear_file! migrate! size save_coverage coverage)
+    abstract_methods.each do |method|
+      assert_raises RuntimeError do
+        Coverband::Adapters::Base.new.send(method.to_sym)
+      end
+    end
+  end
+
+  def test_size_in_mib
+    base = Coverband::Adapters::Base.new
+    def base.size
+      3.0
+    end
+    assert_equal "0.00", base.size_in_mib
   end
 
-  def test_covered_merge
-    old_time = 1541958097
-    current_time = Time.now.to_i
-    old_data = {
-      'first_updated_at' => old_time,
-      'last_updated_at' => current_time,
-      'file_hash' => 'abcd',
-      'data' => [5, 7, nil]
-    }
-    old_report = { '/projects/coverband_demo/config/coverband.rb' => old_data,
-                   '/projects/coverband_demo/config/initializers/assets.rb' => old_data,
-                   '/projects/coverband_demo/config/initializers/cookies_serializer.rb' => old_data }
-    new_report = { '/projects/coverband_demo/config/coverband.rb' => [5, 7, nil],
-                   '/projects/coverband_demo/config/initializers/filter_logging.rb' => [5, 7, nil],
-                   '/projects/coverband_demo/config/initializers/wrap_parameters.rb' => [5, 7, nil],
-                   '/projects/coverband_demo/app/controllers/application_controller.rb' => [5, 7, nil] }
-    expected_merge = {
-      'first_updated_at' => old_time,
-      'last_updated_at' => current_time,
-      'file_hash' => 'abcd',
-      'data' => [10, 14, nil]
-    }
-    new_data = {
-      'first_updated_at' => current_time,
-      'last_updated_at' => current_time,
-      'file_hash' => 'abcd',
-      'data' => [5, 7, nil]
-    }
-    expected_result = {
-      '/projects/coverband_demo/app/controllers/application_controller.rb' => new_data,
-      '/projects/coverband_demo/config/coverband.rb' => expected_merge,
-      '/projects/coverband_demo/config/initializers/assets.rb' => old_data,
-      '/projects/coverband_demo/config/initializers/cookies_serializer.rb' => old_data,
-      '/projects/coverband_demo/config/initializers/filter_logging.rb' => new_data,
-      '/projects/coverband_demo/config/initializers/wrap_parameters.rb' => new_data
-    }
-    assert_equal expected_result, @store.send(:merge_reports, new_report, old_report)
+  def test_array_add
+    original = [5, 7, nil, nil]
+    latest = [3, 4, nil, 1]
+    assert_equal [8, 11, nil, nil], Coverband::Adapters::Base.new.send(:array_add, latest, original)
+    Coverband.configuration.stubs(:use_oneshot_lines_coverage).returns(true)
+    assert_equal [1, 1, nil, nil], Coverband::Adapters::Base.new.send(:array_add, latest, original)
+    Coverband.configuration.stubs(:use_oneshot_lines_coverage).returns(false)
+    Coverband.configuration.stubs(:simulate_oneshot_lines_coverage).returns(true)
+    assert_equal [1, 1, nil, nil], Coverband::Adapters::Base.new.send(:array_add, latest, original)
+  end
+
+  describe 'Coverband::Adapters::Base using file' do
+    def setup
+      super
+      @test_file_path = '/tmp/coverband_filestore_test_path.json'
+      @store = Coverband::Adapters::FileStore.new(@test_file_path)
+      mock_file_hash
+    end
+
+    def test_covered_merge
+      old_time = 1541958097
+      current_time = Time.now.to_i
+      old_data = {
+        'first_updated_at' => old_time,
+        'last_updated_at' => current_time,
+        'file_hash' => 'abcd',
+        'data' => [5, 7, nil]
+      }
+      old_report = { '/projects/coverband_demo/config/coverband.rb' => old_data,
+                     '/projects/coverband_demo/config/initializers/assets.rb' => old_data,
+                     '/projects/coverband_demo/config/initializers/cookies_serializer.rb' => old_data }
+      new_report = { '/projects/coverband_demo/config/coverband.rb' => [5, 7, nil],
+                     '/projects/coverband_demo/config/initializers/filter_logging.rb' => [5, 7, nil],
+                     '/projects/coverband_demo/config/initializers/wrap_parameters.rb' => [5, 7, nil],
+                     '/projects/coverband_demo/app/controllers/application_controller.rb' => [5, 7, nil] }
+      expected_merge = {
+        'first_updated_at' => old_time,
+        'last_updated_at' => current_time,
+        'file_hash' => 'abcd',
+        'data' => [10, 14, nil]
+      }
+      new_data = {
+        'first_updated_at' => current_time,
+        'last_updated_at' => current_time,
+        'file_hash' => 'abcd',
+        'data' => [5, 7, nil]
+      }
+      expected_result = {
+        '/projects/coverband_demo/app/controllers/application_controller.rb' => new_data,
+        '/projects/coverband_demo/config/coverband.rb' => expected_merge,
+        '/projects/coverband_demo/config/initializers/assets.rb' => old_data,
+        '/projects/coverband_demo/config/initializers/cookies_serializer.rb' => old_data,
+        '/projects/coverband_demo/config/initializers/filter_logging.rb' => new_data,
+        '/projects/coverband_demo/config/initializers/wrap_parameters.rb' => new_data
+      }
+      assert_equal expected_result, @store.send(:merge_reports, new_report, old_report)
+    end
   end
 end

data/test/coverband/adapters/file_store_test.rb

@@ -3,45 +3,56 @@
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
 class AdaptersFileStoreTest < Minitest::Test
-  def setup
-    super
-    @test_file_path = '/tmp/coverband_filestore_test_path.json'
-    File.open(@test_file_path, 'w') { |f| f.write(test_data.to_json) }
-    @store = Coverband::Adapters::FileStore.new(@test_file_path)
-  end
-
-  def test_covered_lines_for_file
-    assert_equal @store.covered_lines_for_file('dog.rb')[0],  1
-    assert_equal @store.covered_lines_for_file('dog.rb')[1],  2
-  end
-
-  def test_covered_lines_when_null
-    assert_equal @store.covered_lines_for_file('none.rb'), []
-  end
 
-  def test_covered_files
-    assert_equal @store.covered_files, ['dog.rb']
+  def test_covered_lines_when_no_file
+    @store = Coverband::Adapters::FileStore.new('')
+    expected = {}
+    assert_equal expected, @store.coverage
   end
 
-  def test_clear
-    @store.clear!
-    assert_equal false, File.exist?(@test_file_path)
-  end
-
-  def test_save_report
-    mock_file_hash
-    @store.send(:save_report, 'cat.rb' => [0, 1])
-    assert_equal @store.covered_lines_for_file('cat.rb')[1], 1
-  end
-
-  private
-
-  def test_data
-    {
-      'dog.rb' => { 'data' => [1, 2, nil],
-                    'file_hash' => 'abcd',
-                    'first_updated_at' => 1541968729,
-                    'last_updated_at' => 1541968729 }
-    }
+  describe 'Coverband::Adapters::FileStore with file' do
+    def setup
+      super
+      @test_file_path = '/tmp/coverband_filestore_test_path.json'
+      File.open(@test_file_path, 'w') { |f| f.write(test_data.to_json) }
+      @store = Coverband::Adapters::FileStore.new(@test_file_path)
+    end
+
+    def test_size
+      assert @store.size > 1
+    end
+
+    def test_coverage
+      assert_equal @store.coverage['dog.rb']['data'][0],  1
+      assert_equal @store.coverage['dog.rb']['data'][1],  2
+    end
+
+    def test_covered_lines_when_null
+      assert_nil @store.coverage['none.rb']
+    end
+
+    def test_covered_files
+      assert_equal @store.covered_files, ['dog.rb']
+    end
+
+    def test_clear
+      @store.clear!
+      assert_equal false, File.exist?(@test_file_path)
+    end
+
+    def test_save_report
+      mock_file_hash
+      @store.send(:save_report, 'cat.rb' => [0, 1])
+      assert_equal @store.coverage['cat.rb']['data'][1], 1
+    end
+
+    def test_data
+      {
+        'dog.rb' => { 'data' => [1, 2, nil],
+                      'file_hash' => 'abcd',
+                      'first_updated_at' => 1541968729,
+                      'last_updated_at' => 1541968729 }
+      }
+    end
   end
 end

data/test/coverband/adapters/hash_redis_store_test.rb

@@ -0,0 +1,195 @@
+# frozen_string_literal: true
+
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class HashRedisStoreTest < Minitest::Test
+  REDIS_STORAGE_FORMAT_VERSION = Coverband::Adapters::HashRedisStore::REDIS_STORAGE_FORMAT_VERSION
+
+  class MockRelativeFileConverter
+    def self.convert(file)
+      file.sub('app_path/', './')
+    end
+  end
+
+  def setup
+    super
+    @redis = Coverband::Test.redis
+    # FIXME: remove dependency on configuration and instead pass this in as an argument
+    Coverband.configure do |config|
+      config.root_paths = ['app_path/']
+    end
+    @store = Coverband::Adapters::HashRedisStore.new(@redis, redis_namespace: 'coverband_test', relative_file_converter: MockRelativeFileConverter)
+    Coverband.configuration.store = @store
+  end
+
+  def mock_time(time = Time.now)
+    Time.stubs(:now).returns(time)
+    time
+  end
+
+  def test_no_coverage
+    @store.save_report({})
+    assert_equal({}, @store.coverage)
+  end
+
+  class UnsupportedRedis
+    def info
+      { 'redis_version' => '2.5.0' }
+    end
+  end
+
+  def test_unsupported_redis
+    assert_raises RuntimeError do
+      Coverband::Adapters::HashRedisStore.new(UnsupportedRedis.new)
+    end
+  end
+
+  def test_coverage_for_file
+    yesterday = DateTime.now.prev_day.to_time
+    today = Time.now
+    mock_time(yesterday)
+    mock_file_hash
+    @store.save_report(
+      'app_path/dog.rb' => [0, 1, 2]
+    )
+    assert_equal(
+      {
+        'first_updated_at' => yesterday.to_i,
+        'last_updated_at' => yesterday.to_i,
+        'file_hash' => 'abcd',
+        'data' => [0, 1, 2]
+      },
+      @store.coverage['./dog.rb']
+    )
+    mock_time(today)
+    @store.save_report(
+      'app_path/dog.rb' => [1, 1, 0]
+    )
+    assert_equal(
+      {
+        'first_updated_at' => yesterday.to_i,
+        'last_updated_at' => today.to_i,
+        'file_hash' => 'abcd',
+        'data' => [1, 2, 2]
+      },
+      @store.coverage['./dog.rb']
+    )
+  end
+
+  def test_ttl_set
+    mock_file_hash(hash: 'abcd')
+    @store = Coverband::Adapters::HashRedisStore.new(@redis, redis_namespace: 'coverband_test', ttl: 3600, relative_file_converter: MockRelativeFileConverter)
+    @store.save_report(
+      'app_path/dog.rb' => [0, 1, 2]
+    )
+    assert_operator(@redis.ttl("#{REDIS_STORAGE_FORMAT_VERSION}.coverband_test.runtime../dog.rb.abcd"), :>, 0)
+  end
+
+  def test_no_ttl_set
+    mock_file_hash(hash: 'abcd')
+    @store = Coverband::Adapters::HashRedisStore.new(@redis, redis_namespace: 'coverband_test', ttl: nil, relative_file_converter: MockRelativeFileConverter)
+    @store.save_report(
+      'app_path/dog.rb' => [0, 1, 2]
+    )
+    assert_equal(-1, @redis.ttl("#{REDIS_STORAGE_FORMAT_VERSION}.coverband_test.runtime../dog.rb.abcd"))
+  end
+
+  def test_coverage_for_multiple_files
+    current_time = mock_time
+    mock_file_hash
+    data = {
+      'app_path/dog.rb' => [0, nil, 1, 2],
+      'app_path/cat.rb' => [1, 2, 0, 1, 5],
+      'app_path/ferrit.rb' => [1, 5, nil, 2, nil]
+    }
+    @store.save_report(data)
+    coverage = @store.coverage
+    assert_equal(
+      {
+        'first_updated_at' => current_time.to_i,
+        'last_updated_at' => current_time.to_i,
+        'file_hash' => 'abcd',
+        'data' => [0, nil, 1, 2]
+      }, @store.coverage['./dog.rb']
+    )
+    assert_equal [1, 2, 0, 1, 5], @store.coverage['./cat.rb']['data']
+    assert_equal [1, 5, nil, 2, nil], @store.coverage['./ferrit.rb']['data']
+  end
+
+  def test_file_hash_change
+    mock_file_hash(hash: 'abc')
+    @store.save_report('app_path/dog.rb' => [0, nil, 1, 2])
+    coverage = @store.coverage
+    assert_equal [0, nil, 1, 2], @store.coverage['./dog.rb']['data']
+    @store.instance_eval { @file_hash_cache = {} }
+    mock_file_hash(hash: '123')
+    assert_nil @store.coverage['./dog.rb']
+  end
+
+  def test_type
+    mock_file_hash
+    @store.type = :eager_loading
+    data = {
+      'app_path/dog.rb' => [0, nil, 1, 2]
+    }
+    @store.save_report(data)
+    assert_equal 1, @store.coverage.length
+    assert_equal [0, nil, 1, 2], @store.coverage['./dog.rb']['data']
+    # eager_loading doesn't set last_updated_at
+    assert_nil @store.coverage['./dog.rb']['last_updated_at']
+    @store.type = Coverband::RUNTIME_TYPE
+    data = {
+      'app_path/cat.rb' => [1, 2, 0, 1, 5]
+    }
+    current_time = Time.now.to_i
+    @store.save_report(data)
+    assert_equal 1, @store.coverage.length
+    assert_equal [1, 2, 0, 1, 5], @store.coverage['./cat.rb']['data']
+    assert current_time <= @store.coverage['./cat.rb']['last_updated_at']
+  end
+
+  def test_coverage_type
+    mock_file_hash
+    @store.type = :eager_loading
+    data = {
+      'app_path/dog.rb' => [0, nil, 1, 2]
+    }
+    @store.save_report(data)
+    @store.type = Coverband::RUNTIME_TYPE
+    assert_equal [0, nil, 1, 2], @store.coverage(:eager_loading)['./dog.rb']['data']
+  end
+
+  def test_clear
+    mock_file_hash
+    @store.type = Coverband::EAGER_TYPE
+    data = {
+      'app_path/dog.rb' => [0, nil, 1, 2]
+    }
+    @store.save_report(data)
+    assert_equal 1, @store.coverage.length
+    @store.type = Coverband::RUNTIME_TYPE
+    data = {
+      'app_path/cat.rb' => [1, 2, 0, 1, 5]
+    }
+    @store.save_report(data)
+    assert_equal 1, @store.coverage.length
+    @redis.set('random', 'data')
+    @store.clear!
+    @store.type = Coverband::RUNTIME_TYPE
+    assert @store.coverage.empty?
+    @store.type = :eager_loading
+    assert @store.coverage.empty?
+    assert_equal 'data', @redis.get('random')
+  end
+
+  def test_clear_file
+    mock_file_hash
+    @store.type = :eager_loading
+    @store.save_report('app_path/dog.rb' => [0, 1, 1])
+    @store.type = Coverband::RUNTIME_TYPE
+    @store.save_report('app_path/dog.rb' => [1, 0, 1])
+    assert_equal [1, 1, 2], @store.get_coverage_report[:merged]['./dog.rb']['data']
+    @store.clear_file!('app_path/dog.rb')
+    assert_nil @store.get_coverage_report[:merged]['./dog.rb']
+  end
+end

data/test/coverband/adapters/redis_store_test.rb

@@ -2,77 +2,120 @@
 
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
-class RedisTest < Minitest::Test
-  REDIS_STORAGE_FORMAT_VERSION = Coverband::Adapters::RedisStore::REDIS_STORAGE_FORMAT_VERSION
+unless ENV['COVERBAND_HASH_REDIS_STORE']
+  class RedisTest < Minitest::Test
+    REDIS_STORAGE_FORMAT_VERSION = Coverband::Adapters::RedisStore::REDIS_STORAGE_FORMAT_VERSION
 
-  def setup
-    super
-    @redis = Redis.new
-    @store = Coverband::Adapters::RedisStore.new(@redis)
-  end
+    def setup
+      super
+      @store = Coverband.configuration.store
+      @redis = @store.instance_variable_get(:@redis)
+    end
 
-  def test_coverage
-    mock_file_hash
-    expected = basic_coverage
-    @store.save_report(expected)
-    assert_equal expected.keys, @store.coverage.keys
-    @store.coverage.each_pair do |key, data|
-      assert_equal expected[key], data['data']
+    def test_coverage
+      mock_file_hash
+      expected = basic_coverage
+      @store.save_report(expected)
+      assert_equal expected.keys, @store.coverage.keys
+      @store.coverage.each_pair do |key, data|
+        assert_equal expected[key], data['data']
+      end
     end
-  end
 
-  def test_coverage_increments
-    mock_file_hash
-    expected = basic_coverage.dup
-    @store.save_report(basic_coverage.dup)
-    assert_equal expected.keys, @store.coverage.keys
-    @store.coverage.each_pair do |key, data|
-      assert_equal expected[key], data['data']
+    def test_coverage_increments
+      mock_file_hash
+      expected = basic_coverage.dup
+      @store.save_report(basic_coverage.dup)
+      assert_equal expected.keys, @store.coverage.keys
+      @store.coverage.each_pair do |key, data|
+        assert_equal expected[key], data['data']
+      end
+      current_time = Time.now.to_i
+      @store.save_report(basic_coverage.dup)
+      assert_equal [0, 2, 4], @store.coverage['app_path/dog.rb']['data']
+      assert current_time <= @store.coverage['app_path/dog.rb']['last_updated_at']
     end
-    @store.save_report(basic_coverage.dup)
-    assert_equal [0, 2, 4], @store.coverage['app_path/dog.rb']['data']
-  end
 
-  def test_store_coverage_by_type
-    mock_file_hash
-    expected = basic_coverage
-    @store.type = :eager_loading
-    @store.save_report(expected)
-    assert_equal expected.keys, @store.coverage.keys
-    @store.coverage.each_pair do |key, data|
-      assert_equal expected[key], data['data']
+    def test_file_hash_change
+      mock_file_hash(hash: 'abc')
+      @store.save_report('app_path/dog.rb' => [0, nil, 1, 2])
+      assert_equal [0, nil, 1, 2], @store.coverage['app_path/dog.rb']['data']
+      mock_file_hash(hash: '123')
+      assert_nil @store.coverage['app_path/dog.rb']
     end
 
-    @store.type = nil
-    assert_equal [], @store.coverage.keys
-  end
+    def test_store_coverage_by_type
+      mock_file_hash
+      expected = basic_coverage
+      @store.type = :eager_loading
+      @store.save_report(expected)
+      assert_equal expected.keys, @store.coverage.keys
+      @store.coverage.each_pair do |key, data|
+        assert_equal expected[key], data['data']
+      end
+      @store.type = Coverband::RUNTIME_TYPE
+      assert_equal [], @store.coverage.keys
+    end
 
-  def test_merged_coverage_with_types
-    mock_file_hash
-    assert_nil @store.type
-    @store.type = :eager_loading
-    @store.save_report('app_path/dog.rb' => [0, 1, 1])
-    @store.type = nil
-    @store.save_report('app_path/dog.rb' => [1, 0, 1])
-    assert_equal [1, 1, 2], @store.get_coverage_report[:merged]['app_path/dog.rb']['data']
-    assert_nil @store.type
-  end
+    def test_merged_coverage_with_types
+      mock_file_hash
+      assert_equal Coverband::RUNTIME_TYPE, @store.type
+      @store.type = :eager_loading
+      @store.save_report('app_path/dog.rb' => [0, 1, 1])
+      # eager_loading doesn't set last_updated_at
+      assert_nil @store.coverage['app_path/dog.rb']['last_updated_at']
+      @store.type = Coverband::RUNTIME_TYPE
+      current_time = Time.now.to_i
+      @store.save_report('app_path/dog.rb' => [1, 0, 1])
+      assert_equal [1, 1, 2], @store.get_coverage_report[:merged]['app_path/dog.rb']['data']
+      assert current_time <= @store.coverage['app_path/dog.rb']['last_updated_at']
+      assert_equal Coverband::RUNTIME_TYPE, @store.type
+    end
 
-  def test_covered_lines_for_file
-    mock_file_hash
-    expected = basic_coverage
-    @store.save_report(expected)
-    assert_equal example_line, @store.covered_lines_for_file('app_path/dog.rb')
-  end
+    def test_coverage_for_file
+      mock_file_hash
+      expected = basic_coverage
+      @store.save_report(expected)
+      assert_equal example_line, @store.coverage['app_path/dog.rb']['data']
+    end
 
-  def test_covered_lines_when_null
-    assert_equal [], @store.covered_lines_for_file('app_path/dog.rb')
-  end
+    def test_coverage_with_simulate_oneshot_lines_coverage
+      Coverband.configuration.stubs(:simulate_oneshot_lines_coverage).returns(true)
+      mock_file_hash
+      expected = basic_coverage
+      @store.save_report(expected)
+      assert_equal example_line, @store.get_coverage_report[:runtime]['app_path/dog.rb']['data']
+    end
 
-  def test_clear
-    @redis.expects(:del).twice
-    @store.clear!
-  end
+    def test_coverage_when_null
+      assert_nil @store.coverage['app_path/dog.rb']
+    end
+
+    def test_clear
+      @redis.expects(:del).times(3)
+      @store.clear!
+    end
 
+    def test_clear_file
+      mock_file_hash
+      @store.type = :eager_loading
+      @store.save_report('app_path/dog.rb' => [0, 1, 1])
+      @store.type = Coverband::RUNTIME_TYPE
+      @store.save_report('app_path/dog.rb' => [1, 0, 1])
+      assert_equal [1, 1, 2], @store.get_coverage_report[:merged]['app_path/dog.rb']['data']
+      @store.clear_file!('app_path/dog.rb')
+      assert_nil @store.get_coverage_report[:merged]['app_path/dog.rb']
+    end
+
+    def test_size
+      mock_file_hash
+      @store.type = :eager_loading
+      @store.save_report('app_path/dog.rb' => [0, 1, 1])
+      assert @store.size > 1
+    end
 
+    def test_base_key
+      assert @store.send(:base_key).end_with?(Coverband::RUNTIME_TYPE.to_s)
+    end
+  end
 end

data/test/coverband/at_exit_test.rb

@@ -9,5 +9,3 @@ class AtExitTest < Minitest::Test
     2.times { Coverband::AtExit.register }
   end
 end
-
-