r64161 - in /trunk/libcolor-calc-perl: ./ debian/ eg/ lib/Color/ lib/Color/Calc/ t/

periapt-guest at users.alioth.debian.org periapt-guest at users.alioth.debian.org
Fri Oct 22 22:10:08 UTC 2010


Author: periapt-guest
Date: Fri Oct 22 22:08:49 2010
New Revision: 64161

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=64161
Log:
New upstream release

Added:
    trunk/libcolor-calc-perl/MANIFEST.SKIP
      - copied unchanged from r64160, branches/upstream/libcolor-calc-perl/current/MANIFEST.SKIP
    trunk/libcolor-calc-perl/eg/
      - copied from r64160, branches/upstream/libcolor-calc-perl/current/eg/
    trunk/libcolor-calc-perl/t/color_opposite.t
      - copied unchanged from r64160, branches/upstream/libcolor-calc-perl/current/t/color_opposite.t
    trunk/libcolor-calc-perl/t/color_round.t
      - copied unchanged from r64160, branches/upstream/libcolor-calc-perl/current/t/color_round.t
    trunk/libcolor-calc-perl/t/color_safe.t
      - copied unchanged from r64160, branches/upstream/libcolor-calc-perl/current/t/color_safe.t
Modified:
    trunk/libcolor-calc-perl/Build.PL
    trunk/libcolor-calc-perl/Changes
    trunk/libcolor-calc-perl/LICENSE
    trunk/libcolor-calc-perl/MANIFEST
    trunk/libcolor-calc-perl/META.yml
    trunk/libcolor-calc-perl/Makefile.PL
    trunk/libcolor-calc-perl/SIGNATURE
    trunk/libcolor-calc-perl/debian/changelog
    trunk/libcolor-calc-perl/lib/Color/Calc.pm
    trunk/libcolor-calc-perl/lib/Color/Calc/WWW.pm
    trunk/libcolor-calc-perl/t/import_object.t
    trunk/libcolor-calc-perl/t/object-orientated.t
    trunk/libcolor-calc-perl/t/schemes_oo.t

