pnm 0.5.2 → 0.6.1

data/test/test_exceptions.rb

@@ -2,123 +2,125 @@
 
 # test_exceptions.rb: Unit tests for the PNM library.
 #
-# Copyright (C) 2013-2019 Marcus Stollsteimer
+# Copyright (C) 2013-2022 Marcus Stollsteimer
 
 require "minitest/autorun"
 require "stringio"
 require "pnm"
 
+require_relative "backports"
+
 
 describe "PNM.create" do
 
   it "raises an exception for invalid data type (String)" do
     data = "0"
-    proc { PNM.create(data) }.must_raise PNM::ArgumentError
+    _ { PNM.create(data) }.must_raise PNM::ArgumentError
   end
 
   it "raises an exception for invalid type" do
     data = [[0, 0], [0, 0]]
-    proc { PNM.create(data, type: :abc) }.must_raise PNM::ArgumentError
+    _ { PNM.create(data, type: :abc) }.must_raise PNM::ArgumentError
   end
 
   it "raises an exception for invalid maxgray (String)" do
     data = [[0, 0], [0, 0]]
-    proc { PNM.create(data, maxgray: "255") }.must_raise PNM::ArgumentError
+    _ { PNM.create(data, maxgray: "255") }.must_raise PNM::ArgumentError
   end
 
   it "raises an exception for invalid maxgray (> 255)" do
     data = [[0, 0], [0, 0]]
-    proc { PNM.create(data, maxgray: 256) }.must_raise PNM::ArgumentError
+    _ { PNM.create(data, maxgray: 256) }.must_raise PNM::ArgumentError
   end
 
   it "raises an exception for invalid maxgray (0)" do
     data = [[0, 0], [0, 0]]
-    proc { PNM.create(data, maxgray: 0) }.must_raise PNM::ArgumentError
+    _ { PNM.create(data, maxgray: 0) }.must_raise PNM::ArgumentError
   end
 
   it "raises an exception for invalid comment (Integer)" do
     data = [[0, 0], [0, 0]]
-    proc { PNM.create(data, comment: 1) }.must_raise PNM::ArgumentError
+    _ { PNM.create(data, comment: 1) }.must_raise PNM::ArgumentError
   end
 
   it "raises an exception for image type and data mismatch (PBM)" do
     data = [[[0, 0, 0], [0, 0, 0]], [[0, 0, 0], [0, 0, 0]]]
-    proc { PNM.create(data, type: :pbm) }.must_raise PNM::DataError
+    _ { PNM.create(data, type: :pbm) }.must_raise PNM::DataError
   end
 
   it "raises an exception for image type and data mismatch (PGM)" do
     data = [[[0, 0, 0], [0, 0, 0]], [[0, 0, 0], [0, 0, 0]]]
