X-Git-Url: http://git.refcnt.org/?p=colorize.git;a=blobdiff_plain;f=test.pl;h=928c6987054f644dd06e48baac2b384118a05c85;hp=959d83f1817bc26acaa5cdd925bef38e5433974a;hb=HEAD;hpb=5703377a911a2b6acd03e988fafd433442930b1f

diff --git a/test.pl b/test.pl
index 959d83f..928c698 100755
--- a/test.pl
+++ b/test.pl
@@ -2,33 +2,37 @@
 
 use strict;
 use warnings;
+use lib qw(lib);
 use constant true  => 1;
 use constant false => 0;
 
-use File::Temp qw(tempfile tempdir tmpnam);
-use IPC::Open3 qw(open3);
-use Symbol qw(gensym);
+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 = 25;
+my $tests = 32;
 
-my %BUF_SIZE = (
-   normal => 1024,
-   short  => 10,
-);
-my $source = 'colorize.c';
-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);
+    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;
+}
 
-    return $tmpfile;
-};
+{
+    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;
 
@@ -36,70 +40,24 @@ SKIP: {
     skip "$source does not exist", $tests unless -e $source;
 
     my $binary = tmpnam();
-    skip 'compiling failed', $tests unless system("gcc $compiler_flags -o $binary $source") == 0;
+    skip 'compiling failed', $tests unless system("$compiler $compiler_flags -o $binary $source") == 0;
     unlink $binary;
 
     my $program = tmpnam();
-    skip 'compiling failed (normal)', $tests unless system("gcc -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');
-
-    my $run_program_fail = sub
-    {
-        my ($program, $args, $message) = @_;
-
-        my @args = split /\s+/, $args;
+    skip 'compiling failed (normal)', $tests unless system("$compiler -DTEST -DBUF_SIZE=$BUF_SIZE{normal} -o $program $source") == 0;
 
-        my $err = gensym;
+    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');
 
-        my $pid = open3(gensym, gensym, $err, $program, @args);
-        waitpid($pid, 0);
-
-        my $output = do { local $/; <$err> };
-
-        return ($? >> 8 == 1 && $output =~ /$message/) ? true : false;
-    };
-
-    {
-        my $ok = true;
-
-        my $file = $write_to_tmpfile->('abc');
-        my $dir  = tempdir(CLEANUP => true);
-
-        $ok &= $run_program_fail->($program, '--exclude-random=random', 'must be provided a plain color');
-        $ok &= $run_program_fail->($program, '--clean --clean-all',     'mutually exclusive');
-        $ok &= $run_program_fail->($program, '--clean file1 file2',     'more than one file');
-        $ok &= $run_program_fail->($program, '--clean-all file1 file2', 'more than one file');
-        $ok &= $run_program_fail->($program, '- file',                  'hyphen cannot be used as color string');
-        $ok &= $run_program_fail->($program, '-',                       'hyphen must be preceeded by color string');
-        $ok &= $run_program_fail->($program, "$file file",              'cannot be used as color string');
-        $ok &= $run_program_fail->($program, "$file",                   'must be preceeded by color string');
-        $ok &= $run_program_fail->($program, "$dir",                    'is not a valid file type');
-        $ok &= $run_program_fail->($program, '/black',                  'foreground color missing');
-        $ok &= $run_program_fail->($program, 'white/',                  'background color missing');
-        $ok &= $run_program_fail->($program, 'white/black/yellow',      'one color pair allowed only');
-        $ok &= $run_program_fail->($program, 'y3llow',                  'cannot be made of non-alphabetic characters');
-        $ok &= $run_program_fail->($program, 'yEllow',                  'cannot be in mixed lower/upper case');
-        $ok &= $run_program_fail->($program, 'None',                    'cannot be bold');
-        $ok &= $run_program_fail->($program, 'white/Black',             'cannot be bold');
-
-        foreach my $color_pair (qw(random/none random/default none/random default/random)) {
-            $ok &= $run_program_fail->($program, $color_pair, 'cannot be combined with');
-        }
-
-        ok($ok, 'exit messages/values for failures');
-    }
-
-    is(qx(echo    "hello world" | $program none/none), "hello world\n", 'line read from stdin with newline');
-    is(qx(echo -n "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);
@@ -111,7 +69,7 @@ SKIP: {
 
         my $ok = true;
         foreach my $value (@values) {
-            $ok &= qx(echo -n "\e[${value}m" | $program --clean) eq '';
+            $ok &= qx(printf %s "\e[${value}m" | $valgrind_cmd$program --clean) eq '';
         }
         ok($ok, 'clean color sequences');
     }
@@ -122,16 +80,37 @@ SKIP: {
 
         my $switch = "--$type";
 
-        is(qx(echo -n "\e[35mhello\e[0m \e[36mworld\e[0m" | $program $switch),       'hello world', "$type colored words");
-        is(qx(echo -n "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);
 
-        ok(qx(echo -n "\e[\e[33m" | $program $switch) eq "\e[", "$type with invalid sequence");
+            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");
+
+        {
+            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(echo -n "\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
     {
@@ -139,14 +118,14 @@ SKIP: {
 
         my $switch = "--$type";
 
-        # Check that line chunks are merged when cleaning text
+        # 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(echo -n "$short_text" | $program_buf $switch), $short_text, "merge ${\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: {
         my $program_buf = tmpnam();
-        skip 'compiling failed (short buffer)', 2 unless system("gcc -DTEST -DBUF_SIZE=$BUF_SIZE{short} -o $program_buf $source") == 0;
+        skip 'compiling failed (short buffer)', 2 unless system("$compiler -DTEST -DBUF_SIZE=$BUF_SIZE{short} -o $program_buf $source") == 0;
         $check_clean_buf->($program_buf, $_) foreach qw(clean clean-all);
         unlink $program_buf;
     }
@@ -154,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(echo "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(echo -n "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" | $valgrind_cmd$program random --exclude-random=black >/dev/null)), 0, 'switch exclude-random');
 
-    is(system("echo \"hello world\" | $program random --exclude-random=black >/dev/null 2>&1"), 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;
@@ -174,7 +167,7 @@ SKIP: {
 
     {
         my $debug = tmpnam();
-        is(system("gcc -DDEBUG -o $debug $source"), 0, 'debugging build');
+        is(system("$compiler -DDEBUG -o $debug $source"), 0, 'debugging build');
         unlink $debug if -e $debug;
     }
 
@@ -183,10 +176,18 @@ Colors
 ======
 EOT
     foreach my $color (qw(none black red green yellow blue magenta cyan white default random)) {
-        system("echo $color | $program $color");
+        system(qq(printf '%s\n' "$color" | $program $color));
         next if $color eq 'none';
         my $bold_color = ucfirst $color;
-        system("echo $bold_color | $program $bold_color");
+        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;