[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@1f004a1 [master] use Poppler::Version.or_later? in tests

[cedlemo <nu...@co...>]

cedlemo	2017-07-21 01:26:54 +0900 (Fri, 21 Jul 2017)

  New Revision: 1f004a1600ba8b388fda11aaea557a06828bbb0d
  https://github.com/ruby-gnome2/ruby-gnome2/commit/1f004a1600ba8b388fda11aaea557a06828bbb0d

  Merged 7316c70: Merge pull request #1068 from cedlemo/poppler_gi_form

  Message:
    use Poppler::Version.or_later? in tests

  Modified files:
    poppler/test/poppler-test-utils.rb
    poppler/test/test_constants.rb
    poppler/test/test_page.rb

  Modified: poppler/test/poppler-test-utils.rb (+2 -7)
===================================================================
--- poppler/test/poppler-test-utils.rb    2017-07-20 02:02:59 +0900 (343e13a)
+++ poppler/test/poppler-test-utils.rb    2017-07-21 01:26:54 +0900 (dfdec09)
@@ -41,21 +41,16 @@ module PopplerTestUtils
     File.join(fixtures_dir, "outline.pdf")
   end
 
-  def later_version?(major, minor, micro=nil)
-    micro ||= 0
-    (Poppler::BUILD_VERSION <=> [major, minor, micro]) >= 0
-  end
-
   def only_poppler_version(major, minor, micro=nil)
     micro ||= 0
-    unless later_version?(major, minor, micro)
+    unless Poppler::Version.or_later?(major, minor, micro)
       omit("Require Poppler >= #{major}.#{minor}.#{micro}")
     end
   end
 
   def only_old_poppler_version(major, minor, micro=nil)
     micro ||= 0
-    if later_version?(major, minor, micro)
+    if Poppler::Version.or_later?(major, minor, micro)
       omit("Require Poppler < #{major}.#{minor}.#{micro}")
     end
   end

  Modified: poppler/test/test_constants.rb (+2 -2)
===================================================================
--- poppler/test/test_constants.rb    2017-07-20 02:02:59 +0900 (9f03761)
+++ poppler/test/test_constants.rb    2017-07-21 01:26:54 +0900 (ec6a230)
@@ -1,6 +1,6 @@
 class TestConstants < Test::Unit::TestCase
   def test_annotation
-    if later_version?(0, 7, 2)
+    if Poppler::Version.or_later?(0, 7, 2)
       assertion = :assert_const_defined
     else
       assertion = :assert_not_const_defined
@@ -15,7 +15,7 @@ class TestConstants < Test::Unit::TestCase
     if assertion == :assert_const_defined
       assert_equal("3d", Poppler::AnnotationExternalDataType::TYPE_3D.nick)
     end
-    if later_version?(0, 9, 0)
+    if Poppler::Version.or_later?(0, 9, 0)
       assert_not_const_defined(Poppler, :AnnotationTextIcon)
     else
       send(assertion, Poppler, :AnnotationTextIcon)

  Modified: poppler/test/test_page.rb (+1 -1)
===================================================================
--- poppler/test/test_page.rb    2017-07-20 02:02:59 +0900 (01ffc84)
+++ poppler/test/test_page.rb    2017-07-21 01:26:54 +0900 (4da050d)
@@ -12,7 +12,7 @@ class TestPage < Test::Unit::TestCase
     page = document[0]
     rectangle = Poppler::Rectangle.new(0, 0, *page.size)
     region = page.get_selection_region(0.5, :word, rectangle)
-    if later_version?(0, 7, 2)
+    if Poppler::Version.or_later?(0, 7, 2)
       assert_kind_of(Poppler::Rectangle, region[0])
     else
       assert_kind_of(Gdk::Region, region)