Add in-tree mspec and ruby/spec

* For easier modifications of ruby/spec by MRI developers.
* .gitignore: track changes under spec.
* spec/mspec, spec/rubyspec: add in-tree mspec and ruby/spec.
  These files can therefore be updated like any other file in MRI.
  Instructions are provided in spec/README.
  [Feature #13156] [ruby-core:79246]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

7 files changed, 186 insertions, 0 deletions

diff --git a/spec/rubyspec/library/coverage/fixtures/second_class.rb b/spec/rubyspec/library/coverage/fixtures/second_class.rb
new file mode 100644
index 0000000000..0318ac26ff
--- /dev/null
+++ b/spec/rubyspec/library/coverage/fixtures/second_class.rb
@@ -0,0 +1,5 @@
+class SecondClass
+  def some_method
+    42
+  end
+end
diff --git a/spec/rubyspec/library/coverage/fixtures/some_class.rb b/spec/rubyspec/library/coverage/fixtures/some_class.rb
new file mode 100644
index 0000000000..52629f0332
--- /dev/null
+++ b/spec/rubyspec/library/coverage/fixtures/some_class.rb
@@ -0,0 +1,16 @@
+
+#Class comment
+class SomeClass
+
+  # Method comment
+  def some_method
+
+    # Inline method comment
+    actual_code = true
+
+  end
+
+end
+
+# Trailing comment and extra blank line
+
diff --git a/spec/rubyspec/library/coverage/fixtures/spec_helper.rb b/spec/rubyspec/library/coverage/fixtures/spec_helper.rb
new file mode 100644
index 0000000000..19094e5c36
--- /dev/null
+++ b/spec/rubyspec/library/coverage/fixtures/spec_helper.rb
@@ -0,0 +1,11 @@
+module CoverageSpecs
+  # Clear old results from the result hash
+  # https://bugs.ruby-lang.org/issues/12220
+  def self.filtered_result
+    result = Coverage.result
+    ruby_version_is ""..."2.4" do
+      result = result.reject { |_k, v| v.empty? }
+    end
+    result
+  end
+end
diff --git a/spec/rubyspec/library/coverage/fixtures/start_coverage.rb b/spec/rubyspec/library/coverage/fixtures/start_coverage.rb
new file mode 100644
index 0000000000..8a0c56c50a
--- /dev/null
+++ b/spec/rubyspec/library/coverage/fixtures/start_coverage.rb
@@ -0,0 +1,3 @@
+2 + 2
+Coverage.start
+1 + 1
diff --git a/spec/rubyspec/library/coverage/peek_result_spec.rb b/spec/rubyspec/library/coverage/peek_result_spec.rb
new file mode 100644
index 0000000000..44a2e2b83e
--- /dev/null
+++ b/spec/rubyspec/library/coverage/peek_result_spec.rb
@@ -0,0 +1,67 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require fixture __FILE__, 'spec_helper'
+require 'coverage'
+
+ruby_version_is '2.3' do
+  describe 'Coverage.peek_result' do
+    before :all do
+      @class_file = fixture __FILE__, 'some_class.rb'
+      @second_class_file = fixture __FILE__, 'second_class.rb'
+    end
+
+    after :each do
+      $LOADED_FEATURES.delete(@class_file)
+      $LOADED_FEATURES.delete(@second_class_file)
+    end
+
+    it 'returns the result so far' do
+      Coverage.start
+      require @class_file.chomp('.rb')
+      result = Coverage.peek_result
+      Coverage.result
+
+      result.should == {
+        @class_file => [
+          nil, nil, 1, nil, nil, 1, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+        ]
+      }
+    end
+
+    it 'immediate second call returns same result' do
+      Coverage.start
+      require @class_file.chomp('.rb')
+      result1 = Coverage.peek_result
+      result2 = Coverage.peek_result
+      Coverage.result
+
+      result2.should == result1
+    end
+
+    it 'second call after require returns accumulated result' do
+      Coverage.start
+      require @class_file.chomp('.rb')
+      Coverage.peek_result
+      require @second_class_file.chomp('.rb')
+      result = Coverage.peek_result
+      Coverage.result
+
+      result.should == {
+        @class_file => [
+          nil, nil, 1, nil, nil, 1, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+        ],
+        @second_class_file => [
+          1, 1, 0, nil, nil
+        ]
+      }
+    end
+
+    it 'call right before Coverage.result should give equal result' do
+      Coverage.start
+      require @class_file.chomp('.rb')
+      result1 = Coverage.peek_result
+      result2 = Coverage.result
+
+      result1.should == result2
+    end
+  end
+end
diff --git a/spec/rubyspec/library/coverage/result_spec.rb b/spec/rubyspec/library/coverage/result_spec.rb
new file mode 100644
index 0000000000..adcc51dc80
--- /dev/null
+++ b/spec/rubyspec/library/coverage/result_spec.rb
@@ -0,0 +1,78 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require fixture __FILE__, 'spec_helper'
+require 'coverage'
+
+describe 'Coverage.result' do
+  before :all do
+    @class_file = fixture __FILE__, 'some_class.rb'
+    @config_file = fixture __FILE__, 'start_coverage.rb'
+  end
+
+  after :each do
+    $LOADED_FEATURES.delete(@class_file)
+    $LOADED_FEATURES.delete(@config_file)
+  end
+
+  it 'gives the covered files as a hash with arrays of count or nil' do
+    Coverage.start
+    require @class_file.chomp('.rb')
+    result = CoverageSpecs.filtered_result
+
+    result.should == {
+      @class_file => [
+        nil, nil, 1, nil, nil, 1, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+      ]
+    }
+  end
+
+  it 'no requires/loads should give empty hash' do
+    Coverage.start
+    result = CoverageSpecs.filtered_result
+
+    result.should == {}
+  end
+
+  it 'second call should give exception' do
+    Coverage.start
+    require @class_file.chomp('.rb')
+    Coverage.result
+    -> { Coverage.result }
+      .should raise_error(RuntimeError, 'coverage measurement is not enabled')
+  end
+
+  it 'second run should give same result' do
+    Coverage.start
+    load @class_file
+    result1 = CoverageSpecs.filtered_result
+
+    Coverage.start
+    load @class_file
+    result2 = CoverageSpecs.filtered_result
+
+    result2.should == result1
+  end
+
+  it 'second run without load/require should give empty hash' do
+    Coverage.start
+    require @class_file.chomp('.rb')
+    Coverage.result
+
+    Coverage.start
+    result = CoverageSpecs.filtered_result
+
+    result.should == {}
+  end
+
+  it 'second Coverage.start does nothing' do
+    Coverage.start
+    require @config_file.chomp('.rb')
+    result = CoverageSpecs.filtered_result
+
+    result.should == { @config_file => [1, 1, 1] }
+  end
+
+  it 'does not include the file starting coverage since it is not tracked' do
+    require @config_file.chomp('.rb')
+    CoverageSpecs.filtered_result.should_not include(@config_file)
+  end
+end
diff --git a/spec/rubyspec/library/coverage/start_spec.rb b/spec/rubyspec/library/coverage/start_spec.rb
new file mode 100644
index 0000000000..6b4ccbb043
--- /dev/null
+++ b/spec/rubyspec/library/coverage/start_spec.rb
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'coverage'
+
+describe 'Coverage.start' do
+  it 'needs to be reviewed for spec completeness'
+end