From 3a492beebdc22ea5f06384c99080515e11b1aa32 Mon Sep 17 00:00:00 2001
From: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
Date: Tue, 9 Aug 2016 16:47:41 +0100
Subject: Use sub signatures!

also:
* add Sietima::Policy to enable stuff everywhere
* use Test::Sietima everywhere (which imposes Sietima::Policy)
---
 t/lib/Test/Sietima.pm                          | 26 ++++++++------------------
 t/lib/Test/Sietima/MailStore.pm                | 16 ++++------------
 t/tests/sietima.t                              |  3 ---
 t/tests/sietima/message.t                      |  6 +-----
 t/tests/sietima/role/avoid-dups.t              |  3 ---
 t/tests/sietima/role/debounce.t                |  3 ---
 t/tests/sietima/role/nomail.t                  |  3 ---
 t/tests/sietima/role/replyto.t                 |  3 ---
 t/tests/sietima/role/subject-tag.t             |  3 ---
 t/tests/sietima/role/subscriberonly/drop.t     |  3 ---
 t/tests/sietima/role/subscriberonly/moderate.t |  3 ---
 t/tests/sietima/subscriber.t                   |  7 ++-----
 12 files changed, 15 insertions(+), 64 deletions(-)

(limited to 't')

diff --git a/t/lib/Test/Sietima.pm b/t/lib/Test/Sietima.pm
index 31fb809..7b2a6ae 100644
--- a/t/lib/Test/Sietima.pm
+++ b/t/lib/Test/Sietima.pm
@@ -1,7 +1,4 @@
 package Test::Sietima;
-use strict;
-use warnings;
-use 5.024;
 use lib 't/lib';
 use Import::Into;
 use Email::Stuffer;
@@ -10,6 +7,7 @@ use Data::Printer;
 use Sietima;
 use Test2::Bundle::Extended;
 use Test2::API qw(context);
