4 files changed, 414 insertions, 12 deletions
diff --git a/spec/ruby/library/coverage/result_spec.rb b/spec/ruby/library/coverage/result_spec.rb
index 6cf5be1346..33276778e8 100644
--- a/spec/ruby/library/coverage/result_spec.rb
+++ b/spec/ruby/library/coverage/result_spec.rb
@@ -8,10 +8,16 @@ describe 'Coverage.result' do
     @eval_code_file = fixture __FILE__, 'eval_code.rb'
   end
 
+  before :each do
+    Coverage.running?.should == false
+  end
+
   after :each do
     $LOADED_FEATURES.delete(@class_file)
     $LOADED_FEATURES.delete(@config_file)
     $LOADED_FEATURES.delete(@eval_code_file)
+
+    Coverage.result if Coverage.running?
   end
 
   it 'gives the covered files as a hash with arrays of count or nil' do
@@ -26,6 +32,41 @@ describe 'Coverage.result' do
     }
   end
 
+  ruby_version_is "3.2" do
+    it 'returns results for each mode separately when enabled :all modes' do
+      Coverage.start(:all)
+      require @class_file.chomp('.rb')
+      result = Coverage.result
+
+      result.should == {
+        @class_file => {
+          lines: [
+            nil, nil, 1, nil, nil, 1, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+          ],
+          branches: {},
+          methods: {
+            [SomeClass, :some_method, 6, 2, 11, 5] => 0
+          }
+        }
+      }
+    end
+
+    it 'returns results for each mode separately when enabled any mode explicitly' do
+      Coverage.start(lines: true)
+      require @class_file.chomp('.rb')
+      result = Coverage.result
+
+      result.should == {
+        @class_file =>
+          {
+            lines: [
+              nil, nil, 1, nil, nil, 1, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+            ]
+          }
+      }
+    end
+  end
+
   it 'no requires/loads should give empty hash' do
     Coverage.start
     result = Coverage.result
@@ -65,12 +106,14 @@ describe 'Coverage.result' do
     result.should == {}
   end
 
-  it 'second Coverage.start does nothing' do
-    Coverage.start
-    require @config_file.chomp('.rb')
-    result = Coverage.result
+  ruby_version_is ''...'3.1' do
+    it 'second Coverage.start does nothing' do
+      Coverage.start
+      require @config_file.chomp('.rb')
+      result = Coverage.result
 
-    result.should == { @config_file => [1, 1, 1] }
+      result.should == { @config_file => [1, 1, 1] }
+    end
   end
 
   it 'does not include the file starting coverage since it is not tracked' do
@@ -78,15 +121,237 @@ describe 'Coverage.result' do
     Coverage.result.should_not include(@config_file)
   end
 
-  it 'returns the correct results when eval is used' do
-    Coverage.start
-    require @eval_code_file.chomp('.rb')
-    result = Coverage.result
+  ruby_version_is '3.1'...'3.2' do
+    it 'returns the correct results when eval is used' do
+      Coverage.start
+      require @eval_code_file.chomp('.rb')
+      result = Coverage.result
 
