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

diff --git a/test.pl b/test.pl
index a731d0f..928c698 100755
--- a/test.pl
+++ b/test.pl
@@ -2,95 +2,196 @@
 
 use strict;
 use warnings;
-use constant true => 1;
-
-use File::Temp qw(tempfile tmpnam);
+use lib qw(lib);
+use constant true  => 1;
+use constant false => 0;
+
+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 = 14;
-
-my %BUF_SIZE = (
-   normal => 1024,
-   short  => 10,
-);
-my $source = 'colorize.c';
-my $warning_flags = '-Wall -Wextra -Wformat -Wswitch-default -Wuninitialized -Wunused -Wno-unused-function -Wno-unused-parameter';
+my $tests = 32;
 
-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 ($program, $program_buf);
+{
+    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;
 
 SKIP: {
     skip "$source does not exist", $tests unless -e $source;
 
-    $program = tmpnam();
-    skip 'compiling failed (normal)', $tests unless system("gcc -DTEST -DBUF_SIZE=$BUF_SIZE{normal} $warning_flags -o $program $source") == 0;
+    my $binary = tmpnam();
+    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("$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("$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(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');
 
-    is(qx(echo -n "\e[35mhello\e[0m \e[36mworld\e[0m" | $program --clean),       'hello world', 'clean colored words');
-    is(qx(echo -n "hello world" | $program Magenta | $program --clean),          'hello world', 'clean colored line');
-    is_deeply([split /\n/, qx($program cyan $infile1 | $program --clean)], [split /\n/, $text], 'clean colored text');
+    {
+        my @fg_colors = (30..37, 39);
+        my @bg_colors = (40..47, 49);
 
-    ok(qx(echo -n "\e[\e[33m" | $program --clean) eq "\e[", 'clean with invalid sequence');
+        my @bold_colors = map "1;$_", @fg_colors;
 
-    SKIP: {
-        $program_buf = tmpnam();
-        skip 'compiling failed (short buffer)', 1 unless system("gcc -DTEST -DBUF_SIZE=$BUF_SIZE{short} $warning_flags -o $program_buf $source") == 0;
+        my @values = (@fg_colors, @bg_colors, @bold_colors, 0);
+
+        my $ok = true;
+        foreach my $value (@values) {
+            $ok &= qx(printf %s "\e[${value}m" | $valgrind_cmd$program --clean) eq '';
+        }
+        ok($ok, 'clean color sequences');
+    }
+
+    my $check_clean = sub
+    {
+        my ($type) = @_;
+
+        my $switch = "--$type";
+
+        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");
+
+        {
+            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);
 
-        # Check that line chunks are merged when cleaning text
+    is(qx(printf %s "\e[4munderline\e[24m" | $valgrind_cmd$program --clean-all), 'underline', 'clean-all color sequences');
+
+    my $check_clean_buf = sub
+    {
+        my ($program_buf, $type) = @_;
+
+        my $switch = "--$type";
+
+        # 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 --clean), $short_text, "merge ${\length $short_text} bytes (BUF_SIZE=$BUF_SIZE{short})");
+        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("$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;
     }
 
     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" | $valgrind_cmd$program red);
+        my $sequences = 0;
+        $sequences++ while $colored_text =~ /\e\[\d+m/g;
+        is($sequences, 2, 'count of sequences printed');
+    }
+
+    {
+        # 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(qx(echo -n "hello\nworld\r\n" | $program none/none), "hello\nworld\r\n", 'stream mode');
+    {
+        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');
+    }
 
-    is(system("echo \"hello world\" | $program random --exclude-random=black >/dev/null 2>&1"), 0, 'switch exclude-random');
+    SKIP: {
+        skip 'valgrind not found', 1 unless system('which valgrind >/dev/null 2>&1') == 0;
+        like(qx(valgrind $program none/none $infile1 2>&1 >/dev/null), qr/no leaks are possible/, 'valgrind memleaks');
+    }
 
-    skip 'valgrind not found', 1 unless system('which valgrind >/dev/null 2>&1') == 0;
-    like(qx(valgrind $program none/none $infile1 2>&1 >/dev/null), qr/no leaks are possible/, 'valgrind memleaks');
+    {
+        my $debug = tmpnam();
+        is(system("$compiler -DDEBUG -o $debug $source"), 0, 'debugging build');
+        unlink $debug if -e $debug;
+    }
 
     print <<'EOT';
 Colors
 ======
 EOT
-    foreach my $color (qw(none black red green yellow blue cyan magenta white default random)) {
-        system("echo $color | $program $color");
+    foreach my $color (qw(none black red green yellow blue magenta cyan white default random)) {
+        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));
     }
-};
 
-foreach ($program, $program_buf) {
-    unlink $_ if defined $_;
-}
+    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;
+};
 
 __DATA__
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus urna mauris, ultricies faucibus placerat sit amet, rutrum eu