+use Sietima::Policy;
 use namespace::clean;
 
 sub import {
@@ -17,6 +15,7 @@ sub import {
     Test2::Bundle::Extended->import::into($target);
     Test2::Plugin::DieOnFail->import::into($target);
     Data::Printer->import::into($target);
+    Sietima::Policy->import::into($target);
 
     for my $function (qw(transport make_sietima make_mail
                          deliveries_are test_sending)) {
@@ -33,9 +32,7 @@ sub transport {
     return $transport;
 }
 
-sub make_sietima {
-    my (%args) = @_;
-
+sub make_sietima (%args) {
     my $class = 'Sietima';
     if (my $traits = delete $args{with_traits}) {
         $class = $class->with_traits($traits->@*);
@@ -48,14 +45,12 @@ sub make_sietima {
     });
 }
 
-my $maybe = sub {
-    my ($obj,$method,$arg) = @_;
+my $maybe = sub ($obj,$method,$arg) {
     return $obj unless $arg;
     return $obj->$method($arg);
 };
 
-my $mapit = sub {
-    my ($obj,$method,$arg) = @_;
+my $mapit = sub ($obj,$method,$arg) {
     return $obj unless $arg;
     for my $k (keys $arg->%*) {
         $obj = $obj->$method($k, $arg->{$k});
@@ -63,9 +58,7 @@ my $mapit = sub {
     return $obj;
 };
 
-sub make_mail {
-    my (%args) = @_;
-
+sub make_mail (%args) {
     Email::Stuffer
           ->from($args{from}||'someone@users.example.com')
           ->to($args{to}||$return_path)
@@ -76,9 +69,7 @@ sub make_mail {
           ->email;
 }
 
-sub deliveries_are {
-    my (%args) = @_;
-
+sub deliveries_are (%args) {
     my $ctx = context();
 
     my $checker;
@@ -136,8 +127,7 @@ sub deliveries_are {
     $ctx->release;
 }
 
-sub test_sending {
-    my (%args) = @_;
+sub test_sending (%args) {
     my $ctx = context();
 
     my $sietima = delete $args{sietima};
diff --git a/t/lib/Test/Sietima/MailStore.pm b/t/lib/Test/Sietima/MailStore.pm
index ff4064c..60054c3 100644
--- a/t/lib/Test/Sietima/MailStore.pm
+++ b/t/lib/Test/Sietima/MailStore.pm
@@ -1,8 +1,6 @@
 package Test::Sietima::MailStore;
-use strict;
-use warnings;
-use 5.024;
 use Moo;
+use Sietima::Policy;
 use List::AllUtils qw(all);
 use namespace::clean;
 
@@ -15,9 +13,7 @@ has _mails => (
 
 sub clear { shift->_mails([]) }
 
-sub store {
-    my ($self,$mail,@tags) = @_;
-
+sub store ($self,$mail,@tags) {
     my $id = time();
     push $self->_mails->@*, {
         id => $id,
@@ -27,9 +23,7 @@ sub store {
     return $id;
 }
 
-sub retrieve_by_tags {
-    my ($self,@tags) = @_;
-
+sub retrieve_by_tags ($self,@tags){
     my @ret;
     for my $m ($self->_mails->@*) {
         next unless all { $m->{tags}{$_} } @tags;
@@ -42,9 +36,7 @@ sub retrieve_by_tags {
     return \@ret;
 }
 
-sub retrieve_by_id {
-    my ($self,$id) = @_;
-
+sub retrieve_by_id ($self,$id) {
     for my $m ($self->_mails->@*) {
         next unless $m->{id} eq $id;
         return Email::MIME->new($m->{mail});
diff --git a/t/tests/sietima.t b/t/tests/sietima.t
index 143c026..987cbdd 100644
--- a/t/tests/sietima.t
+++ b/t/tests/sietima.t
@@ -1,7 +1,4 @@
 #!perl
-use strict;
-use warnings;
-use 5.024;
 use lib 't/lib';
 use Test::Sietima;
 
diff --git a/t/tests/sietima/message.t b/t/tests/sietima/message.t
index 5d9ceca..d1c548a 100644
--- a/t/tests/sietima/message.t
+++ b/t/tests/sietima/message.t
@@ -1,10 +1,6 @@
 #!perl
-use strict;
-use warnings;
-use 5.024;
 use lib 't/lib';
-use Test2::Bundle::Extended;
-use Test2::Plugin::DieOnFail;
+use Test::Sietima;
 use Email::Stuffer;
 use Sietima::Message;
 
diff --git a/t/tests/sietima/role/avoid-dups.t b/t/tests/sietima/role/avoid-dups.t
index 58cd308..671d898 100644
--- a/t/tests/sietima/role/avoid-dups.t
+++ b/t/tests/sietima/role/avoid-dups.t
@@ -1,7 +1,4 @@
 #!perl
-use strict;
-use warnings;
-use 5.024;
 use lib 't/lib';
 use Test::Sietima;
 
diff --git a/t/tests/sietima/role/debounce.t b/t/tests/sietima/role/debounce.t
index 903427b..ba7566c 100644
--- a/t/tests/sietima/role/debounce.t
+++ b/t/tests/sietima/role/debounce.t
@@ -1,7 +1,4 @@
 #!perl
-use strict;
-use warnings;
-use 5.024;
 use lib 't/lib';
 use Test::Sietima;
 
diff --git a/t/tests/sietima/role/nomail.t b/t/tests/sietima/role/nomail.t
index a0be192..1622fb4 100644
--- a/t/tests/sietima/role/nomail.t
+++ b/t/tests/sietima/role/nomail.t
@@ -1,7 +1,4 @@
 #!perl
-use strict;
-use warnings;
-use 5.024;
 use lib 't/lib';
 use Test::Sietima;
 
diff --git a/t/tests/sietima/role/replyto.t b/t/tests/sietima/role/replyto.t
index 1bd2d02..c502391 100644
--- a/t/tests/sietima/role/replyto.t
+++ b/t/tests/sietima/role/replyto.t
@@ -1,7 +1,4 @@
 #!perl
-use strict;
-use warnings;
-use 5.024;
 use lib 't/lib';
 use Test::Sietima;
 
diff --git a/t/tests/sietima/role/subject-tag.t b/t/tests/sietima/role/subject-tag.t
index 490f1a3..e3a266b 100644
--- a/t/tests/sietima/role/subject-tag.t
+++ b/t/tests/sietima/role/subject-tag.t
@@ -1,7 +1,4 @@
 #!perl
-use strict;
-use warnings;
-use 5.024;
 use lib 't/lib';
 use Test::Sietima;
 
diff --git a/t/tests/sietima/role/subscriberonly/drop.t b/t/tests/sietima/role/subscriberonly/drop.t
index c4123af..6229bb3 100644
--- a/t/tests/sietima/role/subscriberonly/drop.t
+++ b/t/tests/sietima/role/subscriberonly/drop.t
@@ -1,7 +1,4 @@
 #!perl
-use strict;
-use warnings;
-use 5.024;
 use lib 't/lib';
 use Test::Sietima;
 
diff --git a/t/tests/sietima/role/subscriberonly/moderate.t b/t/tests/sietima/role/subscriberonly/moderate.t
index b76a01a..a641a55 100644
--- a/t/tests/sietima/role/subscriberonly/moderate.t
+++ b/t/tests/sietima/role/subscriberonly/moderate.t
@@ -1,7 +1,4 @@
 #!perl
-use strict;
-use warnings;
-use 5.024;
 use lib 't/lib';
 use Test::Sietima;
 use Test::Sietima::MailStore;
diff --git a/t/tests/sietima/subscriber.t b/t/tests/sietima/subscriber.t
index 979997b..23651a9 100644
--- a/t/tests/sietima/subscriber.t
+++ b/t/tests/sietima/subscriber.t
@@ -1,9 +1,6 @@
 #!perl
-use strict;
-use warnings;
-use 5.024;
-use Test2::Bundle::Extended;
-use Test2::Plugin::DieOnFail;
+use lib 't/lib';
+use Test::Sietima;
 use Sietima::Subscriber;
 
 subtest 'simple' => sub {
-- 
cgit v1.2.3