X-Git-Url: http://git.refcnt.org/?a=blobdiff_plain;f=test.pl;h=056f818d7b4d6d27c6649e9572fb1eb025baa4e1;hb=bc00d671241fb5509b81a13efdf50cae616610d0;hp=2be2e41f255964737ca2252ec8101888f491016b;hpb=73c70574f731e434b4e3a01eb5d4e9583ba0db6a;p=colorize.git

diff --git a/test.pl b/test.pl
index 2be2e41..056f818 100755
--- a/test.pl
+++ b/test.pl
@@ -7,14 +7,14 @@ use constant true => 1;
 use File::Temp qw(tempfile tmpnam);
 use Test::More;
 
-my $tests = 14;
+my $tests = 22;
 
 my %BUF_SIZE = (
    normal => 1024,
    short  => 10,
 );
 my $source = 'colorize.c';
-my $warning_flags = '-Wall -Wextra -Wformat -Wswitch-default -Wuninitialized -Wunused -Wno-unused-parameter';
+my $warning_flags = '-Wall -Wextra -Wformat -Wswitch-default -Wuninitialized -Wunused -Wno-unused-function -Wno-unused-parameter';
 
 my $write_to_tmpfile = sub
 {
@@ -27,14 +27,12 @@ my $write_to_tmpfile = sub
     return $tmpfile;
 };
 
-my ($program, $program_buf);
-
 plan tests => $tests;
 
 SKIP: {
     skip "$source does not exist", $tests unless -e $source;
 
-    $program = tmpnam();
+    my $program = tmpnam();
     skip 'compiling failed (normal)', $tests unless system("gcc -DTEST -DBUF_SIZE=$BUF_SIZE{normal} $warning_flags -o $program $source") == 0;
 
     is(system("$program --help >/dev/null 2>&1"), 0, 'exit value for help screen');
@@ -49,19 +47,54 @@ SKIP: {
     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(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(echo -n "\e[${value}m" | $program --clean) eq '';
+        }
+        ok($ok, 'clean color sequences');
+    }
+
+    my $check_clean = sub
+    {
+        my ($type) = @_;
+
+        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");
+
+        ok(qx(echo -n "\e[\e[33m" | $program $switch) eq "\e[", "$type with invalid sequence");
+    };
+
+    $check_clean->($_) foreach qw(clean clean-all);
+
+    is(qx(echo -n "\e[4munderline\e[24m" | $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 merged when cleaning text
         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(echo -n "$short_text" | $program_buf $switch), $short_text, "merge ${\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} $warning_flags -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;
@@ -69,12 +102,19 @@ SKIP: {
 
     is_deeply([split /\n/, qx(cat $infile2 | $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 $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');
 
     is(system("echo \"hello world\" | $program random --exclude-random=black >/dev/null 2>&1"), 0, 'switch exclude-random');
 
-    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: {
+        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');
+    }
 
     print <<'EOT';
 Colors
@@ -86,11 +126,9 @@ EOT
         my $bold_color = ucfirst $color;
         system("echo $bold_color | $program $bold_color");
     }
-};
 
-foreach ($program, $program_buf) {
-    unlink $_ if defined $_;
-}
+    unlink $program;
+};
 
 __DATA__
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus urna mauris, ultricies faucibus placerat sit amet, rutrum eu