color 1.4.1 → 1.4.2

data/test/test_gimp.rb

@@ -1,24 +1,12 @@
-#!/usr/bin/env ruby
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.5.0
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#++
+gem 'minitest'
+require 'minitest/autorun'
 
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
-require 'test/unit'
 require 'color'
 require 'color/palette/gimp'
 
 module TestColor
   module TestPalette
-    class TestGimp < Test::Unit::TestCase
+    class TestGimp < Minitest::Test
       include Color::Palette
 
       GIMP_W3C = <<-EOS
@@ -43,7 +31,7 @@ Columns: 2
 0 128 0		Green
 0 0 255		Blue
 0 0 128		Navy
-0 0 0 		Black 
+0 0 0 		Black
       EOS
 
       def setup
@@ -64,7 +52,7 @@ Columns: 2
       def test_each_name
         @gimp = Gimp.new(GIMP_W3C)
         assert_equal(16, @gimp.instance_variable_get(:@names).size)
-        
+
         @gimp.each_name { |color_name, color_set|
           assert_kind_of(Array, color_set)
           color_set.each { |c|
@@ -74,12 +62,10 @@ Columns: 2
       end
 
       def test_index
-        assert_nothing_raised do
-          File.open(@filename, "wb") do |f|
-            f.write GIMP_W3C
-          end
+        File.open(@filename, "wb") do |f|
+          f.write GIMP_W3C
         end
-        assert_nothing_raised { @gimp = Gimp.from_file(@filename) }
+        @gimp = Gimp.from_file(@filename)
         assert_equal(Color::RGB::White, @gimp[0])
         assert_equal(Color::RGB::White, @gimp["White"][0])
         assert_equal([Color::RGB::White, Color::RGB::Black],

data/test/test_grayscale.rb

@@ -1,22 +1,10 @@
-#!/usr/bin/env ruby
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.5.0
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#++
-
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
-require 'test/unit'
+gem 'minitest'
+require 'minitest/autorun'
+
 require 'color'
 
 module TestColor
-  class TestGrayScale < Test::Unit::TestCase
+  class TestGrayScale < Minitest::Test
     def setup
       @gs = Color::GrayScale.from_percent(33)
     end
@@ -32,11 +20,11 @@ module TestColor
     def test_g
       assert_in_delta(0.33, @gs.g, Color::COLOR_TOLERANCE)
       assert_in_delta(33, @gs.grey, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @gs.gray = 40 }
+      @gs.gray = 40
       assert_in_delta(0.4, @gs.g, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @gs.g = 2.0 }
+      @gs.g = 2.0
       assert_in_delta(100, @gs.gray, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @gs.grey = -2.0 }
+      @gs.grey = -2.0
       assert_in_delta(0.0, @gs.g, Color::COLOR_TOLERANCE)
     end
 
@@ -56,8 +44,7 @@ module TestColor
     end
 
     def test_to_cmyk
-      cmyk = nil
-      assert_nothing_raised { cmyk = @gs.to_cmyk }
+      cmyk = @gs.to_cmyk
       assert_kind_of(Color::CMYK, cmyk)
       assert_in_delta(0.0, cmyk.c, Color::COLOR_TOLERANCE)
       assert_in_delta(0.0, cmyk.m, Color::COLOR_TOLERANCE)
@@ -71,8 +58,7 @@ module TestColor
     end
 
     def test_to_hsl
-      hsl = nil
-      assert_nothing_raised { hsl = @gs.to_hsl }
+      hsl = @gs.to_hsl
       assert_kind_of(Color::HSL, hsl)
       assert_in_delta(0.0, hsl.h, Color::COLOR_TOLERANCE)
       assert_in_delta(0.0, hsl.s, Color::COLOR_TOLERANCE)
@@ -82,8 +68,7 @@ module TestColor
     end
 
     def test_to_rgb
-      rgb = nil
-      assert_nothing_raised { rgb = @gs.to_rgb }
+      rgb = @gs.to_rgb
       assert_kind_of(Color::RGB, rgb)
       assert_in_delta(0.33, rgb.r, Color::COLOR_TOLERANCE)
       assert_in_delta(0.33, rgb.g, Color::COLOR_TOLERANCE)
@@ -91,8 +76,7 @@ module TestColor
     end
 
     def test_to_yiq
-      yiq = nil
-      assert_nothing_raised { yiq = @gs.to_yiq }
+      yiq = @gs.to_yiq
       assert_kind_of(Color::YIQ, yiq)
       assert_in_delta(0.33, yiq.y, Color::COLOR_TOLERANCE)
       assert_in_delta(0.0, yiq.i, Color::COLOR_TOLERANCE)

data/test/test_hsl.rb

@@ -1,24 +1,10 @@
-#!/usr/bin/env ruby
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.5.0
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#
-# HSL Tests provided by Adam Johnson
-#++
+gem 'minitest'
+require 'minitest/autorun'
 
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
-require 'test/unit'
 require 'color'
 
 module TestColor
-  class TestHSL < Test::Unit::TestCase
+  class TestHSL < Minitest::Test
     def setup
 #     @hsl = Color::HSL.new(262, 67, 42)
       @hsl = Color::HSL.new(145, 20, 30)
@@ -40,40 +26,40 @@ module TestColor
     def test_hue
       assert_in_delta 0.4027, @hsl.h, Color::COLOR_TOLERANCE
       assert_in_delta 145, @hsl.hue, Color::COLOR_TOLERANCE
-      assert_nothing_raised { @hsl.hue = 33 }
+      @hsl.hue = 33
       assert_in_delta 0.09167, @hsl.h, Color::COLOR_TOLERANCE
-      assert_nothing_raised { @hsl.hue = -33 }
+      @hsl.hue = -33
       assert_in_delta 0.90833, @hsl.h, Color::COLOR_TOLERANCE
-      assert_nothing_raised { @hsl.h = 3.3 }
+      @hsl.h = 3.3
       assert_in_delta 360, @hsl.hue, Color::COLOR_TOLERANCE
-      assert_nothing_raised { @hsl.h = -3.3 }
+      @hsl.h = -3.3
       assert_in_delta 0.0, @hsl.h, Color::COLOR_TOLERANCE
-      assert_nothing_raised { @hsl.hue = 0 }
-      assert_nothing_raised { @hsl.hue -= 20 }
+      @hsl.hue = 0
+      @hsl.hue -= 20
       assert_in_delta 340, @hsl.hue, Color::COLOR_TOLERANCE
-      assert_nothing_raised { @hsl.hue += 45 }
+      @hsl.hue += 45
       assert_in_delta 25, @hsl.hue, Color::COLOR_TOLERANCE
     end
 
     def test_saturation
       assert_in_delta 0.2, @hsl.s, Color::COLOR_TOLERANCE
       assert_in_delta 20, @hsl.saturation, Color::COLOR_TOLERANCE
-      assert_nothing_raised { @hsl.saturation = 33 }
+      @hsl.saturation = 33
       assert_in_delta 0.33, @hsl.s, Color::COLOR_TOLERANCE
-      assert_nothing_raised { @hsl.s = 3.3 }
+      @hsl.s = 3.3
       assert_in_delta 100, @hsl.saturation, Color::COLOR_TOLERANCE
-      assert_nothing_raised { @hsl.s = -3.3 }
+      @hsl.s = -3.3
       assert_in_delta 0.0, @hsl.s, Color::COLOR_TOLERANCE
     end
 
     def test_luminance
       assert_in_delta 0.3, @hsl.l, Color::COLOR_TOLERANCE
       assert_in_delta 30, @hsl.luminosity, Color::COLOR_TOLERANCE
-      assert_nothing_raised { @hsl.luminosity = 33 }
+      @hsl.luminosity = 33
       assert_in_delta 0.33, @hsl.l, Color::COLOR_TOLERANCE
-      assert_nothing_raised { @hsl.l = 3.3 }
+      @hsl.l = 3.3
       assert_in_delta 100, @hsl.lightness, Color::COLOR_TOLERANCE
-      assert_nothing_raised { @hsl.l = -3.3 }
+      @hsl.l = -3.3
       assert_in_delta 0.0, @hsl.l, Color::COLOR_TOLERANCE
     end
 
@@ -83,8 +69,7 @@ module TestColor
     end
 
     def test_to_cmyk
-      cmyk = nil
-      assert_nothing_raised { cmyk = @hsl.to_cmyk }
+      cmyk = @hsl.to_cmyk
       assert_kind_of Color::CMYK, cmyk
       assert_in_delta 0.3223, cmyk.c, Color::COLOR_TOLERANCE
       assert_in_delta 0.2023, cmyk.m, Color::COLOR_TOLERANCE
@@ -93,15 +78,13 @@ module TestColor
     end
 
     def test_to_grayscale
-      gs = nil
-      assert_nothing_raised { gs = @hsl.to_grayscale }
+      gs = @hsl.to_grayscale
       assert_kind_of Color::GreyScale, gs
       assert_in_delta 30, gs.gray, Color::COLOR_TOLERANCE
     end
 
     def test_to_rgb
-      rgb = nil
-      assert_nothing_raised { rgb = @hsl.to_rgb }
+      rgb = @hsl.to_rgb
       assert_kind_of Color::RGB, rgb
       assert_in_delta 0.24, rgb.r, Color::COLOR_TOLERANCE
       assert_in_delta 0.36, rgb.g, Color::COLOR_TOLERANCE
@@ -125,8 +108,7 @@ module TestColor
     end
 
     def test_to_yiq
-      yiq = nil
-      assert_nothing_raised { yiq = @hsl.to_yiq }
+      yiq = @hsl.to_yiq
       assert_kind_of Color::YIQ, yiq
       assert_in_delta 0.3161, yiq.y, Color::COLOR_TOLERANCE
       assert_in_delta 0.0, yiq.i, Color::COLOR_TOLERANCE

data/test/test_monocontrast.rb

@@ -1,24 +1,12 @@
-#!/usr/bin/env ruby
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.5.0
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#++
+gem 'minitest'
+require 'minitest/autorun'
 
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
-require 'test/unit'
 require 'color'
 require 'color/palette/monocontrast'
 
 module TestColor
   module TestPalette
-    class TestMonoContrast < Test::Unit::TestCase
+    class TestMonoContrast < Minitest::Test
       include Color::Palette
       def setup
         @high = Color::RGB.from_html("#c9e3a6")
@@ -105,14 +93,14 @@ module TestColor
         assert_in_delta(MonoContrast::DEFAULT_MINIMUM_BRIGHTNESS_DIFF,
                         @mcp1.minimum_brightness_diff, Color::COLOR_TOLERANCE)
         mcps = @mcp1.dup
-        assert_nothing_raised { @mcp1.minimum_brightness_diff = 0.75 }
+        @mcp1.minimum_brightness_diff = 0.75
         assert_in_delta(0.75, @mcp1.minimum_brightness_diff, Color::COLOR_TOLERANCE)
-        assert_not_equal(@mcp1.foreground[-5], mcps.foreground[-5])
-        assert_nothing_raised { @mcp1.minimum_brightness_diff = 4.0 }
+        refute_equal(@mcp1.foreground[-5], mcps.foreground[-5])
+        @mcp1.minimum_brightness_diff = 4.0
         assert_in_delta(1, @mcp1.minimum_brightness_diff, Color::COLOR_TOLERANCE)
-        assert_nothing_raised { @mcp1.minimum_brightness_diff = -4.0 }
+        @mcp1.minimum_brightness_diff = -4.0
         assert_in_delta(0, @mcp1.minimum_brightness_diff, Color::COLOR_TOLERANCE)
-        assert_nothing_raised { @mcp1.minimum_brightness_diff = nil }
+        @mcp1.minimum_brightness_diff = nil
         assert_in_delta(MonoContrast::DEFAULT_MINIMUM_BRIGHTNESS_DIFF,
                         @mcp1.minimum_brightness_diff, Color::COLOR_TOLERANCE)
       end
@@ -126,14 +114,14 @@ module TestColor
         assert_in_delta(MonoContrast::DEFAULT_MINIMUM_COLOR_DIFF,
                         @mcp1.minimum_color_diff, Color::COLOR_TOLERANCE)
         mcps = @mcp1.dup
-        assert_nothing_raised { @mcp1.minimum_color_diff = 0.75 }
+        @mcp1.minimum_color_diff = 0.75
         assert_in_delta(0.75, @mcp1.minimum_color_diff, Color::COLOR_TOLERANCE)
-        assert_not_equal(@mcp1.foreground[-5], mcps.foreground[-5])
-        assert_nothing_raised { @mcp1.minimum_color_diff = 4.0 }
+        refute_equal(@mcp1.foreground[-5], mcps.foreground[-5])
+        @mcp1.minimum_color_diff = 4.0
         assert_in_delta(3, @mcp1.minimum_color_diff, Color::COLOR_TOLERANCE)
-        assert_nothing_raised { @mcp1.minimum_color_diff = -4.0 }
+        @mcp1.minimum_color_diff = -4.0
         assert_in_delta(0, @mcp1.minimum_color_diff, Color::COLOR_TOLERANCE)
-        assert_nothing_raised { @mcp1.minimum_color_diff = nil }
+        @mcp1.minimum_color_diff = nil
         assert_in_delta(MonoContrast::DEFAULT_MINIMUM_COLOR_DIFF,
                         @mcp1.minimum_color_diff, Color::COLOR_TOLERANCE)
       end

data/test/test_rgb.rb

@@ -1,22 +1,10 @@
-#!/usr/bin/env ruby
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.5.0
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#++
-
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
-require 'test/unit'
+gem 'minitest'
+require 'minitest/autorun'
+
 require 'color'
 
 module TestColor
-  class TestRGB < Test::Unit::TestCase
+  class TestRGB < Minitest::Test
     def test_adjust_brightness
       assert_equal("#1a1aff", Color::RGB::Blue.adjust_brightness(10).html)
       assert_equal("#0000e6", Color::RGB::Blue.adjust_brightness(-10).html)
@@ -40,11 +28,11 @@ module TestColor
       assert_in_delta(100, red.red_p, Color::COLOR_TOLERANCE)
       assert_in_delta(255, red.red, Color::COLOR_TOLERANCE)
       assert_in_delta(1.0, red.r, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { red.red_p = 33 }
+      red.red_p = 33
       assert_in_delta(0.33, red.r, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { red.red = 330 }
+      red.red = 330
       assert_in_delta(1.0, red.r, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { red.r = -3.3 }
+      red.r = -3.3
       assert_in_delta(0.0, red.r, Color::COLOR_TOLERANCE)
     end
 
@@ -53,11 +41,11 @@ module TestColor
       assert_in_delta(1.0, lime.g, Color::COLOR_TOLERANCE)
       assert_in_delta(100, lime.green_p, Color::COLOR_TOLERANCE)
       assert_in_delta(255, lime.green, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { lime.green_p = 33 }
+      lime.green_p = 33
       assert_in_delta(0.33, lime.g, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { lime.green = 330 }
+      lime.green = 330
       assert_in_delta(1.0, lime.g, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { lime.g = -3.3 }
+      lime.g = -3.3
       assert_in_delta(0.0, lime.g, Color::COLOR_TOLERANCE)
     end
 
@@ -66,11 +54,11 @@ module TestColor
       assert_in_delta(1.0, blue.b, Color::COLOR_TOLERANCE)
       assert_in_delta(255, blue.blue, Color::COLOR_TOLERANCE)
       assert_in_delta(100, blue.blue_p, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { blue.blue_p = 33 }
+      blue.blue_p = 33
       assert_in_delta(0.33, blue.b, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { blue.blue = 330 }
+      blue.blue = 330
       assert_in_delta(1.0, blue.b, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { blue.b = -3.3 }
+      blue.b = -3.3
       assert_in_delta(0.0, blue.b, Color::COLOR_TOLERANCE)
     end
 
@@ -254,7 +242,7 @@ module TestColor
       # where HSL conversion was not quite correct, resulting in a bad
       # round-trip.
       assert_equal("#008800", Color::RGB.from_html("#008800").to_hsl.html)
-      assert_not_equal("#002288", Color::RGB.from_html("#008800").to_hsl.html)
+      refute_equal("#002288", Color::RGB.from_html("#008800").to_hsl.html)
 
       # The following tests a bug reported by Adam Johnson on 29 October
       # 2010.
@@ -290,10 +278,10 @@ module TestColor
     end
 
     def test_add
-      assert_nothing_raised { Color::RGB::Cyan + Color::RGB::Yellow }
-      white = Color::RGB::Cyan + Color::RGB::Yellow 
-      assert_not_nil(white)
-      assert_equal(Color::RGB::White, white) 
+      Color::RGB::Cyan + Color::RGB::Yellow
+      white = Color::RGB::Cyan + Color::RGB::Yellow
+      refute_nil(white)
+      assert_equal(Color::RGB::White, white)
 
       c1 = Color::RGB.new(0x80, 0x80, 0x00)
       c2 = Color::RGB.new(0x45, 0x20, 0xf0)
@@ -304,7 +292,7 @@ module TestColor
 
     def test_subtract
       black = Color::RGB::LightCoral - Color::RGB::Honeydew
-      assert_equal(Color::RGB::Black, black) 
+      assert_equal(Color::RGB::Black, black)
 
       c1 = Color::RGB.new(0x85, 0x80, 0x00)
       c2 = Color::RGB.new(0x40, 0x20, 0xf0)
@@ -315,7 +303,7 @@ module TestColor
 
     def test_mean_grayscale
       c1        = Color::RGB.new(0x85, 0x80, 0x00)
-      c1_max    = assert_nothing_raised { c1.max_rgb_as_greyscale }
+      c1_max    = c1.max_rgb_as_greyscale
       c1_max    = c1.max_rgb_as_greyscale
       c1_result = Color::GrayScale.from_fraction(0x85 / 255.0)
 

data/test/test_yiq.rb

@@ -1,22 +1,10 @@
-#!/usr/bin/env ruby
-#--
-# Color
-# Colour management with Ruby
-# http://rubyforge.org/projects/color
-#   Version 1.5.0
-#
-# Licensed under a MIT-style licence. See Licence.txt in the main
-# distribution for full licensing information.
-#
-# Copyright (c) 2005 - 2010 Austin Ziegler and Matt Lyon
-#++
+gem 'minitest'
+require 'minitest/autorun'
 
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
-require 'test/unit'
 require 'color'
 
 module TestColor
-  class TestYIQ < Test::Unit::TestCase
+  class TestYIQ < Minitest::Test
     def setup
       @yiq = Color::YIQ.from_fraction(0.1, 0.2, 0.3)
     end
@@ -28,22 +16,22 @@ module TestColor
     def test_i
       assert_in_delta(0.2, @yiq.i, Color::COLOR_TOLERANCE)
       assert_in_delta(0.2, @yiq.i, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @yiq.i = 0.5 }
+      @yiq.i = 0.5
       assert_in_delta(0.5, @yiq.i, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @yiq.i = 5 }
+      @yiq.i = 5
       assert_in_delta(1.0, @yiq.i, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @yiq.i = -5 }
+      @yiq.i = -5
       assert_in_delta(0.0, @yiq.i, Color::COLOR_TOLERANCE)
     end
 
     def test_q
       assert_in_delta(0.3, @yiq.q, Color::COLOR_TOLERANCE)
       assert_in_delta(0.3, @yiq.q, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @yiq.q = 0.5 }
+      @yiq.q = 0.5
       assert_in_delta(0.5, @yiq.q, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @yiq.q = 5 }
+      @yiq.q = 5
       assert_in_delta(1.0, @yiq.q, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @yiq.q = -5 }
+      @yiq.q = -5
       assert_in_delta(0.0, @yiq.q, Color::COLOR_TOLERANCE)
     end
 
@@ -58,11 +46,11 @@ module TestColor
     def test_y
       assert_in_delta(0.1, @yiq.y, Color::COLOR_TOLERANCE)
       assert_in_delta(0.1, @yiq.y, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @yiq.y = 0.5 }
+      @yiq.y = 0.5
       assert_in_delta(0.5, @yiq.y, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @yiq.y = 5 }
+      @yiq.y = 5
       assert_in_delta(1.0, @yiq.y, Color::COLOR_TOLERANCE)
-      assert_nothing_raised { @yiq.y = -5 }
+      @yiq.y = -5
       assert_in_delta(0.0, @yiq.y, Color::COLOR_TOLERANCE)
     end