Modified: trunk/libcolor-calc-perl/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcolor-calc-perl/Build.PL?rev=64161&op=diff
==============================================================================
--- trunk/libcolor-calc-perl/Build.PL (original)
+++ trunk/libcolor-calc-perl/Build.PL Fri Oct 22 22:08:49 2010
@@ -9,7 +9,7 @@
 my $b = Module::Build->new(
 	'module_name'	=> 'Color::Calc',
 	'license'	=> 'perl',
-	'dist_author'	=> 'Claus Färber <CFAERBER at cpan.org>',
+	'dist_author'	=> 'Claus Faerber <CFAERBER at cpan.org>',
 
 	'sign'		=> 1,
 	'create_license' => 1,

Modified: trunk/libcolor-calc-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcolor-calc-perl/Changes?rev=64161&op=diff
==============================================================================
--- trunk/libcolor-calc-perl/Changes (original)
+++ trunk/libcolor-calc-perl/Changes Fri Oct 22 22:08:49 2010
@@ -1,4 +1,12 @@
 Revision history for Perl extension Color::Calc.
+
+1.070 (2010-10-20)
+	- better workaround for #54500, now also works with explicit scheme
+	  specifications (e.g. 'HTML'), not just the default value
+	- unsupported output formats (due to uninstalled modules) now croak at
+	  import
+	- allow all types of colour schemes acceptet by Graphics::ColorNames
+	- add missing tests for Color::Calc::color_* calls
 
 1.061 (2010-02-11)
 	- workaround for #54500: ambiguity between module and file names in

Modified: trunk/libcolor-calc-perl/LICENSE
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcolor-calc-perl/LICENSE?rev=64161&op=diff
==============================================================================
--- trunk/libcolor-calc-perl/LICENSE (original)
+++ trunk/libcolor-calc-perl/LICENSE Fri Oct 22 22:08:49 2010
@@ -1,4 +1,4 @@
-This software is copyright (c) 2010 by Claus Färber <CFAERBER at cpan.org>.
+This software is copyright (c) 2010 by Claus Faerber <CFAERBER at cpan.org>.
 
 This is free software; you can redistribute it and/or modify it under
 the same terms as the Perl 5 programming language system itself.
@@ -12,7 +12,7 @@
 
 --- The GNU General Public License, Version 1, February 1989 ---
 
-This software is Copyright (c) 2010 by Claus Färber <CFAERBER at cpan.org>.
+This software is Copyright (c) 2010 by Claus Faerber <CFAERBER at cpan.org>.
 
 This is free software, licensed under:
 
@@ -270,7 +270,7 @@
 
 --- The Artistic License 1.0 ---
 
-This software is Copyright (c) 2010 by Claus Färber <CFAERBER at cpan.org>.
+This software is Copyright (c) 2010 by Claus Faerber <CFAERBER at cpan.org>.
 
 This is free software, licensed under:
 

Modified: trunk/libcolor-calc-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcolor-calc-perl/MANIFEST?rev=64161&op=diff
==============================================================================
--- trunk/libcolor-calc-perl/MANIFEST (original)
+++ trunk/libcolor-calc-perl/MANIFEST Fri Oct 22 22:08:49 2010
@@ -1,13 +1,21 @@
+Build.PL
 Changes
+eg/style-sheet.asp
+eg/style-sheet.pl
 lib/Color/Calc.pm
 lib/Color/Calc/WWW.pm
-Build.PL
+LICENSE
 Makefile.PL
 MANIFEST
+MANIFEST.SKIP
+META.yml
 README
 t/00basic.t
 t/10pod.t
 t/11pod_cover.t
+t/color_opposite.t
+t/color_round.t
+t/color_safe.t
 t/DEPRECATED_import_MODEval.t
 t/DEPRECATED_import_suffix.t
 t/DEPRECATED_non-import_MODEval.t
@@ -24,6 +32,4 @@
 t/schemes_import_HTML.t
 t/schemes_import_X.t
 t/schemes_oo.t
-META.yml
-LICENSE
 SIGNATURE    Added here by Module::Build

Modified: trunk/libcolor-calc-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcolor-calc-perl/META.yml?rev=64161&op=diff
==============================================================================
--- trunk/libcolor-calc-perl/META.yml (original)
+++ trunk/libcolor-calc-perl/META.yml Fri Oct 22 22:08:49 2010
@@ -1,13 +1,13 @@
 ---
 abstract: 'Simple calculations with RGB colors.'
 author:
-  - 'Claus Färber <CFAERBER at cpan.org>'
+  - 'Claus Faerber <CFAERBER at cpan.org>'
 build_requires:
   Test::More: 0
   Test::NoWarnings: 0
 configure_requires:
   Module::Build: 0.36
-generated_by: 'Module::Build version 0.3603'
+generated_by: 'Module::Build version 0.3607'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -18,10 +18,10 @@
 provides:
   Color::Calc:
     file: lib/Color/Calc.pm
-    version: 1.061
+    version: 1.070
   Color::Calc::WWW:
     file: lib/Color/Calc/WWW.pm
-    version: 1.060
+    version: 1.070
 requires:
   Graphics::ColorNames: 2.1
   Graphics::ColorNames::HTML: 0
@@ -29,4 +29,4 @@
   Params::Validate: 0.75
 resources:
   license: http://dev.perl.org/licenses/
-version: 1.061
+version: 1.070

Modified: trunk/libcolor-calc-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcolor-calc-perl/Makefile.PL?rev=64161&op=diff
==============================================================================
--- trunk/libcolor-calc-perl/Makefile.PL (original)
+++ trunk/libcolor-calc-perl/Makefile.PL Fri Oct 22 22:08:49 2010
@@ -1,4 +1,4 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.3603
+# Note: this file was auto-generated by Module::Build::Compat version 0.3607
 use ExtUtils::MakeMaker;
 WriteMakefile
 (

Modified: trunk/libcolor-calc-perl/SIGNATURE
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcolor-calc-perl/SIGNATURE?rev=64161&op=diff
==============================================================================
--- trunk/libcolor-calc-perl/SIGNATURE (original)
+++ trunk/libcolor-calc-perl/SIGNATURE Fri Oct 22 22:08:49 2010
@@ -1,5 +1,5 @@
 This file contains message digests of all files listed in MANIFEST,
-signed via the Module::Signature module, version 0.61.
+signed via the Module::Signature module, version 0.64.
 
 To verify the content in this distribution, first make sure you have
 Module::Signature installed, then type:
@@ -14,15 +14,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-SHA1 248ceaf62d4049c2d62de7f6e0d3933cd209c59e Build.PL
-SHA1 8ba3a4c6acc6eb00dfe6026a11307c5ea0fa5830 Changes
-SHA1 9b37c74ac55bf4a1d347a873f9936ca24cab4f3b LICENSE
-SHA1 f51962c7a43c271f18fb8de867b11f6a2ed9bfb8 MANIFEST
-SHA1 fa539c08552ca09172f9dfc444189ef365766154 META.yml
-SHA1 ed55005fa0888011e5032b177eb8a9705f47743e Makefile.PL
+SHA1 d75fb0028306e5310c98ca7c7dca2e06d116e1c9 Build.PL
+SHA1 2b90fb656fe5e925ebc169c02784ae9c203d8a6c Changes
+SHA1 9190200052fd314c4731eee1fb62da49259738df LICENSE
+SHA1 5aaec14ca4814f5a6fe8cf9d7fada1942cce8ff9 MANIFEST
+SHA1 3d70456e64d970a5fe3acc6ac2033133de70d342 MANIFEST.SKIP
+SHA1 e20167ff86d547ded351f83760e9feb3cc36e6aa META.yml
+SHA1 f19e5586946f919c9f93e6efec5c925c68c25652 Makefile.PL
 SHA1 5ed9e2aadb613986d5ac3a78aaad9c75ffbed777 README
-SHA1 e34196484034c492be57bad90c45bd1b60751493 lib/Color/Calc.pm
-SHA1 604be3c31f371b6100c88640bd8b880f07a655eb lib/Color/Calc/WWW.pm
+SHA1 9d1b1a2592814a5faf66fe2b54c7617f11ceb958 eg/style-sheet.asp
+SHA1 42e5f6066aeb6a6628d09c04159a9bca2af8a15d eg/style-sheet.pl
+SHA1 a66a8bcf68a6e4398f2f52e2328e1eaf496e7800 lib/Color/Calc.pm
+SHA1 ece3298db5ff7f1ebc818526a9d82088f48939ba lib/Color/Calc/WWW.pm
 SHA1 dd5e2852432a4d8a54d31a74f4f003f88b405473 t/00basic.t
 SHA1 056063d18c3f48338620bbff698f81f91f2ea4d0 t/10pod.t
 SHA1 e2b1f468d6ea1199f0d68655d25532095435aac8 t/11pod_cover.t
@@ -30,22 +33,25 @@
 SHA1 06bf92fe8ca89d99d76b1c19e698ffff50e1a3f9 t/DEPRECATED_import_suffix.t
 SHA1 35bac9ad47423d312eb8ad4afd549d43af2e0487 t/DEPRECATED_non-import_MODEval.t
 SHA1 a3986b8e72a3085f8eae6c7c68ff114fa59f0ad5 t/DEPRECATED_non-import_suffix.t
+SHA1 4e8ff91a5d3a40f4f64a79598dd97fc44c431f33 t/color_opposite.t
+SHA1 69a713d2b91ce77d3b4114db6e7da74ecc6b4ad8 t/color_round.t
+SHA1 c0c72124a020a1d3b17ae3877be8e59deef918ca t/color_safe.t
 SHA1 193eb24082f96dbdf2583e7befd20431d857484d t/import_MODEval.t
 SHA1 a4882816406cf9f8f7205f8420894651fa13b45c t/import_WWW.t
 SHA1 a0a5b31e8c3726bc4a111a84dd77869e55413678 t/import_hex.t
 SHA1 898e52e203b9c19e486cffc59b2494870370b445 t/import_html.t
-SHA1 d4999f8e679e56289e56860a66944b37d60f9885 t/import_object.t
+SHA1 e3f8994b5043707a36b84a4ace3f5bf1cd709c44 t/import_object.t
 SHA1 7f9add37de26d3482f7055a9b7acca1bdfbba085 t/import_tuple.t
 SHA1 327c1093fd5169461ee4896f3abec3dc03ce27ec t/input_import.t
 SHA1 c9bc6ff10d2f99e366a1a466561c8765d07d286d t/input_oo.t
-SHA1 f556013d4147dd3efd16086da596c195ab1035e5 t/object-orientated.t
+SHA1 aecc3997d1697c21382f3703bea8605a8fe2aead t/object-orientated.t
 SHA1 f2f7d33d66bc54c58e7bae2bcaa394186c8ed949 t/schemes_import_HTML.t
 SHA1 0ab6466fd71de056a14dd8c039816c0bf9d00afc t/schemes_import_X.t
-SHA1 3edac7a11bd52b080cee180f47ed38235441b38f t/schemes_oo.t
+SHA1 db1f43e67cd656e7b02a253570e922b3354a4479 t/schemes_oo.t
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (Darwin)
 
-iEYEARECAAYFAktzSGAACgkQSKUOY2OWgPCP5wCeJbVQShttUVnIZhc2Rlo5+mcf
-SUEAnjzzI76Ewpp/E5Ft0MnuZZj9lhZ3
-=vlSG
+iEYEARECAAYFAky/bSQACgkQSKUOY2OWgPCUIwCdH6fjyVxWOjgYi9MiH67Hogb7
+/5oAn39eYl0/7mJP4Mmudt7BHhMJEAzE
+=Wghp
 -----END PGP SIGNATURE-----

Modified: trunk/libcolor-calc-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcolor-calc-perl/debian/changelog?rev=64161&op=diff
==============================================================================
--- trunk/libcolor-calc-perl/debian/changelog (original)
+++ trunk/libcolor-calc-perl/debian/changelog Fri Oct 22 22:08:49 2010
@@ -1,8 +1,9 @@
-libcolor-calc-perl (1.061-2) UNRELEASED; urgency=low
+libcolor-calc-perl (1.070-1) UNRELEASED; urgency=low
 
   * Added myself to Uploaders
+  * New upstream release
 
- -- Nicholas Bamber <nicholas at periapt.co.uk>  Fri, 22 Oct 2010 23:01:10 +0100
+ -- Nicholas Bamber <nicholas at periapt.co.uk>  Fri, 22 Oct 2010 23:09:20 +0100
 
 libcolor-calc-perl (1.061-1) unstable; urgency=low
 

Modified: trunk/libcolor-calc-perl/lib/Color/Calc.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcolor-calc-perl/lib/Color/Calc.pm?rev=64161&op=diff
==============================================================================
--- trunk/libcolor-calc-perl/lib/Color/Calc.pm (original)
+++ trunk/libcolor-calc-perl/lib/Color/Calc.pm Fri Oct 22 22:08:49 2010
@@ -16,7 +16,7 @@
 use Graphics::ColorNames qw( hex2tuple tuple2hex );
 use Graphics::ColorNames::HTML qw();
 
-our $VERSION = "1.061";
+our $VERSION = "1.070";
 $VERSION = eval $VERSION;
 
 our $MODE = ();
@@ -38,12 +38,23 @@
   safe
 );
 
+sub __put_tuple { map { my $a = int($_); length($a) % 3 ? $a : dualvar($a, "0$a") } @_ };
+sub __put_hex 	{ dualvar((reduce { ($a << 8) | ($b & 0xFF) } @_), tuple2hex(@_)) };
+sub __put_html	{ my $col = lc(tuple2hex(@_)); $__HTMLColors{$col} || '#'.$col; };
+sub __put_object{ return Graphics::ColorObject->new_RGB255( \@_, '', '' ); };
+sub __put_obj	{ return Color::Object->newRGB(map { 255*$_; } @_); };
+
 my %__formats = (
-  'tuple'	=> sub { map { my $a = int($_); length($a) % 3 ? $a : dualvar($a, "0$a") } @_ },
-  'hex'		=> sub { dualvar((reduce { ($a << 8) | ($b & 0xFF) } @_), tuple2hex(@_)) },
-  'html'	=> sub { my $col = lc(tuple2hex(@_)); $__HTMLColors{$col} || '#'.$col; },
-  'object'	=> sub { eval { require Graphics::ColorObject; }; return Graphics::ColorObject->new_RGB255( \@_ ); },
-  'obj'		=> sub { eval { require Color::Object; }; return Color::Object->newRGB(map { 255*$_; } @_); },
+  map { m/^__put_(.*)/ ? ( $1 => $Color::Calc::{$_} ) : () }
+    keys %Color::Calc::
+);
+
+# use Data::Dumper;
+# print STDERR Dumper(\%__formats);
+
+my %__formats_require = (
+  'obj'		=> 'Color::Object',
+  'object'	=> 'Graphics::ColorObject',
 );
 
 $__formats{'pdf'} = $__formats{'html'};
@@ -63,7 +74,7 @@
 our @ISA = ('Exporter');
 
 my %new_param = (
-  'ColorScheme' => { type => SCALAR, optional => 1 },
+  'ColorScheme' => { type => SCALAR | HANDLE | HASHREF | ARRAYREF | CODEREF, optional => 1 },
   'OutputFormat' => { type => SCALAR, untaint => 1, regexp => qr($__formats_re), optional => 1 },
 );
 
@@ -71,9 +82,17 @@
   my $pkg = shift; validate(@_, \%new_param);
   my $self = {@_}; bless($self, $pkg);
 
-  if(!ref($self->{'ColorScheme'})) {
+  unless(UNIVERSAL::isa($self->{'ColorScheme'}, 'Graphics::ColorNames')) {
     my %ColorNames;
     if(defined $self->{'ColorScheme'}) {
+      if(!ref $self->{'ColorScheme'} && $self->{'ColorScheme'} =~ m/^([[:alnum:]_]+)$/) {
+        my $module = 'Graphics::ColorNames::'.$1;
+        eval "use $module;"; croak $! if $!;
+        my $names = UNIVERSAL::can($module, 'NamesRgbTable');
+        croak "$module is not compatible with Graphics::ColorNames" if !$names;
+        $self->{'ColorScheme'} = &$names();
+      }
+
       tie %ColorNames, 'Graphics::ColorNames', $self->{'ColorScheme'};
     } else {
       tie %ColorNames, 'Graphics::ColorNames';
@@ -82,7 +101,6 @@
   }
 
   $self->set_output_format($self->{'OutputFormat'} || 'tuple');
-
   return $self;
 }
 
@@ -156,7 +174,7 @@
 }
 
 sub __normtuple_in {
-  return map { ($_ < 0) ? 0 : (($_ > 255) ? 255 : int($_+.5)) } @_;
+  return map { (!defined($_) || $_ < 0) ? 0 : (($_ > 255) ? 255 : int($_+.5)) } @_;
 }
 
 sub __is_col_val {
@@ -206,7 +224,7 @@
   }
   else {
     my $col = $self->{'ColorScheme'}->{$$p[0]};
-    if($col) {
+    if(defined $col) {
       shift @$p; 
       return hex2tuple($col);
     } else {
@@ -216,12 +234,23 @@
   }
 }
 
+sub __require_format {
+  my $new_fmt = shift;
+
+  if(exists $__formats_require{$new_fmt}) {
+    eval "use $__formats_require{$new_fmt}()"; 
+    croak $@ if $@;
+  }
+  return 1;
+}
+
 sub set_output_format {
   validate_pos(@_, { isa => __PACKAGE__ }, { type => SCALAR, regexp => qr($__formats_re) });
   my $self = shift;
+  my $new_fmt = shift;
 
   my $old = $self->{'OutputFormat'};
-  $self->{'OutputFormat'} = shift;
+  $self->{'OutputFormat'} = $new_fmt;
 
   $self->{'__put'} = $self->{'OutputFormat'} eq '__MODEvar' 
     ? sub{ return $__formats{$MODE || 'tuple'}->(@_); }
@@ -288,6 +317,10 @@
 possible values, please refer to the documentation of of
 C<Graphics::ColorNames>.
 
+Unlike C<Graphics::ColorNames>, barewords are I<always> interpreted as a module
+name under C<Graphics::ColorNames>. If you really want to use a filename like
+"foo", you have to write it as "./foo".
+
 Default: C<X> (Note: This is incompatible with HTML color names).
 
 =item OutputFormat
@@ -731,6 +764,7 @@
 =cut
 
 foreach my $format (@__formats) {
+  next if !eval{__require_format($format)};
   __import(__PACKAGE__, 'Prefix' => 'color', '__Suffix' => "_$format", 'OutputFormat' => $format);
   __import(__PACKAGE__, 'Prefix' => '',      '__Suffix' => "_$format", 'OutputFormat' => $format);
 }

Modified: trunk/libcolor-calc-perl/lib/Color/Calc/WWW.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcolor-calc-perl/lib/Color/Calc/WWW.pm?rev=64161&op=diff
==============================================================================
--- trunk/libcolor-calc-perl/lib/Color/Calc/WWW.pm (original)
+++ trunk/libcolor-calc-perl/lib/Color/Calc/WWW.pm Fri Oct 22 22:08:49 2010
@@ -6,9 +6,13 @@
 use Carp;
 
 use Exporter;
-use Color::Calc('OutputFormat' => 'html', 'ColorScheme' => 'WWW');
 
-our $VERSION = "1.060";
+use Color::Calc(
+  'OutputFormat' => 'html',
+  'ColorScheme' => 'WWW'
+);
+
+our $VERSION = "1.070";
 $VERSION = eval $VERSION;
 
 our @ISA = qw(Exporter);

Modified: trunk/libcolor-calc-perl/t/import_object.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcolor-calc-perl/t/import_object.t?rev=64161&op=diff
==============================================================================
--- trunk/libcolor-calc-perl/t/import_object.t (original)
+++ trunk/libcolor-calc-perl/t/import_object.t Fri Oct 22 22:08:49 2010
@@ -1,10 +1,12 @@
 use Test::More tests => 14;
 use Test::NoWarnings;
-use Color::Calc( 'OutputFormat' => 'object' );
+require Color::Calc;
 
 SKIP: {
 eval { require Graphics::ColorObject; };
 skip "Graphics::ColorObject not installed", 13 if $@;
+
+Color::Calc->import( 'OutputFormat' => 'object' );
 
 is(lc color_get		('red')->as_RGBhex,		'ff0000');
 is(lc color    		('red')->as_RGBhex,		'ff0000');

Modified: trunk/libcolor-calc-perl/t/object-orientated.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcolor-calc-perl/t/object-orientated.t?rev=64161&op=diff
==============================================================================
--- trunk/libcolor-calc-perl/t/object-orientated.t (original)
+++ trunk/libcolor-calc-perl/t/object-orientated.t Fri Oct 22 22:08:49 2010
@@ -32,10 +32,11 @@
 is($cc->invert		('red'),		'aqua');
 is($cc->light		('red'),		'#ff8080');
 
-$cc = Color::Calc->new( 'OutputFormat' => 'object' );
 SKIP: {
 eval { require Graphics::ColorObject; };
 skip "Graphics::ColorObject not installed", 12 if $@;
+
+$cc = Color::Calc->new( 'OutputFormat' => 'object' );
 
 is(lc $cc->get		('red')->as_RGBhex,		'ff0000');
 is(lc $cc->mix		('red','blue')->as_RGBhex,	'800080');

Modified: trunk/libcolor-calc-perl/t/schemes_oo.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcolor-calc-perl/t/schemes_oo.t?rev=64161&op=diff
==============================================================================
--- trunk/libcolor-calc-perl/t/schemes_oo.t (original)
+++ trunk/libcolor-calc-perl/t/schemes_oo.t Fri Oct 22 22:08:49 2010
@@ -1,10 +1,13 @@
-use Test::More tests => 3;
-use Test::NoWarnings;
+use Test::More tests => 4;
+# use Test::NoWarnings;
 use Color::Calc();
 
+my $cc;
 
-my $cc = Color::Calc->new( 'OutputFormat' => 'html' );
-is($cc->get	('green'),		'lime');
+$cc = Color::Calc->new( 'OutputFormat' => 'html' );
+isa_ok($cc, 'Color::Calc');
+is($cc->get('green'), 'lime', 'X (default) ColorScheme');
 
 $cc = Color::Calc->new( 'ColorScheme' => 'HTML', 'OutputFormat' => 'html' );
-is($cc->get	('green'),		'green');
+isa_ok($cc, 'Color::Calc');
+is($cc->get('green'), 'green', 'HTML ColorScheme');




More information about the Pkg-perl-cvs-commits mailing list