From 6801cd66f84d8ee99420dc8316b821e8c3fe9cd6 Mon Sep 17 00:00:00 2001 From: James Mead Date: Thu, 1 Dec 2016 13:04:11 +0000 Subject: [PATCH 1/3] Extract ExecutionPoint#first_line_of_backtrace Thus reducing duplication. --- test/execution_point.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/execution_point.rb b/test/execution_point.rb index 0e7db0977..2000b93ee 100644 --- a/test/execution_point.rb +++ b/test/execution_point.rb @@ -10,14 +10,16 @@ def initialize(backtrace) @backtrace = backtrace end + def first_line_of_backtrace + @backtrace && (@backtrace.first || 'unknown:0') + end + def file_name - return "unknown" unless @backtrace && @backtrace.first - /\A(.*?):\d+/.match(@backtrace.first)[1] + /\A(.*?):\d+/.match(first_line_of_backtrace)[1] end def line_number - return "unknown" unless @backtrace && @backtrace.first - Integer(/\A.*?:(\d+)/.match(@backtrace.first)[1]) + Integer(/\A.*?:(\d+)/.match(first_line_of_backtrace)[1]) end def ==(other) From 0bc1b9c69cf0c50651c02980f7c375f1f1a5542a Mon Sep 17 00:00:00 2001 From: James Mead Date: Thu, 1 Dec 2016 13:09:49 +0000 Subject: [PATCH 2/3] Exclude JRuby stacktrace lines in ExecutionPoint analysis --- test/execution_point.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/execution_point.rb b/test/execution_point.rb index 2000b93ee..558c58c2c 100644 --- a/test/execution_point.rb +++ b/test/execution_point.rb @@ -10,16 +10,16 @@ def initialize(backtrace) @backtrace = backtrace end - def first_line_of_backtrace - @backtrace && (@backtrace.first || 'unknown:0') + def first_relevant_line_of_backtrace + @backtrace && (@backtrace.reject { |l| /\Aorg\/jruby\//.match(l) }.first || 'unknown:0') end def file_name - /\A(.*?):\d+/.match(first_line_of_backtrace)[1] + /\A(.*?):\d+/.match(first_relevant_line_of_backtrace)[1] end def line_number - Integer(/\A.*?:(\d+)/.match(first_line_of_backtrace)[1]) + Integer(/\A.*?:(\d+)/.match(first_relevant_line_of_backtrace)[1]) end def ==(other) From 2cdef343c1dbac5ca48b8bb2cb70278b1cb65507 Mon Sep 17 00:00:00 2001 From: James Mead Date: Mon, 31 Oct 2016 22:35:40 +0000 Subject: [PATCH 3/3] Add latest stable JRuby to Travis CI build matrix --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 82e7386cf..e89c14a02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,16 @@ rvm: - 2.1 - 2.2 - 2.3 + - jruby gemfile: - Gemfile env: - MOCHA_OPTIONS=debug matrix: include: + - rvm: jruby + gemfile: gemfiles/Gemfile.minitest.latest + env: MOCHA_OPTIONS=debug MOCHA_RUN_INTEGRATION_TESTS=minitest - rvm: 2.3 gemfile: gemfiles/Gemfile.minitest.latest env: MOCHA_OPTIONS=debug MOCHA_RUN_INTEGRATION_TESTS=minitest @@ -75,6 +79,9 @@ matrix: - rvm: 1.8.7 gemfile: gemfiles/Gemfile.minitest.1.3.0 env: MOCHA_OPTIONS=debug MOCHA_RUN_INTEGRATION_TESTS=minitest + - rvm: jruby + gemfile: gemfiles/Gemfile.test-unit.latest + env: MOCHA_OPTIONS=debug MOCHA_RUN_INTEGRATION_TESTS=test-unit - rvm: 2.3 gemfile: gemfiles/Gemfile.test-unit.latest env: MOCHA_OPTIONS=debug MOCHA_RUN_INTEGRATION_TESTS=test-unit