Merge branch 'master' into fix_882

Test-More · Oct 24, 2023 · e86f0e1 · e86f0e1
2 parents 49b8bb6 + ee07627
commit e86f0e1
Show file tree

Hide file tree

Showing 73 changed files with 123 additions and 76 deletions.
diff --git a/Changes b/Changes
@@ -2,6 +2,10 @@
 
     - Fix #882
 
+1.302195  2023-04-28 05:55:54-07:00 America/Los_Angeles
+
+    - Fix done_testing(0) producing 2 plans and an incorrect message
+
 1.302194  2023-03-13 20:06:57-07:00 America/Los_Angeles
 
     - Fix failing test on 5.10

diff --git a/Makefile.PL b/Makefile.PL
@@ -23,7 +23,7 @@ my %WriteMakefileArgs = (
     "Storable" => 0,
     "utf8" => 0
   },
-  "VERSION" => "1.302195",
+  "VERSION" => "1.302196",
   "test" => {
     "TESTS" => "t/*.t t/Legacy/*.t t/Legacy/Bugs/*.t t/Legacy/Builder/*.t t/Legacy/Regression/*.t t/Legacy/Simple/*.t t/Legacy/Test2/*.t t/Legacy/Tester/*.t t/Legacy/subtest/*.t t/Legacy_And_Test2/*.t t/Test2/acceptance/*.t t/Test2/behavior/*.t t/Test2/legacy/*.t t/Test2/modules/*.t t/Test2/modules/API/*.t t/Test2/modules/API/InterceptResult/*.t t/Test2/modules/Event/*.t t/Test2/modules/Event/TAP/*.t t/Test2/modules/EventFacet/*.t t/Test2/modules/Formatter/*.t t/Test2/modules/Hub/*.t t/Test2/modules/Hub/Interceptor/*.t t/Test2/modules/IPC/*.t t/Test2/modules/IPC/Driver/*.t t/Test2/modules/Tools/*.t t/Test2/modules/Util/*.t t/Test2/regression/*.t t/regression/*.t"
   }

