From ed6e250aa55fe22f754ebafa7cab14bbd51e34b5 Mon Sep 17 00:00:00 2001 From: James E Keenan Date: Wed, 9 Nov 2011 16:51:05 -0800 Subject: [PATCH] Simulate output of Test::More pre-2.0 when description for ok() is defined but empty. For #84 --- lib/Test/Builder2/Formatter/TAP/v13.pm | 2 +- t/Builder/Builder.t | 5 +++-- t/Builder/output.t | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/Test/Builder2/Formatter/TAP/v13.pm b/lib/Test/Builder2/Formatter/TAP/v13.pm index fb667d546..3aa140645 100644 --- a/lib/Test/Builder2/Formatter/TAP/v13.pm +++ b/lib/Test/Builder2/Formatter/TAP/v13.pm @@ -363,7 +363,7 @@ sub accept_result { my $name = $result->name; $self->_escape(\$name); - $out .= " - $name" if defined $name and length $name; + $out .= " - $name" if defined $name; my $reason = $result->reason; $self->_escape(\$reason); diff --git a/t/Builder/Builder.t b/t/Builder/Builder.t index a5bfd155a..862ca08e0 100644 --- a/t/Builder/Builder.t +++ b/t/Builder/Builder.t @@ -10,18 +10,19 @@ BEGIN { use Test::Builder; my $Test = Test::Builder->new; -$Test->plan( tests => 7 ); +$Test->plan( tests => 8 ); my $default_lvl = $Test->level; $Test->level(0); $Test->ok( 1, 'compiled and new()' ); $Test->ok( $default_lvl == 1, 'level()' ); +$Test->ok( 1, '' ); $Test->is_eq('foo', 'foo', 'is_eq'); $Test->is_num('23.0', '23', 'is_num'); -$Test->is_num( $Test->current_test, 4, 'current_test() get' ); +$Test->is_num( $Test->current_test, 5, 'current_test() get' ); my $test_num = $Test->current_test + 1; $Test->current_test( $test_num ); diff --git a/t/Builder/output.t b/t/Builder/output.t index 3609ff62a..bcda2bc6f 100644 --- a/t/Builder/output.t +++ b/t/Builder/output.t @@ -75,22 +75,24 @@ END { 1 while unlink($tmpfile) } my $out = $tb->output(\$fakeout); $tb->exported_to(__PACKAGE__); $tb->no_ending(1); - $tb->plan(tests => 5); + $tb->plan(tests => 6); $tb->ok(1, "ok"); $tb->ok(1, "ok\n"); $tb->ok(1, "ok, like\nok"); $tb->skip("wibble\nmoof"); $tb->todo_skip("todo\nskip\n"); + $tb->ok(1, ""); is( $fakeout, <<'OUTPUT' ); TAP version 13 -1..5 +1..6 ok 1 - ok ok 2 - ok\n ok 3 - ok, like\nok ok 4 # SKIP wibble\nmoof not ok 5 # TODO SKIP todo\nskip\n +ok 6 - OUTPUT }