Menu
▾
▴
[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@e84caa2 [master] drop codes for poppler version < 0.15.0
|
From: cedlemo <nu...@co...> - 2017-07-24 00:16:49
|
cedlemo 2017-07-24 01:25:56 +0900 (Mon, 24 Jul 2017) New Revision: e84caa2bd313208503795ac4de00c5c5bd9cc6ab https://github.com/ruby-gnome2/ruby-gnome2/commit/e84caa2bd313208503795ac4de00c5c5bd9cc6ab Merged e92b949: Merge pull request #1075 from cedlemo/poppler_test_drop_old_version Message: drop codes for poppler version < 0.15.0 Modified files: poppler/test/test-annotation.rb poppler/test/test_color.rb poppler/test/test_constants.rb poppler/test/test_document.rb poppler/test/test_page.rb Modified: poppler/test/test-annotation.rb (+0 -10) =================================================================== --- poppler/test/test-annotation.rb 2017-07-23 15:24:44 +0900 (9da2cd6) +++ poppler/test/test-annotation.rb 2017-07-24 01:25:56 +0900 (2711af5) @@ -1,36 +1,29 @@ class TestAnnotation < Test::Unit::TestCase def test_type - only_poppler_version(0, 7, 2) assert_kind_of(Poppler::AnnotType, annotation.type) end def test_contents - only_poppler_version(0, 7, 2) assert_nil(annotation.contents) end def test_name - only_poppler_version(0, 7, 2) assert_nil(annotation.name) end def test_modified - only_poppler_version(0, 7, 2) assert_nil(annotation.modified) end def test_flags - only_poppler_version(0, 7, 2) assert_kind_of(Poppler::AnnotFlag, annotation.flags) end def test_color - only_poppler_version(0, 7, 2) assert_nil(annotation.color) end def test_markup - only_poppler_version(0, 7, 2) # We don't have a PDF that has annotation markup... assert_method_defined(Poppler::AnnotMarkup, :label) assert_method_defined(Poppler::AnnotMarkup, :popup_is_open?) @@ -42,7 +35,6 @@ class TestAnnotation < Test::Unit::TestCase end def test_text - only_poppler_version(0, 7, 2) # We don't have a PDF that has annotation text... assert_method_defined(Poppler::AnnotText, :open?) assert_method_defined(Poppler::AnnotText, :icon) @@ -50,14 +42,12 @@ class TestAnnotation < Test::Unit::TestCase end def test_free_text - only_poppler_version(0, 7, 2) # We don't have a PDF that has annotation free text... assert_method_defined(Poppler::AnnotFreeText, :quadding) assert_method_defined(Poppler::AnnotFreeText, :callout_line) end def test_callout_line - only_poppler_version(0, 7, 2) callout_line = Poppler::AnnotCalloutLine.new(true, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6) Modified: poppler/test/test_color.rb (+0 -3) =================================================================== --- poppler/test/test_color.rb 2017-07-23 15:24:44 +0900 (25f3db1) +++ poppler/test/test_color.rb 2017-07-24 01:25:56 +0900 (8e0a1c6) @@ -1,13 +1,11 @@ class TestColor < Test::Unit::TestCase def test_initialize - only_poppler_version(0, 7, 2) rose = Poppler::Color.new(65535, 0, 32639) assert_equal([65535, 0, 32639], [rose.red, rose.green, rose.blue]) assert_equal([65535, 0, 32639], rose.to_a) end def test_accessor - only_poppler_version(0, 7, 2) white = Poppler::Color.new(65535, 65535, 65535) red = white.dup red.green = 0 @@ -17,7 +15,6 @@ class TestColor < Test::Unit::TestCase end def test_inspect - only_poppler_version(0, 7, 2) color = Poppler::Color.new(0, 32767, 65535) rgb = '[0, 32767, 65535]' assert_match(/\A#<Poppler::Color:.*: #{Regexp.escape(rgb)}>\z/, Modified: poppler/test/test_constants.rb (+3 -10) =================================================================== --- poppler/test/test_constants.rb 2017-07-23 15:24:44 +0900 (ec6a230) +++ poppler/test/test_constants.rb 2017-07-24 01:25:56 +0900 (f511f30) @@ -1,10 +1,6 @@ class TestConstants < Test::Unit::TestCase def test_annotation - if Poppler::Version.or_later?(0, 7, 2) - assertion = :assert_const_defined - else - assertion = :assert_not_const_defined - end + assertion = :assert_const_defined send(assertion, Poppler, :AnnotationType) if assertion == :assert_const_defined assert_equal("3d", Poppler::AnnotationType::TYPE_3D.nick) @@ -15,11 +11,8 @@ class TestConstants < Test::Unit::TestCase if assertion == :assert_const_defined assert_equal("3d", Poppler::AnnotationExternalDataType::TYPE_3D.nick) end - if Poppler::Version.or_later?(0, 9, 0) - assert_not_const_defined(Poppler, :AnnotationTextIcon) - else - send(assertion, Poppler, :AnnotationTextIcon) - end + assert_not_const_defined(Poppler, :AnnotationTextIcon) + send(assertion, Poppler, :AnnotationTextIcon) send(assertion, Poppler, :AnnotationTextState) send(assertion, Poppler, :AnnotationFreeTextQuadding) end Modified: poppler/test/test_document.rb (+0 -2) =================================================================== --- poppler/test/test_document.rb 2017-07-23 15:24:44 +0900 (6cc6097) +++ poppler/test/test_document.rb 2017-07-24 01:25:56 +0900 (05e5fd7) @@ -8,13 +8,11 @@ class TestDocument < Test::Unit::TestCase assert(document.save(saved_pdf)) assert(File.exist?(saved_pdf)) - only_poppler_version(0, 8, 2) reread_document = Poppler::Document.new(saved_pdf) assert_equal("XXX", find_first_text_field(reread_document).text) end def test_save_a_copy - only_poppler_version(0, 7, 2) copied_pdf = File.join(tmp_dir, "copied.pdf") FileUtils.rm_f(copied_pdf) Modified: poppler/test/test_page.rb (+1 -6) =================================================================== --- poppler/test/test_page.rb 2017-07-23 15:24:44 +0900 (4da050d) +++ poppler/test/test_page.rb 2017-07-24 01:25:56 +0900 (c2742c4) @@ -12,15 +12,10 @@ 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 Poppler::Version.or_later?(0, 7, 2) - assert_kind_of(Poppler::Rectangle, region[0]) - else - assert_kind_of(Gdk::Region, region) - end + assert_kind_of(Poppler::Rectangle, region[0]) end def test_annotation_mapping - only_poppler_version(0, 7, 2) document = Poppler::Document.new(form_pdf) page = document[0] assert_equal([Poppler::AnnotationMapping], |