diff --git a/lib/Test/Builder.pm b/lib/Test/Builder.pm
@@ -4,7 +4,7 @@ use 5.006;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 BEGIN {
     if( $] < 5.008 ) {
@@ -1670,7 +1670,7 @@ sub _ending {
     return unless $plan || $count || $failed;
 
     # Ran tests but never declared a plan or hit done_testing
-    if( !$hub->plan and $hub->count ) {
+    if( !defined($hub->plan) and $hub->count ) {
         $self->diag("Tests were run but no plan was declared and done_testing() was not seen.");
 
         if($real_exit_code) {

diff --git a/lib/Test/Builder/Formatter.pm b/lib/Test/Builder/Formatter.pm
@@ -2,7 +2,7 @@ package Test::Builder::Formatter;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 BEGIN { require Test2::Formatter::TAP; our @ISA = qw(Test2::Formatter::TAP) }
 

diff --git a/lib/Test/Builder/Module.pm b/lib/Test/Builder/Module.pm
@@ -7,7 +7,7 @@ use Test::Builder;
 require Exporter;
 our @ISA = qw(Exporter);
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 
 =head1 NAME

diff --git a/lib/Test/Builder/Tester.pm b/lib/Test/Builder/Tester.pm
@@ -1,7 +1,7 @@
 package Test::Builder::Tester;
 
 use strict;
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 use Test::Builder;
 use Symbol;

diff --git a/lib/Test/Builder/Tester/Color.pm b/lib/Test/Builder/Tester/Color.pm
@@ -1,7 +1,7 @@
 package Test::Builder::Tester::Color;
 
 use strict;
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 require Test::Builder::Tester;
 

diff --git a/lib/Test/Builder/TodoDiag.pm b/lib/Test/Builder/TodoDiag.pm
@@ -2,7 +2,7 @@ package Test::Builder::TodoDiag;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 BEGIN { require Test2::Event::Diag; our @ISA = qw(Test2::Event::Diag) }
 

diff --git a/lib/Test/More.pm b/lib/Test/More.pm
@@ -17,7 +17,7 @@ sub _carp {
     return warn @_, " at $file line $line\n";
 }
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 use Test::Builder::Module;
 our @ISA    = qw(Test::Builder::Module);
@@ -1206,13 +1206,28 @@ sub _format_stack {
     return $out;
 }
 
+my %_types = (
+  (map +($_ => $_), qw(
+    Regexp
+    ARRAY
+    HASH
+    SCALAR
+    REF
+    GLOB
+    CODE
+  )),
+  'LVALUE'  => 'SCALAR',
+  'REF'     => 'SCALAR',
+  'VSTRING' => 'SCALAR',
+);
+
 sub _type {
     my $thing = shift;
 
     return '' if !ref $thing;
 
-    for my $type (qw(Regexp ARRAY HASH REF SCALAR GLOB CODE VSTRING)) {
-        return $type if UNIVERSAL::isa( $thing, $type );
+    for my $type (keys %_types) {
+        return $_types{$type} if UNIVERSAL::isa( $thing, $type );
     }
 
     return '';

diff --git a/lib/Test/Simple.pm b/lib/Test/Simple.pm
@@ -4,7 +4,7 @@ use 5.006;
 
 use strict;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 use Test::Builder::Module;
 our @ISA    = qw(Test::Builder::Module);

diff --git a/lib/Test/Tester.pm b/lib/Test/Tester.pm
@@ -18,7 +18,7 @@ require Exporter;
 
 use vars qw( @ISA @EXPORT );
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 @EXPORT = qw( run_tests check_tests check_test cmp_results show_space );
 @ISA = qw( Exporter );

diff --git a/lib/Test/Tester/Capture.pm b/lib/Test/Tester/Capture.pm
@@ -2,7 +2,7 @@ use strict;
 
 package Test::Tester::Capture;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 
 use Test::Builder;

diff --git a/lib/Test/Tester/CaptureRunner.pm b/lib/Test/Tester/CaptureRunner.pm
@@ -3,7 +3,7 @@ use strict;
 
 package Test::Tester::CaptureRunner;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 
 use Test::Tester::Capture;

diff --git a/lib/Test/Tester/Delegate.pm b/lib/Test/Tester/Delegate.pm
@@ -3,7 +3,7 @@ use warnings;
 
 package Test::Tester::Delegate;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 use Scalar::Util();
 

diff --git a/lib/Test/use/ok.pm b/lib/Test/use/ok.pm
@@ -1,7 +1,7 @@
 package Test::use::ok;
 use 5.005;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 
 __END__

diff --git a/lib/Test2.pm b/lib/Test2.pm
@@ -2,7 +2,7 @@ package Test2;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 
 1;

diff --git a/lib/Test2/API.pm b/lib/Test2/API.pm
@@ -10,7 +10,7 @@ BEGIN {
     $ENV{TEST2_ACTIVE} = 1;
 }
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 
 my $INST;

diff --git a/lib/Test2/API/Breakage.pm b/lib/Test2/API/Breakage.pm
@@ -2,7 +2,7 @@ package Test2::API::Breakage;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 
 use Test2::Util qw/pkg_to_file/;

diff --git a/lib/Test2/API/Context.pm b/lib/Test2/API/Context.pm
@@ -2,7 +2,7 @@ package Test2::API::Context;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 
 use Carp qw/confess croak/;

diff --git a/lib/Test2/API/Instance.pm b/lib/Test2/API/Instance.pm
@@ -2,7 +2,7 @@ package Test2::API::Instance;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 our @CARP_NOT = qw/Test2::API Test2::API::Instance Test2::IPC::Driver Test2::Formatter/;
 use Carp qw/confess carp/;

diff --git a/lib/Test2/API/InterceptResult.pm b/lib/Test2/API/InterceptResult.pm
@@ -2,7 +2,7 @@ package Test2::API::InterceptResult;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 use Scalar::Util qw/blessed/;
 use Test2::Util  qw/pkg_to_file/;

diff --git a/lib/Test2/API/InterceptResult/Event.pm b/lib/Test2/API/InterceptResult/Event.pm
@@ -2,7 +2,7 @@ package Test2::API::InterceptResult::Event;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 use List::Util   qw/first/;
 use Test2::Util  qw/pkg_to_file/;

diff --git a/lib/Test2/API/InterceptResult/Facet.pm b/lib/Test2/API/InterceptResult/Facet.pm
@@ -2,7 +2,7 @@ package Test2::API::InterceptResult::Facet;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 BEGIN {
     require Test2::EventFacet;

diff --git a/lib/Test2/API/InterceptResult/Hub.pm b/lib/Test2/API/InterceptResult/Hub.pm
@@ -2,7 +2,7 @@ package Test2::API::InterceptResult::Hub;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 BEGIN { require Test2::Hub; our @ISA = qw(Test2::Hub) }
 use Test2::Util::HashBase;

diff --git a/lib/Test2/API/InterceptResult/Squasher.pm b/lib/Test2/API/InterceptResult/Squasher.pm
@@ -2,7 +2,7 @@ package Test2::API::InterceptResult::Squasher;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 use Carp qw/croak/;
 use List::Util qw/first/;

diff --git a/lib/Test2/API/Stack.pm b/lib/Test2/API/Stack.pm
@@ -2,7 +2,7 @@ package Test2::API::Stack;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 
 use Test2::Hub();

diff --git a/lib/Test2/Event.pm b/lib/Test2/Event.pm
@@ -2,7 +2,7 @@ package Test2::Event;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 use Scalar::Util qw/blessed reftype/;
 use Carp qw/croak/;

diff --git a/lib/Test2/Event/Bail.pm b/lib/Test2/Event/Bail.pm
@@ -2,7 +2,7 @@ package Test2::Event::Bail;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 
 BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }

diff --git a/lib/Test2/Event/Diag.pm b/lib/Test2/Event/Diag.pm
@@ -2,7 +2,7 @@ package Test2::Event::Diag;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 
 BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }

diff --git a/lib/Test2/Event/Encoding.pm b/lib/Test2/Event/Encoding.pm
@@ -2,7 +2,7 @@ package Test2::Event::Encoding;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 use Carp qw/croak/;
 

diff --git a/lib/Test2/Event/Exception.pm b/lib/Test2/Event/Exception.pm
@@ -2,7 +2,7 @@ package Test2::Event::Exception;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 
 BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }

diff --git a/lib/Test2/Event/Fail.pm b/lib/Test2/Event/Fail.pm
@@ -2,7 +2,7 @@ package Test2::Event::Fail;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 use Test2::EventFacet::Info;
 

diff --git a/lib/Test2/Event/Generic.pm b/lib/Test2/Event/Generic.pm
@@ -5,7 +5,7 @@ use warnings;
 use Carp qw/croak/;
 use Scalar::Util qw/reftype/;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
 use Test2::Util::HashBase;

diff --git a/lib/Test2/Event/Note.pm b/lib/Test2/Event/Note.pm
@@ -2,7 +2,7 @@ package Test2::Event::Note;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 
 BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }

diff --git a/lib/Test2/Event/Ok.pm b/lib/Test2/Event/Ok.pm
@@ -2,7 +2,7 @@ package Test2::Event::Ok;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 
 BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }

diff --git a/lib/Test2/Event/Pass.pm b/lib/Test2/Event/Pass.pm
@@ -2,7 +2,7 @@ package Test2::Event::Pass;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 use Test2::EventFacet::Info;
 

diff --git a/lib/Test2/Event/Plan.pm b/lib/Test2/Event/Plan.pm
@@ -2,7 +2,7 @@ package Test2::Event::Plan;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 
 BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }

diff --git a/lib/Test2/Event/Skip.pm b/lib/Test2/Event/Skip.pm
@@ -2,7 +2,7 @@ package Test2::Event::Skip;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 
 BEGIN { require Test2::Event::Ok; our @ISA = qw(Test2::Event::Ok) }

diff --git a/lib/Test2/Event/Subtest.pm b/lib/Test2/Event/Subtest.pm
@@ -2,7 +2,7 @@ package Test2::Event::Subtest;
 use strict;
 use warnings;
 
-our $VERSION = '1.302195';
+our $VERSION = '1.302196';
 
 BEGIN { require Test2::Event::Ok; our @ISA = qw(Test2::Event::Ok) }
 use Test2::Util::HashBase qw{subevents buffered subtest_id subtest_uuid start_stamp stop_stamp};