jruby · Mar 26, 2018 · Mar 26, 2018
Showing with 17 additions and 0 deletions.

+6 −0 core/src/main/java/org/jruby/ext/coverage/CoverageData.java

+11 −0 test/jruby/test_coverage.rb

BIN test/jruby/testapp/testapp
diff --git a/core/src/main/java/org/jruby/ext/coverage/CoverageData.java b/core/src/main/java/org/jruby/ext/coverage/CoverageData.java
@@ -92,6 +92,12 @@ private boolean hasCodeBeenPartiallyCovered(int[] lines) {
     public synchronized Map<String, int[]> prepareCoverage(String filename, int[] lines) {
         assert lines != null;
 
+        if (filename == null) {
+            // null filename from certain evals, Ruby.executeScript, etc (jruby/jruby#5111)
+            // we opt to ignore scripts with no filename, since coverage means nothing
+            return coverage;
+        }
+
         Map<String, int[]> coverage = this.coverage;
 
         if (coverage != null) {

diff --git a/test/jruby/test_coverage.rb b/test/jruby/test_coverage.rb
@@ -0,0 +1,11 @@
+require 'test/unit/testcase'
+require 'coverage'
+
+class TestCoverage < Test::Unit::TestCase
+  def test_coverage_handles_null_filename # jruby/jruby#5099
+    Coverage.start
+    JRuby.runtime.executeScript('1 + 1', nil)
+    assert_nothing_raised { Coverage.result }
+  end
+end
+
diff --git a/test/jruby/testapp/testapp b/test/jruby/testapp/testapp