X-Git-Url: http://git.refcnt.org/?p=colorize.git;a=blobdiff_plain;f=test.pl;h=928c6987054f644dd06e48baac2b384118a05c85;hp=570a7b77c409ff2767555ada4a9db9f4eea7f6d2;hb=HEAD;hpb=3fea379ff56e28600ec70fbabfa0392cf8dfac08

diff --git a/test.pl b/test.pl
index 570a7b7..928c698 100755
--- a/test.pl
+++ b/test.pl
@@ -2,37 +2,36 @@
 
 use strict;
 use warnings;
+use lib qw(lib);
 use constant true  => 1;
 use constant false => 0;
 
-use File::Temp qw(tempfile tmpnam);
+use Colorize::Common qw(:defaults $compiler_flags %BUF_SIZE $valgrind_command $write_to_tmpfile);
+use File::Find;
+use File::Temp qw(tmpnam);
+use Getopt::Long qw(:config no_auto_abbrev no_ignore_case);
 use Test::Harness qw(runtests);
 use Test::More;
 
-my $tests = 24;
+my $tests = 32;
 
-my %BUF_SIZE = (
-   normal => 1024,
-   short  => 10,
-);
-my $source = 'colorize.c';
-my $compiler = 'gcc';
-my $compiler_flags = '-ansi -pedantic -Wall -Wextra -Wformat -Wswitch-default -Wuninitialized -Wunused -Wno-unused-function -Wno-unused-parameter';
-
-my $write_to_tmpfile = sub
+my $valgrind_cmd = '';
 {
-    my ($content) = @_;
-
-    my ($fh, $tmpfile) = tempfile(UNLINK => true);
-    print {$fh} $content;
-    close($fh);
-
-    return $tmpfile;
-};
+    my ($regular, $valgrind);
+    GetOptions(regular => \$regular, valgrind => \$valgrind) or exit;
+    if (not $regular || $valgrind) {
+        die "$0: neither --regular nor --valgrind specified, exiting\n";
+    }
+    elsif ($regular && $valgrind) {
+        die "$0: both --regular and --valgrind specified, exiting\n";
+    }
+    $valgrind_cmd = "$valgrind_command " if $valgrind;
+}
 
 {
-    my @test_files = glob('t/*.t');
-    eval { runtests(@test_files) } or warn $@;
+    my @test_files;
+    find ({ wanted => sub { push @test_files, $File::Find::name if /\.t$/ } }, 't');
+    eval { runtests(sort @test_files) } or warn $@;
 }
 
 plan tests => $tests;
