test/Image2.rb in rmagick-3.2.0 vs test/Image2.rb in rmagick-4.0.0

@@ -385,11 +385,11 @@
       end
     end
 
     unmapped = Magick::ImageList.new(IMAGES_DIR + '/Hot_Air_Balloons.jpg', IMAGES_DIR + '/Violin.jpg', IMAGES_DIR + '/Polynesia.jpg')
     map = Magick::ImageList.new 'netscape:'
-    mapped = unmapped.map map, false
+    mapped = unmapped.remap map
     unmapped.each(&:destroy!)
     map.destroy!
     mapped.each(&:destroy!)
   ensure
     GC.enable
@@ -519,10 +519,12 @@
     ditto = @img.dup
     assert_equal(@img.tainted?, ditto.tainted?)
   end
 
   def test_each_profile
+    assert_nil(@img.each_profile {})
+
     @img.iptc_profile = 'test profile'
     assert_nothing_raised do
       @img.each_profile do |name, value|
         assert_equal('iptc', name)
         assert_equal('test profile', value)
@@ -654,14 +656,10 @@
     assert_nothing_raised do
       res = @img.export_pixels_to_str(0, 0, 10, 10, 'I', Magick::ShortPixel)
       assert_equal(10 * 10 * 2, res.length)
     end
     assert_nothing_raised do
-      res = @img.export_pixels_to_str(0, 0, 10, 10, 'I', Magick::IntegerPixel)
-      assert_equal(10 * 10 * 4, res.length)
-    end
-    assert_nothing_raised do
       res = @img.export_pixels_to_str(0, 0, 10, 10, 'I', Magick::LongPixel)
       assert_equal(10 * 10 * [1].pack('L!').length, res.length)
     end
     assert_nothing_raised do
       res = @img.export_pixels_to_str(0, 0, 10, 10, 'I', Magick::FloatPixel)
@@ -1086,25 +1084,10 @@
 
     res = @img.magnify!
     assert_same(@img, res)
   end
 
-  def test_map
-    map = Magick::Image.read('netscape:').first
-    assert_nothing_raised do
-      res = @img.map(map)
-      assert_instance_of(Magick::Image, res)
-      assert_not_same(@img, res)
-    end
-    assert_nothing_raised { @img.map(map, true) }
-    assert_raise(NoMethodError) { @img.map(2) }
-    assert_raise(ArgumentError) { @img.map(map, true, 2) }
-    assert_raise(ArgumentError) { @img.map }
-    map.destroy!
-    assert_raise(Magick::DestroyedImageError) { @img.map(map, true) }
-  end
-
   def test_marshal
     img = Magick::Image.read(IMAGES_DIR + '/Button_0.gif').first
     d = nil
     img2 = nil
     assert_nothing_raised { d = Marshal.dump(img) }
@@ -1343,26 +1326,25 @@
     res = nil
     assert_nothing_raised { res = @img.paint_transparent('red') }
     assert_not_nil(res)
     assert_instance_of(Magick::Image, res)
     assert_not_same(res, @img)
-    assert_nothing_raised { @img.paint_transparent('red', Magick::TransparentOpacity) }
+    assert_raise(ArgumentError) { @img.paint_transparent('red', Magick::TransparentAlpha) }
     assert_nothing_raised { @img.paint_transparent('red', alpha: Magick::TransparentAlpha) }
     assert_raise(ArgumentError) { @img.paint_transparent('red', wrong: Magick::TransparentAlpha) }
-    assert_nothing_raised { @img.paint_transparent('red', Magick::TransparentOpacity, true) }
+    assert_raise(ArgumentError) { @img.paint_transparent('red', Magick::TransparentAlpha, true) }
     assert_nothing_raised { @img.paint_transparent('red', true, alpha: Magick::TransparentAlpha) }
     assert_raise(ArgumentError) { @img.paint_transparent('red', true, wrong: Magick::TransparentAlpha) }
     assert_raise(ArgumentError) { @img.paint_transparent('red', true, alpha: Magick::TransparentAlpha, extra: Magick::TransparentAlpha) }
-    assert_nothing_raised { @img.paint_transparent('red', Magick::TransparentOpacity, true, 50) }
+    assert_raise(ArgumentError) { @img.paint_transparent('red', Magick::TransparentAlpha, true, 50) }
     assert_nothing_raised { @img.paint_transparent('red', true, 50, alpha: Magick::TransparentAlpha) }
     assert_raise(ArgumentError) { @img.paint_transparent('red', true, 50, wrong: Magick::TransparentAlpha) }
 
     # Too many arguments
-    assert_raise(ArgumentError) { @img.paint_transparent('red', Magick::TransparentOpacity, true, 50, 50) }
+    assert_raise(ArgumentError) { @img.paint_transparent('red', true, 50, 50, 50) }
     # Not enough
     assert_raise(ArgumentError) { @img.paint_transparent }
-    assert_raise(TypeError) { @img.paint_transparent('red', Magick::TransparentOpacity, true, []) }
-    assert_raise(TypeError) { @img.paint_transparent('red', 'blue') }
+    assert_raise(TypeError) { @img.paint_transparent('red', true, [], alpha: Magick::TransparentAlpha) }
     assert_raise(TypeError) { @img.paint_transparent(50) }
   end
 
   def test_palette?
     img = Magick::Image.read(IMAGES_DIR + '/Flower_Hat.jpg').first