Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow for set_no_numbers format #17

Merged
merged 1 commit into from Oct 4, 2023
Merged

Allow for set_no_numbers format #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 25 additions & 18 deletions lib/Test2/Harness/Renderer/JUnit.pm
View file
Open in desktop
Expand Up @@ -176,9 +176,10 @@ sub render_event {
# Ignore subtests
return if ( $f->{'hubs'} && $f->{'hubs'}->[0]->{'nested'} );

my $test_num = sprintf( "%04d", $event->{'assert_count'} || $f->{'assert'}->{'number'} || die Dumper $event);
my $test_num = $event->{'assert_count'} || $f->{'assert'}->{'number'};
$test_num = sprintf "%04d", $test_num if defined $test_num;
my $test_name = _squeaky_clean( $f->{'assert'}->{'details'} // 'UNKNOWN_TEST?' );
my $test_string = defined $test_name ? "$test_num - $test_name" : $test_num;
$test_name = join " - ", grep { defined } $test_num, $test_name;
$test->{'testsuite'}->{'tests'}++;

$self->close_open_failure_testcase( $test, $test_num );
Expand All @@ -190,10 +191,10 @@ sub render_event {

if ( $f->{'amnesty'} && grep { ( $_->{'tag'} // '' ) eq 'TODO' } @{ $f->{'amnesty'} } ) { # All TODO Tests
if ( !$f->{'assert'}->{'pass'} ) { # Failing TODO
push @{ $test->{'testcase'} }, $self->xml->testcase( { 'name' => "$test_string (TODO)", 'time' => $run_time, 'classname' => $test->{'testsuite'}->{'name'} }, "" );
push @{ $test->{'testcase'} }, $self->xml->testcase( { 'name' => "$test_name (TODO)", 'time' => $run_time, 'classname' => $test->{'testsuite'}->{'name'} }, "" );
}
elsif ( $self->{'allow_passing_todos'} ) { # junit parsers don't like passing TODO tests. Let's just not tell them about it if $ENV{ALLOW_PASSING_TODOS} is set.
push @{ $test->{'testcase'} }, $self->xml->testcase( { 'name' => "$test_string (PASSING TODO)", 'time' => $run_time, 'classname' => $test->{'testsuite'}->{'name'} }, "" );
push @{ $test->{'testcase'} }, $self->xml->testcase( { 'name' => "$test_name (PASSING TODO)", 'time' => $run_time, 'classname' => $test->{'testsuite'}->{'name'} }, "" );
}
else { # Passing TODO (Failure) when not allowed.

Expand All @@ -204,31 +205,34 @@ sub render_event {
my ($todo_message) = map { $_->{'details'} } grep { $_->{'tag'} // '' eq 'TODO' } @{ $f->{'amnesty'} };

push @{ $test->{'testcase'} }, $self->xml->testcase(
{ 'name' => "$test_string (TODO)", 'time' => $run_time, 'classname' => $test->{'testsuite'}->{'name'} },
{ 'name' => "$test_name (TODO)", 'time' => $run_time, 'classname' => $test->{'testsuite'}->{'name'} },
$self->xml->error(
{ 'message' => $todo_message, 'type' => "TodoTestSucceeded" },
$self->_cdata("ok $test_string")
$self->_cdata("ok $test_name")
)
);

}
}
elsif ( $f->{'assert'}->{'pass'} ) { # Passing test
push @{ $test->{'testcase'} }, $self->xml->testcase(
{ 'name' => "$test_string", 'time' => $run_time, 'classname' => $test->{'testsuite'}->{'name'} },
{ 'name' => $test_name, 'time' => $run_time, 'classname' => $test->{'testsuite'}->{'name'} },
""
);
}
else { # Failing Test.
$test->{'testsuite'}->{'failures'}++;
$test->{'testsuite'}->{'errors'}++;

my $message = "not ok" . ( $test_name ? " $test_name" : "" );

# Trap the test information. We can't generate the XML for this test until we get all the diag information.
$test->{'last_failure'} = {
'test_num' => $test_num,
'test_name' => $test_name,
'time' => $run_time,
'message' => "not ok $test_string\n",
'test_num' => $test_num,
'test_name' => $test_name,
'time' => $run_time,
'message' => $message,
'full_message' => "$message\n",
};
}

Expand All @@ -240,7 +244,7 @@ sub render_event {
foreach my $line ( @{ $f->{'info'} } ) {
next unless $line->{'details'};
chomp $line->{'details'};
$test->{'last_failure'}->{'message'} .= "# $line->{details}\n";
$test->{'last_failure'}->{'full_message'} .= "# $line->{details}\n";
}
return;
}
Expand Down Expand Up @@ -293,17 +297,20 @@ sub close_open_failure_testcase {
# This causes the entire suite to choke. We don't want this.
# If we're here already, we've already failed the test. let's just make sure the person reviewing
# it knows the test count was messed up.
if ( $fail->{'test_num'} == $new_test_number ) {
$fail->{'message'} .= "# WARNING This test number has already been seen. Duplicate TEST # in output!\n";
if ( defined $fail->{'test_num'}
&& defined $new_test_number
&& $fail->{'test_num'} == $new_test_number )
{
$fail->{'message'}
.= "# WARNING This test number has already been seen. Duplicate TEST # in output!\n";
}

my $xml = $self->xml;
push @{ $test->{'testcase'} }, $xml->testcase(
{ 'name' => "$fail->{test_num} - $fail->{test_name}", 'time' => $fail->{'time'}, 'classname' => $test->{'testsuite'}->{'name'} },
{ 'name' => $fail->{'test_name'}, 'time' => $fail->{'time'}, 'classname' => $test->{'testsuite'}->{'name'} },
$xml->failure(
{ 'message' => "not ok $fail->{test_num} - $fail->{test_name}", 'type' => 'TestFailed' },
$self->_cdata( $fail->{'message'} )
)
{ 'message' => $fail->{message}, 'type' => 'TestFailed' },
$self->_cdata( $fail->{'full_message'} ) )
);

delete $test->{'last_failure'};
Expand Down
14 changes: 14 additions & 0 deletions t/test-no-numbers/pass-1.tx
View file
Open in desktop
@@ -0,0 +1,14 @@
use Test2::V0;

sub pass_ok {
my $ctx = context();
$ctx->hub->format->set_no_numbers(1);

pass("pass");

$ctx->release;
}

pass_ok();

done_testing;
66 changes: 66 additions & 0 deletions t/test.t
View file
Open in desktop
Expand Up @@ -211,6 +211,72 @@ my $env = { # env passed to yath
}, 'junit output' or diag explain $junit;
}

{
note "all tests are ok without numbers";

my $sdir = $dir . '-no-numbers';

$env->{JUNIT_TEST_FILE} = "$tmpdir/no-numbers.xml";

yath(
command => 'test',
args => [ $sdir, '--ext=tx', @renderers, '-v' ],
exit => 0,
env => $env,
test => sub {
my $out = shift;

like(
$out->{output},
qr{\Q( PASSED )\E.*\Qt/test-no-numbers/pass-1.tx\E},
"t/test-no-numbers/pass-1.tx"
);

like( $out->{output}, qr/Result: PASSED/, "Result: PASSED" );
},
);

# checking xml file
ok -e $env->{JUNIT_TEST_FILE}, 'junit file exists';

my $junit = XML::Simple::XMLin( $env->{JUNIT_TEST_FILE} );
like $junit => hash {
field testsuite => hash {
field errors => 0;
field failures => 0;
field id => D();
field name => 'test-no-numbers_pass-1_tx';

field 'system-err' => hash { end; };
field 'system-out' => hash { end; };

field 'testcase' => hash {
field 'pass' => hash {
field classname => 'test-no-numbers_pass-1_tx';
field time => D();
end;
};
field 'Tear down.' => hash {
field classname => 'test-no-numbers_pass-1_tx';
field time => D();
end;
};

end;
};

field tests => 1;
field time => D();
field timestamp => D();

end;
};

end;

}, 'junit output' or diag explain $junit;
}

{
note "plan ok - one failure";

Expand Down