Make version matching work on JRuby and unexclude another test.

jruby · Mar 14, 2016 · 5837373 · 5837373
1 parent 4d97a89
commit 5837373
Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/test/mri/excludes/TestRubyOptions.rb b/test/mri/excludes/TestRubyOptions.rb
@@ -30,5 +30,4 @@
 exclude :test_unused_variable, "needs investigation"
 exclude :test_usage, "expects a specific number of lines in -h output"
 exclude :test_usage_long, "needs investigation"
-exclude :test_version, "needs investigation"
 exclude :test_warning, "needs investigation"
diff --git a/test/mri/ruby/test_rubyoptions.rb b/test/mri/ruby/test_rubyoptions.rb
@@ -83,14 +83,18 @@ def test_debug
                       "", %w(true), [])
   end
 
+  private def version_match
+    case RUBY_ENGINE
+    when 'jruby'
+      /^jruby #{RUBY_ENGINE_VERSION} \(#{RUBY_VERSION}\).*? \[#{RbConfig::CONFIG["host_os"]}-#{RbConfig::CONFIG["host_cpu"]}\]$/
+    else
+      /^ruby #{RUBY_VERSION}(?:[p ]|dev|rc).*? \[#{RUBY_PLATFORM}\]$/
+    end
+  end
+
   def test_verbose
     assert_in_out_err(["-vve", ""]) do |r, e|
-      case RUBY_ENGINE
-      when 'ruby'
-        assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev|rc).*? \[#{RUBY_PLATFORM}\]$/, r[0])
-      when 'jruby'
-        assert_match(/^jruby #{RUBY_ENGINE_VERSION} \(#{RUBY_VERSION}\).*? \[#{RbConfig::CONFIG["host_os"]}-#{RbConfig::CONFIG["host_cpu"]}\]$/, r[0])
-      end
+      assert_match(version_match, r[0])
       assert_equal(RUBY_DESCRIPTION, r[0])
       assert_equal([], e)
     end
@@ -144,7 +148,7 @@ def test_kanji
 
   def test_version
     assert_in_out_err(%w(--version)) do |r, e|
-      assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev|rc).*? \[#{RUBY_PLATFORM}\]$/, r[0])
+      assert_match(version_match, r[0])
       assert_equal(RUBY_DESCRIPTION, r[0])
       assert_equal([], e)
     end