-    result.should == {
+      result.should == {
         @eval_code_file => [
-            1, nil, 1, nil, 1, nil, nil, nil, nil, nil, 1
+          1, nil, 1, nil, 1, nil, nil, nil, nil, nil, 1
         ]
+      }
+    end
+  end
+
+  ruby_version_is '3.2' do
+    it 'returns the correct results when eval coverage is enabled' do
+      Coverage.supported?(:eval).should == true
+
+      Coverage.start(lines: true, eval: true)
+      require @eval_code_file.chomp('.rb')
+      result = Coverage.result
+
+      result.should == {
+        @eval_code_file => {
+          lines: [1, nil, 1, nil, 1, 1, nil, nil, nil, nil, 1]
+        }
+      }
+    end
+
+    it 'returns the correct results when eval coverage is disabled' do
+      Coverage.supported?(:eval).should == true
+
+      Coverage.start(lines: true, eval: false)
+      require @eval_code_file.chomp('.rb')
+      result = Coverage.result
+
+      result.should == {
+        @eval_code_file => {
+          lines: [1, nil, 1, nil, 1, nil, nil, nil, nil, nil, 1]
+        }
+      }
+    end
+  end
+
+  it "disables coverage measurement when stop option is not specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    Coverage.result
+    Coverage.running?.should == false
+  end
+
+  it "disables coverage measurement when stop: true option is specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    -> {
+      Coverage.result(stop: true)
+    }.should complain(/warning: stop implies clear/)
+
+    Coverage.running?.should == false
+  end
+
+  it "does not disable coverage measurement when stop: false option is specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    Coverage.result(stop: false)
+    Coverage.running?.should == true
+  end
+
+  it "does not disable coverage measurement when stop option is not specified but clear: true specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    Coverage.result(clear: true)
+    Coverage.running?.should == true
+  end
+
+  it "does not disable coverage measurement when stop option is not specified but clear: false specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    Coverage.result(clear: false)
+    Coverage.running?.should == true
+  end
+
+  it "disables coverage measurement when stop: true and clear: true specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    Coverage.result(stop: true, clear: true)
+    Coverage.running?.should == false
+  end
+
+  it "disables coverage measurement when stop: true and clear: false specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    -> {
+      Coverage.result(stop: true, clear: false)
+    }.should complain(/warning: stop implies clear/)
+
+    Coverage.running?.should == false
+  end
+
+  it "does not disable coverage measurement when stop: false and clear: true specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    Coverage.result(stop: false, clear: true)
+    Coverage.running?.should == true
+  end
+
+  it "does not disable coverage measurement when stop: false and clear: false specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    Coverage.result(stop: false, clear: false)
+    Coverage.running?.should == true
+  end
+
+  it "resets counters (remove them) when stop: true specified but clear option is not specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    -> {
+      Coverage.result(stop: true) # clears counters
+    }.should complain(/warning: stop implies clear/)
+
+    Coverage.start
+    Coverage.peek_result.should == {}
+  end
+
+  it "resets counters (remove them) when stop: true and clear: true specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    Coverage.result(stop: true, clear: true) # clears counters
+
+    Coverage.start
+    Coverage.peek_result.should == {}
+  end
+
+  it "resets counters (remove them) when stop: true and clear: false specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    -> {
+      Coverage.result(stop: true, clear: false) # clears counters
+    }.should complain(/warning: stop implies clear/)
+
+    Coverage.start
+    Coverage.peek_result.should == {}
+  end
+
+  it "resets counters (remove them) when both stop and clear options are not specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    Coverage.result # clears counters
+
+    Coverage.start
+    Coverage.peek_result.should == {}
+  end
+
+  it "clears counters (sets 0 values) when stop is not specified but clear: true specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    Coverage.result(clear: true) # clears counters
+
+    Coverage.peek_result.should == {
+      @class_file => [
+        nil, nil, 0, nil, nil, 0, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+      ]
     }
   end
+
+  it "does not clear counters when stop is not specified but clear: false specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    result = Coverage.result(clear: false) # doesn't clear counters
+    result.should == {
+      @class_file => [
+        nil, nil, 1, nil, nil, 1, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+      ]
+    }
+
+    Coverage.peek_result.should == result
+  end
+
+  it "does not clear counters when stop: false and clear is not specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    result = Coverage.result(stop: false) # doesn't clear counters
+    result.should == {
+      @class_file => [
+        nil, nil, 1, nil, nil, 1, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+      ]
+    }
+
+    Coverage.peek_result.should == result
+  end
+
+  it "clears counters (sets 0 values) when stop: false and clear: true specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    Coverage.result(stop: false, clear: true) # clears counters
+
+    Coverage.peek_result.should == {
+      @class_file => [
+        nil, nil, 0, nil, nil, 0, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+      ]
+    }
+  end
+
+  it "does not clear counters when stop: false and clear: false specified" do
+    Coverage.start
+    require @class_file.chomp('.rb')
+
+    result = Coverage.result(stop: false, clear: false) # doesn't clear counters
+    result.should == {
+      @class_file => [
+        nil, nil, 1, nil, nil, 1, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+      ]
+    }
+
+    Coverage.peek_result.should == result
+  end
 end
diff --git a/spec/ruby/library/coverage/running_spec.rb b/spec/ruby/library/coverage/running_spec.rb
new file mode 100644
index 0000000000..e9cc7ada5a
--- /dev/null
+++ b/spec/ruby/library/coverage/running_spec.rb
@@ -0,0 +1,20 @@
+require_relative '../../spec_helper'
+require 'coverage'
+
+describe 'Coverage.running?' do
+  it "returns false if coverage is not started" do
+    Coverage.running?.should == false
+  end
+
+  it "returns true if coverage is started" do
+    Coverage.start
+    Coverage.running?.should == true
+    Coverage.result
+  end
+
+  it "returns false if coverage was started and stopped" do
+    Coverage.start
+    Coverage.result
+    Coverage.running?.should == false
+  end
+end
diff --git a/spec/ruby/library/coverage/start_spec.rb b/spec/ruby/library/coverage/start_spec.rb
index ddfad8b47c..7fccf2d5cf 100644
--- a/spec/ruby/library/coverage/start_spec.rb
+++ b/spec/ruby/library/coverage/start_spec.rb
@@ -2,5 +2,90 @@ require_relative '../../spec_helper'
 require 'coverage'
 
 describe 'Coverage.start' do
