[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@1389c91 [master] vte3 test: add helper method to check VTE version

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-08-06 16:17:38 +0900 (Sun, 06 Aug 2017)

  New Revision: 1389c9147694e91f4d2707107bda6198e196097f
  https://github.com/ruby-gnome2/ruby-gnome2/commit/1389c9147694e91f4d2707107bda6198e196097f

  Message:
    vte3 test: add helper method to check VTE version

  Modified files:
    vte3/test/test-terminal-regex.rb
    vte3/test/vte3-test-utils.rb

  Modified: vte3/test/test-terminal-regex.rb (+9 -11)
===================================================================
--- vte3/test/test-terminal-regex.rb    2017-08-06 16:15:33 +0900 (88b4dbf1f)
+++ vte3/test/test-terminal-regex.rb    2017-08-06 16:17:38 +0900 (e42647030)
@@ -18,20 +18,18 @@ class TestTerminalRegex < Test::Unit::TestCase
   include VteTestUtils
 
   def setup
+    only_vte_version(0, 46)
     @terminal = Vte::Terminal.new
   end
 
-  if Vte::Version.or_later?(0, 46)
-    def test_regex_for_match
-      regex = Vte::Regex.new("test", GLib::RegexCompileFlags::OPTIMIZE, :for_match => true)
-      assert_instance_of(Vte::Regex, regex)
-    end
+  def test_regex_for_match
+    regex = Vte::Regex.new("test", GLib::RegexCompileFlags::OPTIMIZE, :for_match => true)
+    assert_instance_of(Vte::Regex, regex)
+  end
 
-    def test_regex_for_match_multiple_flags
-      flags = [:optimize,
-               :multiline]
-      regex = Vte::Regex.new("test", flags, :for_match => true)
-      assert_instance_of(Vte::Regex, regex)
-    end
+  def test_regex_for_match_multiple_flags
+    flags = [:optimize, :multiline]
+    regex = Vte::Regex.new("test", flags, :for_match => true)
+    assert_instance_of(Vte::Regex, regex)
   end
 end

  Modified: vte3/test/vte3-test-utils.rb (+7 -0)
===================================================================
--- vte3/test/vte3-test-utils.rb    2017-08-06 16:15:33 +0900 (3c3015097)
+++ vte3/test/vte3-test-utils.rb    2017-08-06 16:17:38 +0900 (733f921f6)
@@ -23,4 +23,11 @@ module VteTestUtils
       omit("#{instance.class}##{method_name} is not respond.")
     end
   end
+
+  def only_vte_version(major, minor, micro=nil)
+    micro ||= 0
+    unless Vte::Version.or_later?(major, minor, micro)
+      omit("Require VTE >= #{major}.#{minor}.#{micro}")
+    end
+  end
 end