-    proc { PNM.create(data, type: :pgm) }.must_raise PNM::DataError
+    _ { PNM.create(data, type: :pgm) }.must_raise PNM::DataError
   end
 
   it "raises an exception for non-integer pixel value (String)" do
     data = [[0, 0], ["X", 0]]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for non-integer pixel value (Float)" do
     data = [[0, 0], [0.5, 0]]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for rows of different size" do
     data = [[0, 0], [0, 0, 0]]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid array dimensions (#1)" do
     data = [0, 0, 0]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid array dimensions (#2)" do
     data = [[0, 0], 0, 0]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid array dimensions (#3)" do
     data = [[0, 0], [0, [0, 0]]]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid array dimensions (#4)" do
     data = [[[0, 0], [0, 0]], [[0, 0], [0, 0]]]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid array dimensions (#5)" do
     data = [[[0, 0, 0], [0, 0, 0]], [0, 0]]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid array dimensions (#6)" do
     data = [[[0, 0, 0], 0], [0, 0]]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for an empty array" do
     data = [[]]
-    proc { PNM.create(data) }.must_raise PNM::DataError
+    _ { PNM.create(data) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid PBM data (> 1)" do
     data = [[0, 0], [2, 0]]
-    proc { PNM.create(data, type: :pbm) }.must_raise PNM::DataError
+    _ { PNM.create(data, type: :pbm) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid PBM data (< 0)" do
     data = [[0, 0], [-1, 0]]
-    proc { PNM.create(data, type: :pbm) }.must_raise PNM::DataError
+    _ { PNM.create(data, type: :pbm) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid PGM data (> 255)" do
     data = [[0, 0], [1, 500]]
-    proc { PNM.create(data, type: :pgm) }.must_raise PNM::DataError
+    _ { PNM.create(data, type: :pgm) }.must_raise PNM::DataError
   end
 
   it "raises an exception for invalid PGM data (> maxgray)" do
     data = [[0, 0], [1, 200]]
-    proc { PNM.create(data, maxgray: 100) }.must_raise PNM::DataError
+    _ { PNM.create(data, maxgray: 100) }.must_raise PNM::DataError
   end
 end
 
@@ -126,111 +128,111 @@ end
 describe "PNM.read" do
 
   it "raises an exception for integer argument" do
-    proc { PNM.read(123) }.must_raise PNM::ArgumentError
+    _ { PNM.read(123) }.must_raise PNM::ArgumentError
   end
 
   it "raises an exception for unknown magic number" do
     file = StringIO.new("P0 1 1 0")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for an empty file" do
     file = StringIO.new("")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for missing tokens (#1)" do
     file = StringIO.new("P1")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for missing tokens (#2)" do
     file = StringIO.new("P1 1")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for missing tokens (#3)" do
     file = StringIO.new("P1 1 ")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for missing tokens (#4)" do
     file = StringIO.new("P1 1 1")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for missing tokens (#5)" do
     file = StringIO.new("P1 1  # Test\n 1")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for missing tokens (#6)" do
     file = StringIO.new("P2 1 1 255")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for token of wrong type (#1)" do
     file = StringIO.new("P1 ? 1 0")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for token of wrong type (#2)" do
     file = StringIO.new("P1 1 X 0")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for token of wrong type (#3)" do
     file = StringIO.new("P2 1 1 foo 0")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for zero width" do
     file = StringIO.new("P2 0 1 255 0")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for zero height" do
     file = StringIO.new("P2 1 0 255 0")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for invalid maxgray (> 255)" do
     file = StringIO.new("P2 1 1 256 0")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for invalid maxgray (0)" do
     file = StringIO.new("P2 1 1 0 0")
-    proc { PNM.read(file) }.must_raise PNM::ParserError
+    _ { PNM.read(file) }.must_raise PNM::ParserError
   end
 
   it "raises an exception for image dimension mismatch (#1)" do
     file = StringIO.new("P1 2 3 0 0 0 0 0")
-    proc { PNM.read(file) }.must_raise PNM::DataSizeError
+    _ { PNM.read(file) }.must_raise PNM::DataSizeError
   end
 
   it "raises an exception for image dimension mismatch (#2)" do
     file = StringIO.new("P1 2 3 0 0 0 0 0 0 0")
-    proc { PNM.read(file) }.must_raise PNM::DataSizeError
+    _ { PNM.read(file) }.must_raise PNM::DataSizeError
   end
 
   it "raises an exception for image dimension mismatch (#3)" do
     file = StringIO.new("P3 2 3 255 0 0 0 0 0 0")
-    proc { PNM.read(file) }.must_raise PNM::DataSizeError
+    _ { PNM.read(file) }.must_raise PNM::DataSizeError
   end
 
   it "raises an exception for image dimension mismatch (#4)" do
     file = StringIO.new("P5 2 3 255 AAAAAAA")
-    proc { PNM.read(file) }.must_raise PNM::DataSizeError
+    _ { PNM.read(file) }.must_raise PNM::DataSizeError
   end
 
   it "raises an exception for image dimension mismatch (#5)" do
     file = StringIO.new("P5 2 3 255 AAAAAAA")
-    proc { PNM.read(file) }.must_raise PNM::DataSizeError
+    _ { PNM.read(file) }.must_raise PNM::DataSizeError
   end
 
   it "raises an exception for non-numeric image data" do
     file = StringIO.new("P1 2 3 0 X 0 0 0 0")
-    proc { PNM.read(file) }.must_raise PNM::DataError
+    _ { PNM.read(file) }.must_raise PNM::DataError
   end
 end

data/test/test_image.rb

@@ -2,11 +2,13 @@
 
 # test_image.rb: Unit tests for the PNM library.
 #
-# Copyright (C) 2013-2019 Marcus Stollsteimer
+# Copyright (C) 2013-2022 Marcus Stollsteimer
 
 require "minitest/autorun"
 require "pnm"
 
+require_relative "backports"
+
 
 describe PNM::Image do
 
@@ -47,229 +49,229 @@ describe PNM::Image do
   end
 
   it "freezes pixel data" do
-    proc { @bilevel.pixels << [1, 1, 0, 1, 1] }.must_raise RuntimeError
+    _ { @bilevel.pixels << [1, 1, 0, 1, 1] }.must_raise RuntimeError
   end
 
   it "freezes comment string" do
-    proc { @bilevel.comment << "string" }.must_raise RuntimeError
+    _ { @bilevel.comment << "string" }.must_raise RuntimeError
   end
 
   it "sets maxgray to 1 for bilevel images" do
     image = PNM.create([[0, 1, 0], [1, 0, 1]])
-    image.type.must_equal :pbm
-    image.maxgray.must_equal 1
+    _(image.type).must_equal :pbm
+    _(image.maxgray).must_equal 1
   end
 
   it "sets maxgray by default to 255 for grayscale images" do
     image = PNM.create([[0, 10, 20], [10, 20, 30]])
-    image.type.must_equal :pgm
-    image.maxgray.must_equal 255
+    _(image.type).must_equal :pgm
+    _(image.maxgray).must_equal 255
   end
 
   it "sets maxgray by default to 255 for color images" do
     image = PNM.create([[[0, 0, 0], [10, 10, 10]], [[10, 10, 10], [20, 20, 20]]])
-    image.type.must_equal :ppm
-    image.maxgray.must_equal 255
+    _(image.type).must_equal :ppm
+    _(image.maxgray).must_equal 255
   end
 
   it "accepts setting of maxgray to 1 for bilevel images" do
     image = PNM.create([[0, 1, 0], [1, 0, 1]], maxgray: 1)
-    image.type.must_equal :pbm
-    image.maxgray.must_equal 1
+    _(image.type).must_equal :pbm
+    _(image.maxgray).must_equal 1
   end
 
   it "ignores invalid maxgray for bilevel images and sets it to 1" do
     image = PNM.create([[0, 1, 0], [1, 0, 1]], type: :pbm, maxgray: 255)
-    image.type.must_equal :pbm
-    image.maxgray.must_equal 1
+    _(image.type).must_equal :pbm
+    _(image.maxgray).must_equal 1
   end
 
   it "can create a grayscale image from bilevel values (using type)" do
     image = PNM.create([[0, 1, 0], [1, 0, 1]], type: :pgm)
-    image.type.must_equal :pgm
-    image.pixels.must_equal [[0, 1, 0], [1, 0, 1]]
-    image.maxgray.must_equal 255
+    _(image.type).must_equal :pgm
+    _(image.pixels).must_equal [[0, 1, 0], [1, 0, 1]]
+    _(image.maxgray).must_equal 255
   end
 
   it "also accepts types given as string instead of symbol" do
     image = PNM.create([[0, 1, 0], [1, 0, 1]], type: "pgm")
-    image.type.must_equal :pgm
+    _(image.type).must_equal :pgm
   end
 
   it "can create a grayscale image from bilevel values (using maxgray)" do
     image = PNM.create([[0, 1, 0], [1, 0, 1]], maxgray: 2)
-    image.type.must_equal :pgm
-    image.pixels.must_equal [[0, 1, 0], [1, 0, 1]]
-    image.maxgray.must_equal 2
+    _(image.type).must_equal :pgm
+    _(image.pixels).must_equal [[0, 1, 0], [1, 0, 1]]
+    _(image.maxgray).must_equal 2
   end
 
   it "can create a color image from bilevel values" do
     image = PNM.create([[0, 1, 0], [1, 0, 1]], type: :ppm)
-    image.info.must_match %r{^PPM 3x2 Color}
-    image.pixels.must_equal [[[0, 0, 0], [1, 1, 1], [0, 0, 0]], [[1, 1, 1], [0, 0, 0], [1, 1, 1]]]
-    image.maxgray.must_equal 255
+    _(image.info).must_equal "PPM 3x2 Color"
+    _(image.pixels).must_equal [[[0, 0, 0], [1, 1, 1], [0, 0, 0]], [[1, 1, 1], [0, 0, 0], [1, 1, 1]]]
+    _(image.maxgray).must_equal 255
   end
 
   it "can create a color image from bilevel values with a given maxgray" do
     image = PNM.create([[0, 1, 0], [1, 0, 1]], type: :ppm, maxgray: 2)
-    image.info.must_match %r{^PPM 3x2 Color}
-    image.pixels.must_equal [[[0, 0, 0], [1, 1, 1], [0, 0, 0]], [[1, 1, 1], [0, 0, 0], [1, 1, 1]]]
-    image.maxgray.must_equal 2
+    _(image.info).must_equal "PPM 3x2 Color"
+    _(image.pixels).must_equal [[[0, 0, 0], [1, 1, 1], [0, 0, 0]], [[1, 1, 1], [0, 0, 0], [1, 1, 1]]]
+    _(image.maxgray).must_equal 2
   end
 
   it "can create a color image from gray values" do
     image = PNM.create([[0, 3, 6], [3, 6, 9]], type: :ppm)
-    image.info.must_match %r{^PPM 3x2 Color}
-    image.pixels.must_equal [[[0, 0, 0], [3, 3, 3], [6, 6, 6]], [[3, 3, 3], [6, 6, 6], [9, 9, 9]]]
+    _(image.info).must_equal "PPM 3x2 Color"
+    _(image.pixels).must_equal [[[0, 0, 0], [3, 3, 3], [6, 6, 6]], [[3, 3, 3], [6, 6, 6], [9, 9, 9]]]
   end
 
   it "does not modify the input data for color images created from gray values" do
     data = [[0, 3, 6], [3, 6, 9]]
     PNM.create(data, type: :ppm)
-    data.must_equal [[0, 3, 6], [3, 6, 9]]
+    _(data).must_equal [[0, 3, 6], [3, 6, 9]]
   end
 
   it "can write a bilevel image to an ASCII encoded file" do
-    @bilevel.write(@temp_path, :ascii)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/bilevel_ascii.pbm")
+    @bilevel.write(@temp_path, encoding: :ascii)
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/bilevel_ascii.pbm")
     File.delete(@temp_path)
   end
 
   it "can write a bilevel image (width 5) to a binary encoded file" do
-    @bilevel.write(@temp_path, :binary)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/bilevel_binary.pbm")
+    @bilevel.write(@temp_path, encoding: :binary)
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/bilevel_binary.pbm")
     File.delete(@temp_path)
   end
 
   it "can write a bilevel image (width 16) to a binary encoded file" do
-    @bilevel2.write(@temp_path, :binary)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/bilevel_2_binary.pbm")
+    @bilevel2.write(@temp_path, encoding: :binary)
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/bilevel_2_binary.pbm")
     File.delete(@temp_path)
   end
 
   it "can write a grayscale image to an ASCII encoded file" do
-    @grayscale.write(@temp_path, :ascii)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/grayscale_ascii.pgm")
+    @grayscale.write(@temp_path, encoding: :ascii)
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/grayscale_ascii.pgm")
     File.delete(@temp_path)
   end
 
   it "can write a grayscale image to a binary encoded file" do
-    @grayscale.write(@temp_path, :binary)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/grayscale_binary.pgm")
+    @grayscale.write(@temp_path, encoding: :binary)
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/grayscale_binary.pgm")
     File.delete(@temp_path)
   end
 
   it "can write a color image to an ASCII encoded file" do
-    @color.write(@temp_path, :ascii)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/color_ascii.ppm")
+    @color.write(@temp_path, encoding: :ascii)
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/color_ascii.ppm")
     File.delete(@temp_path)
   end
 
   it "can write a color image to a binary encoded file" do
-    @color.write(@temp_path, :binary)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/color_binary.ppm")
+    @color.write(@temp_path, encoding: :binary)
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/color_binary.ppm")
     File.delete(@temp_path)
   end
 
   it "can write a bilevel image to a file, adding the extension" do
-    @bilevel.write_with_extension(@temp_path)
-    File.binread("#{@temp_path}.pbm").must_equal File.binread("#{@srcpath}/bilevel_binary.pbm")
+    @bilevel.write(@temp_path, add_extension: true)
+    _(File.binread("#{@temp_path}.pbm")).must_equal File.binread("#{@srcpath}/bilevel_binary.pbm")
     File.delete("#{@temp_path}.pbm")
   end
 
   it "can write a grayscale image to a file, adding the extension" do
-    @grayscale.write_with_extension(@temp_path, :ascii)
-    File.binread("#{@temp_path}.pgm").must_equal File.binread("#{@srcpath}/grayscale_ascii.pgm")
+    @grayscale.write(@temp_path, add_extension: true, encoding: :ascii)
+    _(File.binread("#{@temp_path}.pgm")).must_equal File.binread("#{@srcpath}/grayscale_ascii.pgm")
     File.delete("#{@temp_path}.pgm")
   end
 
   it "can write a color image to a file, adding the extension" do
-    @color.write_with_extension(@temp_path, :binary)
-    File.binread("#{@temp_path}.ppm").must_equal File.binread("#{@srcpath}/color_binary.ppm")
+    @color.write(@temp_path, add_extension: true, encoding: :binary)
+    _(File.binread("#{@temp_path}.ppm")).must_equal File.binread("#{@srcpath}/color_binary.ppm")
     File.delete("#{@temp_path}.ppm")
   end
 
   it "can return image information" do
-    @bilevel.info.must_equal "PBM 5x6 Bilevel"
-    @grayscale.info.must_equal "PGM 4x3 Grayscale"
-    @color.info.must_equal "PPM 5x3 Color"
+    _(@bilevel.info).must_equal "PBM 5x6 Bilevel"
+    _(@grayscale.info).must_equal "PGM 4x3 Grayscale"
+    _(@color.info).must_equal "PPM 5x3 Color"
   end
 
   it "can return meaningful debugging information" do
-    @bilevel.inspect.must_match   %r{^#<PNM::\w+Image:0x\h+ PBM 5x6 Bilevel>$}
-    @grayscale.inspect.must_match %r{^#<PNM::\w+Image:0x\h+ PGM 4x3 Grayscale, maxgray=250>$}
-    @color.inspect.must_match     %r{^#<PNM::\w+Image:0x\h+ PPM 5x3 Color, maxgray=6>$}
+    _(@bilevel.inspect).must_match   %r{\A#<PNM::PBMImage:0x\h+ PBM 5x6 Bilevel>\z}
+    _(@grayscale.inspect).must_match %r{\A#<PNM::PGMImage:0x\h+ PGM 4x3 Grayscale, maxgray=250>\z}
+    _(@color.inspect).must_match     %r{\A#<PNM::PPMImage:0x\h+ PPM 5x3 Color, maxgray=6>\z}
   end
 
   it "can write binary data containing CRLF" do
-    @grayscale_crlf.write(@temp_path, :binary)
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/grayscale_binary_crlf.pgm")
+    @grayscale_crlf.write(@temp_path, encoding: :binary)
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/grayscale_binary_crlf.pgm")
     File.delete(@temp_path)
   end
 
   it "can write binary data containing CRLF to an I/O stream" do
-    File.open(@temp_path, "w") {|f| @grayscale_crlf.write(f, :binary) }
-    File.binread(@temp_path).must_equal File.binread("#{@srcpath}/grayscale_binary_crlf.pgm")
+    File.open(@temp_path, "w") {|f| @grayscale_crlf.write(f, encoding: :binary) }
+    _(File.binread(@temp_path)).must_equal File.binread("#{@srcpath}/grayscale_binary_crlf.pgm")
     File.delete(@temp_path)
   end
 
   it "can write zero-length comments" do
     comment = ""
-    PNM.create([[0, 0]], comment: comment).write(@temp_path, :ascii)
-    File.binread(@temp_path).must_equal "P1\n#\n2 1\n0 0\n"
+    PNM.create([[0, 0]], comment: comment).write(@temp_path, encoding: :ascii)
+    _(File.binread(@temp_path)).must_equal "P1\n#\n2 1\n0 0\n"
     File.delete(@temp_path)
   end
 
   it "can write comments with trailing zero-length line" do
     comment = "An empty line:\n"
-    PNM.create([[0, 0]], comment: comment).write(@temp_path, :ascii)
-    File.binread(@temp_path).must_equal "P1\n# An empty line:\n#\n2 1\n0 0\n"
+    PNM.create([[0, 0]], comment: comment).write(@temp_path, encoding: :ascii)
+    _(File.binread(@temp_path)).must_equal "P1\n# An empty line:\n#\n2 1\n0 0\n"
     File.delete(@temp_path)
   end
 
   it "can check equality of images (1)" do
     pixels = [[0, 1, 0], [1, 0, 1]]
-    bilevel  = PNM.create(pixels, comment: "image")
+    bilevel1 = PNM.create(pixels, comment: "image")
     bilevel2 = PNM.create(pixels, comment: "image")
 
-    (bilevel2 == bilevel).must_equal true
+    _(bilevel2 == bilevel1).must_equal true
   end
 
   it "can check equality of images (2)" do
     pixels = [[0, 1, 0], [1, 0, 1]]
-    bilevel  = PNM.create(pixels, comment: "image")
+    bilevel1 = PNM.create(pixels, comment: "image")
     bilevel2 = PNM.create(pixels, comment: "other image")
 
-    (bilevel2 == bilevel).must_equal false
+    _(bilevel2 == bilevel1).must_equal false
   end
 
   it "can check equality of images (3)" do
     pixels = [[0, 1, 0], [1, 0, 1]]
-    bilevel  = PNM.create(pixels)
+    bilevel1 = PNM.create(pixels)
     bilevel2 = PNM.create(pixels.reverse)
 
-    (bilevel2 == bilevel).must_equal false
+    _(bilevel2 == bilevel1).must_equal false
   end
 
   it "can check equality of images (4)" do
     pixels = [[0, 1, 0], [1, 0, 1]]
-    bilevel   = PNM.create(pixels, type: :pbm)
+    bilevel = PNM.create(pixels, type: :pbm)
     graylevel = PNM.create(pixels, type: :pgm)
 
-    (graylevel == bilevel).must_equal false
+    _(graylevel == bilevel).must_equal false
   end
 
   it "can check equality of images (5)" do
     pixels = [[0, 1, 2], [3, 4, 5]]
-    graylevel  = PNM.create(pixels, maxgray: 10)
+    graylevel1 = PNM.create(pixels, maxgray: 10)
     graylevel2 = PNM.create(pixels, maxgray: 255)
 
-    (graylevel2 == graylevel).must_equal false
+    _(graylevel2 == graylevel1).must_equal false
   end
 
   it "can check equality of images (6)" do
     image = PNM.create([[0, 1, 2], [3, 4, 5]])
 
-    (image == "a string").must_equal false
+    _(image == "a string").must_equal false
   end
 end