-  it 'needs to be reviewed for spec completeness'
+  before :each do
+    Coverage.should_not.running?
+  end
+
+  after :each do
+    Coverage.result(stop: true, clear: true) if Coverage.running?
+  end
+
+  it "enables the coverage measurement" do
+    Coverage.start
+    Coverage.should.running?
+  end
+
+  it "returns nil" do
+    Coverage.start.should == nil
+  end
+
+  ruby_version_is '3.1' do
+    it 'raises error when repeated Coverage.start call happens' do
+      Coverage.start
+
+      -> {
+        Coverage.start
+      }.should raise_error(RuntimeError, 'coverage measurement is already setup')
+    end
+  end
+
+  ruby_version_is '3.2' do
+    it "accepts :all optional argument" do
+      Coverage.start(:all)
+      Coverage.should.running?
+    end
+
+    it "accepts lines: optional keyword argument" do
+      Coverage.start(lines: true)
+      Coverage.should.running?
+    end
+
+    it "accepts branches: optional keyword argument" do
+      Coverage.start(branches: true)
+      Coverage.should.running?
+    end
+
+    it "accepts methods: optional keyword argument" do
+      Coverage.start(methods: true)
+      Coverage.should.running?
+    end
+
+    it "accepts eval: optional keyword argument" do
+      Coverage.start(eval: true)
+      Coverage.should.running?
+    end
+
+    it "accepts oneshot_lines: optional keyword argument" do
+      Coverage.start(oneshot_lines: true)
+      Coverage.should.running?
+    end
+
+    it "ignores unknown keyword arguments" do
+      Coverage.start(foo: true)
+      Coverage.should.running?
+    end
+
+    it "expects a Hash if not passed :all" do
+      -> {
+        Coverage.start(42)
+      }.should raise_error(TypeError, "no implicit conversion of Integer into Hash")
+    end
+
+    it "does not accept both lines: and oneshot_lines: keyword arguments" do
+      -> {
+        Coverage.start(lines: true, oneshot_lines: true)
+      }.should raise_error(RuntimeError, "cannot enable lines and oneshot_lines simultaneously")
+    end
+
+    it "enables the coverage measurement if passed options with `false` value" do
+      Coverage.start(lines: false, branches: false, methods: false, eval: false, oneshot_lines: false)
+      Coverage.should.running?
+    end
+
+    it "measures coverage within eval" do
+      Coverage.start(lines: true, eval: true)
+      eval("Object.new\n"*3, binding, "test.rb", 1)
+      Coverage.result["test.rb"].should == {lines: [1, 1, 1]}
+    end
+  end
 end
diff --git a/spec/ruby/library/coverage/supported_spec.rb b/spec/ruby/library/coverage/supported_spec.rb
new file mode 100644
index 0000000000..78b3784ee0
--- /dev/null
+++ b/spec/ruby/library/coverage/supported_spec.rb
@@ -0,0 +1,32 @@
+require_relative '../../spec_helper'
+require 'coverage'
+
+describe "Coverage.supported?" do
+  ruby_version_is "3.2" do
+    it "returns true or false if coverage measurement is supported for the given mode" do
+      [true, false].should.include?(Coverage.supported?(:lines))
+      [true, false].should.include?(Coverage.supported?(:branches))
+      [true, false].should.include?(Coverage.supported?(:methods))
+      [true, false].should.include?(Coverage.supported?(:eval))
+    end
+
+    it "returns false for not existing modes" do
+      Coverage.supported?(:foo).should == false
+      Coverage.supported?(:bar).should == false
+    end
+
+    it "raise TypeError if argument is not Symbol" do
+      -> {
+        Coverage.supported?("lines")
+      }.should raise_error(TypeError, "wrong argument type String (expected Symbol)")
+
+      -> {
+        Coverage.supported?([])
+      }.should raise_error(TypeError, "wrong argument type Array (expected Symbol)")
+
+      -> {
+        Coverage.supported?(1)
+      }.should raise_error(TypeError, "wrong argument type Integer (expected Symbol)")
+    end
+  end
+end