Fix tests to run on <5.010

Changes

@@ -1,7 +1,8 @@
 Revision history for Class-Tiny-ConstrainedAccessor
 
-0.000005    2019-??-??
+0.000005    2019-03-24  TRIAL
         - See changes for v0.000004, including checking constructor parameters.
+        - Fix tests to run on <5.010
 
 0.000004    2019-03-22
         - Check constructor parameters (GH-4)

MANIFEST

@@ -25,6 +25,7 @@ t/MY/Class/TypeTiny.pm
 t/MY/Class/TypeTinyBadDefaults.pm
 t/MY/Class/TypeTinyBUILD.pm
 t/MY/Class/TypeTinyNOBUILD.pm
+t/MY/Helpers.pm
 t/MY/Kit.pm
 t/MY/Tests.pm
 t/MY/TypeLib/MooXTypesMooseLike.pm

Makefile.PL

@@ -170,8 +170,10 @@ my %opts = (
         'Path::Class' => '0',
     },
     TEST_REQUIRES => {
+        'Exporter' => '0',
         'Import::Into' => '0',
         'lib::relative' => '0.002',
+        'parent' => '0',
         'Test::Builder' => '0',
         'Test::Exception' => '0',
         'Test::Fatal' => '0',       # TODO replace uses of this with T~::Ex~

lib/Class/Tiny/ConstrainedAccessor.pm

@@ -5,7 +5,7 @@ use strict;
 use warnings;
 use Class::Tiny;
 
-our $VERSION = '0.000005';
+our $VERSION = '0.000005'; # TRIAL
 
 # Docs {{{1
 

t/MY/Class/MooseXTypes.pm

@@ -3,6 +3,8 @@ package MY::Class::MooseXTypes;
 use 5.006;
 use strict;
 use warnings;
+use MY::Helpers;
+
 our @ISA;
 use Scalar::Util qw(looks_like_number);
 
@@ -18,7 +20,7 @@ BEGIN {
     subtype MediumInteger,
         as Int,
         where { $_ >= 10 and $_ < 20 },
-        message { ($_ // 'undef') . ' is not an integer on [10,19]' };
+        message { _dor . ' is not an integer on [10,19]' };
 
     # Sanity check
     my $av = eval { MediumInteger->can('assert_valid') };

t/MY/Helpers.pm

@@ -0,0 +1,17 @@
+package MY::Helpers;
+use 5.006;
+use strict;
+use warnings;
+
+use parent 'Exporter';
+our @EXPORT=qw(_dor);
+
+# Helper since <5.010 doesn't have `//`
+sub _dor {
+    my $x = @_ ? $_[0] : $_;
+    defined $x ? $x :
+        (defined $_[1] ? $_[1] : 'undef')
+} #_dor()
+
+1;
+

t/MY/Tests.pm

@@ -24,6 +24,7 @@ use warnings;
 use Test::More;
 use Test::Exception;
 use Test::Fatal;
+use MY::Helpers;
 
 =head1 FUNCTIONS
 
@@ -55,46 +56,46 @@ sub test_accessors {
     is(
         exception { $dut->regular($_) },
         undef,
-        'Regular accepts ' . ($_ // 'undef')
+        'Regular accepts ' . _dor
     ) foreach (0, 9, 10, 19, 20, 'some string', undef, \*STDOUT);
 
     # The constrained accessors accept 10..19
     is(
         exception { $dut->medint($_) },
         undef,
-        'medint accepts ' . ($_ // 'undef')
+        'medint accepts ' . _dor
     ) foreach (10..19, "10".."19");
 
     is(
         exception { $dut->med_with_default($_) },
         undef,
-        'med_with_default accepts ' . ($_ // 'undef')
+        'med_with_default accepts ' . _dor
     ) foreach (10..19, "10".."19");
 
     # The constrained accessors reject numbers outside that range
     like(
         exception { $dut->medint($_) },
         qr/./,
-        'medint rejects ' . ($_ // 'undef')
+        'medint rejects ' . _dor
     ) foreach (0..9, "0".."9", 20..29, "20".."29");
 
     like(
         exception { $dut->med_with_default($_) },
         qr/./,
-        'med_with_default rejects ' . ($_ // 'undef')
+        'med_with_default rejects ' . _dor
     ) foreach (0..9, "0".."9", 20..29, "20".."29");
 
     # The constrained accessors reject random stuff
     like(
         exception { $dut->medint($_) },
         qr/./,
-        'medint rejects ' . ($_ // 'undef')
+        'medint rejects ' . _dor
     ) foreach ('some string', undef, \*STDOUT);
 
     like(
         exception { $dut->med_with_default($_) },
         qr/./,
-        'med_with_default rejects ' . ($_ // 'undef')
+        'med_with_default rejects ' . _dor
     ) foreach ('some string', undef, \*STDOUT);
 } #test_accessors()
 
@@ -113,7 +114,7 @@ in the specified class).  The coderef is for flexibility.
 sub test_construction {
     my $class = shift;
     die "Need a class name" unless $class;
-    my $factory = shift // sub { $class->new(@_) };
+    my $factory = shift || sub { $class->new(@_) };
 
     # Sanity check: parameters OK
     my $obj = $factory->(regular=>1, medint=>10);

t/MY/TypeLib/MouseX.pm

@@ -4,6 +4,7 @@ package MY::TypeLib::MouseX;
 use 5.006;
 use strict;
 use warnings;
+use MY::Helpers;
 # within Mouse, so we put it in a separate package from SampleMouseXTypes.
 
 use Scalar::Util qw(looks_like_number);
@@ -18,7 +19,7 @@ BEGIN {
     subtype MediumInteger,
         as Int,
         where { $_ >= 10 and $_ < 20 },
-        message { ($_ // 'undef') . ' is not an integer on [10,19]' };
+        message { _dor . ' is not an integer on [10,19]' };
 
     # Sanity check
     my $av = eval { MediumInteger->can('assert_valid') };