Skip to content

Commit 7066fe7

Browse files
committedMar 19, 2025·
Thread::Queue: clean up some tests
Some of the tests (04_errs.t, 08_nothreads.t, 09_ended.t) already use Test::More unconditionally, so remove the conditional loading code from the other tests. Also, `use Config` doesn't need to be in a BEGIN block.
1 parent 8b1b46c commit 7066fe7

File tree

8 files changed

+11
-76
lines changed

8 files changed

+11
-76
lines changed
 

‎dist/Thread-Queue/t/01_basic.t

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use strict;
22
use warnings;
33

4+
use Config;
45
BEGIN {
5-
use Config;
66
if (! $Config{'useithreads'}) {
77
print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
88
exit(0);
@@ -11,16 +11,7 @@ BEGIN {
1111

1212
use threads;
1313
use Thread::Queue;
14-
15-
BEGIN { # perl RT 133382
16-
if ($] == 5.008) {
17-
require 't/test.pl'; # Test::More work-alike for Perl 5.8.0
18-
} else {
19-
require Test::More;
20-
}
21-
Test::More->import();
22-
} # end BEGIN
23-
plan('tests' => 81);
14+
use Test::More 'tests' => 81;
2415

2516
### Basic usage with multiple threads ###
2617

‎dist/Thread-Queue/t/02_refs.t

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use strict;
22
use warnings;
33

4+
use Config;
45
BEGIN {
5-
use Config;
66
if (! $Config{'useithreads'}) {
77
print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
88
exit(0);
@@ -12,16 +12,7 @@ BEGIN {
1212
use threads;
1313
use threads::shared;
1414
use Thread::Queue;
15-
16-
BEGIN { # perl RT 133382
17-
if ($] == 5.008) {
18-
require 't/test.pl'; # Test::More work-alike for Perl 5.8.0
19-
} else {
20-
require Test::More;
21-
}
22-
Test::More->import();
23-
} # end BEGIN
24-
plan('tests' => 46);
15+
use Test::More 'tests' => 46;
2516

2617
# Regular array
2718
my @ary1 = qw/foo bar baz/;

‎dist/Thread-Queue/t/03_peek.t

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use strict;
22
use warnings;
33

4+
use Config;
45
BEGIN {
5-
use Config;
66
if (! $Config{'useithreads'}) {
77
print("1..0 # SKIP Perl not compiled with 'useithreads'\n");
88
exit(0);
@@ -11,16 +11,7 @@ BEGIN {
1111

1212
use threads;
1313
use Thread::Queue;
14-
15-
BEGIN { # perl RT 133382
16-
if ($] == 5.008) {
17-
require 't/test.pl'; # Test::More work-alike for Perl 5.8.0
18-
} else {
19-
require Test::More;
20-
}
21-
Test::More->import();
22-
} # end BEGIN
23-
plan('tests' => 19);
14+
use Test::More 'tests' => 19;
2415

2516
my $q = Thread::Queue->new(1..10);
2617
ok($q, 'New queue');

‎dist/Thread-Queue/t/05_extract.t

+1-10
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,7 @@ BEGIN {
1111

1212
use threads;
1313
use Thread::Queue;
14-
15-
BEGIN { # perl RT 133382
16-
if ($] == 5.008) {
17-
require 't/test.pl'; # Test::More work-alike for Perl 5.8.0
18-
} else {
19-
require Test::More;
20-
}
21-
Test::More->import();
22-
} # end BEGIN
23-
plan('tests' => 20);
14+
use Test::More 'tests' => 20;
2415

2516
my $q = Thread::Queue->new(1..10);
2617
ok($q, 'New queue');

‎dist/Thread-Queue/t/06_insert.t

+1-10
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,7 @@ BEGIN {
1111

1212
use threads;
1313
use Thread::Queue;
14-
15-
BEGIN { # perl RT 133382
16-
if ($] == 5.008) {
17-
require 't/test.pl'; # Test::More work-alike for Perl 5.8.0
18-
} else {
19-
require Test::More;
20-
}
21-
Test::More->import();
22-
} # end BEGIN
23-
plan('tests' => 16);
14+
use Test::More 'tests' => 16;
2415

2516
my $q = Thread::Queue->new(1..10);
2617
ok($q, 'New queue');

‎dist/Thread-Queue/t/07_lock.t

+1-10
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,7 @@ BEGIN {
1212
use threads;
1313
use Thread::Queue;
1414
use Thread::Semaphore;
15-
16-
BEGIN { # perl RT 133382
17-
if ($] == 5.008) {
18-
require 't/test.pl'; # Test::More work-alike for Perl 5.8.0
19-
} else {
20-
require Test::More;
21-
}
22-
Test::More->import();
23-
} # end BEGIN
24-
plan('tests' => 3);
15+
use Test::More 'tests' => 3;
2516

2617
# The following tests locking a queue
2718

‎dist/Thread-Queue/t/10_timed.t

+1-10
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,7 @@ BEGIN {
1111

1212
use threads;
1313
use Thread::Queue;
14-
15-
BEGIN { # perl RT 133382
16-
if ($] == 5.008) {
17-
require 't/test.pl'; # Test::More work-alike for Perl 5.8.0
18-
} else {
19-
require Test::More;
20-
}
21-
Test::More->import();
22-
} # end BEGIN
23-
plan('tests' => 19);
14+
use Test::More 'tests' => 19;
2415

2516
### ->dequeue_timed(TIMEOUT, COUNT) test ###
2617

‎dist/Thread-Queue/t/11_limit.t

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ BEGIN {
1717
use threads;
1818
use Thread::Queue;
1919

20-
use Test::More;
21-
22-
plan tests => 13;
20+
use Test::More tests => 13;
2321

2422
my $q = Thread::Queue->new();
2523
my $rpt = Thread::Queue->new();

0 commit comments

Comments
 (0)
Please sign in to comment.