@@ -47,18 +46,18 @@ SKIP: {
     my $program = tmpnam();
     skip 'compiling failed (normal)', $tests unless system("$compiler -DTEST -DBUF_SIZE=$BUF_SIZE{normal} -o $program $source") == 0;
 
-    is(system("$program --help >/dev/null 2>&1"),    0, 'exit value for help screen');
-    is(system("$program --version >/dev/null 2>&1"), 0, 'exit value for version data');
+    is(system("$valgrind_cmd$program --help >/dev/null"),    0, 'exit value for help screen');
+    is(system("$valgrind_cmd$program --version >/dev/null"), 0, 'exit value for version data');
 
-    is(qx(printf '%s\n' "hello world" | $program none/none), "hello world\n", 'line read from stdin with newline');
-    is(qx(printf  %s    "hello world" | $program none/none), "hello world",   'line read from stdin without newline');
+    is(qx(printf '%s\n' "hello world" | $valgrind_cmd$program none/none), "hello world\n", 'line read from stdin with newline');
+    is(qx(printf  %s    "hello world" | $valgrind_cmd$program none/none), "hello world",   'line read from stdin without newline');
 
     my $text = do { local $/; <DATA> };
 
     my $infile1 = $write_to_tmpfile->($text);
 
-    is_deeply([split /\n/, qx(cat $infile1 | $program none/none)], [split /\n/, $text], 'text read from stdin');
-    is_deeply([split /\n/, qx($program none/none $infile1)],       [split /\n/, $text], 'text read from file');
+    is_deeply([split /\n/, qx(cat $infile1 | $valgrind_cmd$program none/none)], [split /\n/, $text], 'text read from stdin');
+    is_deeply([split /\n/, qx($valgrind_cmd$program none/none $infile1)],       [split /\n/, $text], 'text read from file');
 
     {
         my @fg_colors = (30..37, 39);
@@ -70,7 +69,7 @@ SKIP: {
 
         my $ok = true;
         foreach my $value (@values) {
-            $ok &= qx(printf %s "\e[${value}m" | $program --clean) eq '';
+            $ok &= qx(printf %s "\e[${value}m" | $valgrind_cmd$program --clean) eq '';
         }
         ok($ok, 'clean color sequences');
     }
@@ -81,16 +80,37 @@ SKIP: {
 
         my $switch = "--$type";
 
-        is(qx(printf %s "\e[35mhello\e[0m \e[36mworld\e[0m" | $program $switch),     'hello world', "$type colored words");
-        is(qx(printf %s "hello world" | $program Magenta | $program $switch),        'hello world', "$type colored line");
-        is_deeply([split /\n/, qx($program cyan $infile1 | $program $switch)], [split /\n/, $text], "$type colored text");
+        is(qx(printf %s "\e[35mhello\e[0m \e[36mworld\e[0m" | $valgrind_cmd$program $switch),     'hello world', "$type colored words");
+        is(qx(printf %s "hello world" | $program Magenta | $valgrind_cmd$program $switch),        'hello world', "$type colored line");
+        is_deeply([split /\n/, qx($program cyan $infile1 | $valgrind_cmd$program $switch)], [split /\n/, $text], "$type colored text");
+
+        {
+            my @attrs = qw(bold underscore blink reverse concealed);
+
+            my $ok = true;
+            foreach my $attr (@attrs) {
+                $ok &= qx(printf %s "$attr" | $program green --attr=$attr | $valgrind_cmd$program $switch) eq $attr;
+            }
+            ok($ok, "$type attribute");
+
+            my $attrs = join ',', @attrs;
+            is(qx(printf %s "$attrs" | $program green --attr=$attrs | $valgrind_cmd$program $switch), $attrs, "$type attributes");
+        }
+
+        ok(qx(printf %s "\e[\e[33m" | $valgrind_cmd$program $switch) eq "\e[", "$type with invalid sequence");
 
-        ok(qx(printf %s "\e[\e[33m" | $program $switch) eq "\e[", "$type with invalid sequence");
+        {
+            my $ok = true;
+            foreach my $option (qw(--attr=bold --exclude-random=black --omit-color-empty)) {
+                $ok &= qx($valgrind_cmd$program $option $switch $infile1 2>&1 >/dev/null) =~ /switch has no meaning with/;
+            }
+            ok($ok, "$type strict options");
+        }
     };
 
     $check_clean->($_) foreach qw(clean clean-all);
 
-    is(qx(printf %s "\e[4munderline\e[24m" | $program --clean-all), 'underline', 'clean-all color sequences');
+    is(qx(printf %s "\e[4munderline\e[24m" | $valgrind_cmd$program --clean-all), 'underline', 'clean-all color sequences');
 
     my $check_clean_buf = sub
     {
@@ -100,7 +120,7 @@ SKIP: {
 
         # Check that line chunks are printed when cleaning text without sequences
         my $short_text = 'Linux dev 2.6.32-5-openvz-686 #1 SMP Sun Sep 23 11:40:07 UTC 2012 i686 GNU/Linux';
-        is(qx(printf %s "$short_text" | $program_buf $switch), $short_text, "print ${\length $short_text} bytes (BUF_SIZE=$BUF_SIZE{short}, $type)");
+        is(qx(printf %s "$short_text" | $valgrind_cmd$program_buf $switch), $short_text, "print ${\length $short_text} bytes (BUF_SIZE=$BUF_SIZE{short}, $type)");
     };
 
     SKIP: {
@@ -113,18 +133,32 @@ SKIP: {
     my $repeated = join "\n", ($text) x 7;
     my $infile2  = $write_to_tmpfile->($repeated);
 
-    is_deeply([split /\n/, qx(cat $infile2 | $program none/none)], [split /\n/, $repeated], "read ${\length $repeated} bytes (BUF_SIZE=$BUF_SIZE{normal})");
+    is_deeply([split /\n/, qx(cat $infile2 | $valgrind_cmd$program none/none)], [split /\n/, $repeated], "read ${\length $repeated} bytes (BUF_SIZE=$BUF_SIZE{normal})");
 
     {
-        my $colored_text = qx(printf '%s\n' "foo bar baz" | $program red);
+        my $colored_text = qx(printf '%s\n' "foo bar baz" | $valgrind_cmd$program red);
         my $sequences = 0;
         $sequences++ while $colored_text =~ /\e\[\d+m/g;
         is($sequences, 2, 'count of sequences printed');
     }
 
-    is(qx(printf %s "hello\nworld\r\n" | $program none/none), "hello\nworld\r\n", 'stream mode');
+    {
+        # Check that a 'none' foreground color (with a background color present)
+        # will be substituted by 'default'.
+        my $colored_text = qx(printf %s "foo bar baz" | $valgrind_cmd$program none/black);
+        is($colored_text, "\e[40m\e[39mfoo bar baz\e[0m", 'no color sequences printed');
+    }
+
+    is(qx(printf %s "hello\nworld\r\n" | $valgrind_cmd$program none/none), "hello\nworld\r\n", 'stream mode');
 
-    is(system(qq(printf '%s\n' "hello world" | $program random --exclude-random=black >/dev/null 2>&1)), 0, 'switch exclude-random');
+    is(system(qq(printf '%s\n' "hello world" | $valgrind_cmd$program random --exclude-random=black >/dev/null)), 0, 'switch exclude-random');
+
+    {
+        my $infile = $write_to_tmpfile->("foo\n\nbar");
+        is_deeply([split /\n/, qx($valgrind_cmd$program yellow --omit-color-empty $infile)],
+                  [split /\n/, "\e[33mfoo\e[0m\n\n\e[33mbar\e[0m"],
+                  'switch omit-color-empty');
+    }
 
     SKIP: {
         skip 'valgrind not found', 1 unless system('which valgrind >/dev/null 2>&1') == 0;
@@ -148,6 +182,14 @@ EOT
         system(qq(printf '%s\n' "$bold_color" | $program $bold_color));
     }
 
+    print <<'EOT';
+Attributes
+==========
+EOT
+    foreach my $attr (qw(bold underscore blink reverse concealed)) {
+        system(qq(printf '%s\n' "$attr" | $program green --attr=$attr));
+    }
+
     unlink $program;
 };