X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fbasic.t;h=b159e77f769d51ed16191debcf471da597eb52e0;hb=topic%2Frole_support;hp=964363006cd20aac864e3e30ca2137c3aae7b139;hpb=54cc4bad8c14d4adadc4bef100f351a2ad0b01c9;p=gitmo%2FMooseX-StrictConstructor.git

diff --git a/t/basic.t b/t/basic.t
index 9643630..b159e77 100644
--- a/t/basic.t
+++ b/t/basic.t
@@ -1,10 +1,11 @@
 use strict;
 use warnings;
 
+use Test::Fatal;
+use Test::Moose qw( with_immutable );
 use Test::More;
 
 {
-
     package Standard;
 
     use Moose;
@@ -13,7 +14,6 @@ use Test::More;
 }
 
 {
-
     package Stricter;
 
     use Moose;
@@ -23,7 +23,6 @@ use Test::More;
 }
 
 {
-
     package Subclass;
 
     use Moose;
@@ -35,7 +34,27 @@ use Test::More;
 }
 
 {
+    package StrictSubclass;
+
+    use Moose;
+
+    extends 'Stricter';
+
+    has 'size' => ( is => 'rw' );
+}
+
+{
+    package OtherStrictSubclass;
+
+    use Moose;
+    use MooseX::StrictConstructor;
 
+    extends 'Standard';
+
+    has 'size' => ( is => 'rw' );
+}
+
+{
     package Tricky;
 
     use Moose;
@@ -52,7 +71,6 @@ use Test::More;
 }
 
 {
-
     package InitArg;
 
     use Moose;
@@ -63,126 +81,103 @@ use Test::More;
 }
 
 {
-
-    package ImmutableInitArg;
-
-    use Moose;
-    use MooseX::StrictConstructor;
-
-    has 'thing' => ( is => 'rw', 'init_arg' => 'other' );
-    has 'size'  => ( is => 'rw', 'init_arg' => undef );
-
-    no Moose;
-    __PACKAGE__->meta()->make_immutable();
+    local $@;
+    eval q[package MyRole; use Moose::Role; use MooseX::StrictConstructor;];
+    like(
+        $@,
+        qr/can only be applied to Moose classes/,
+        "can't apply MXSC to a role"
+    );
 }
 
 {
-
-    package Immutable;
-
-    use Moose;
-    use MooseX::StrictConstructor;
-
-    has 'thing' => ( is => 'rw' );
-
-    no Moose;
-    __PACKAGE__->meta()->make_immutable();
+    local $@;
+    eval q[package Nothing; use MooseX::StrictConstructor;];
+    like(
+        $@,
+        qr/can only be applied to Moose classes/,
+        "can't apply MXSC to a random package",
+    );
 }
 
-{
-
-    package ImmutableTricky;
-
-    use Moose;
-    use MooseX::StrictConstructor;
-
-    has 'thing' => ( is => 'rw' );
-
-    sub BUILD {
-        my $self   = shift;
-        my $params = shift;
-
-        delete $params->{spy};
-    }
-
-    no Moose;
-    __PACKAGE__->meta()->make_immutable();
+my @classes
+    = qw( Standard Stricter Subclass StrictSubclass OtherStrictSubclass Tricky InitArg );
+
+with_immutable {
+    is(
+        exception { Standard->new( thing => 1, bad => 99 ) }, undef,
+        'standard Moose class ignores unknown params'
+    );
+
+    like(
+        exception { Stricter->new( thing => 1, bad => 99 ) },
+        qr/unknown attribute.+: bad/,
+        'strict constructor blows up on unknown params'
+    );
+
+    is(
+        exception { Subclass->new( thing => 1, size => 'large' ) }, undef,
+        'subclass constructor handles known attributes correctly'
+    );
+
+    like(
+        exception { Subclass->new( thing => 1, bad => 99 ) },
+        qr/unknown attribute.+: bad/,
+        'subclass correctly recognizes bad attribute'
+    );
+
+    is(
+        exception { StrictSubclass->new( thing => 1, size => 'large', ) },
+        undef,
+        q{subclass that doesn't use strict constructor handles known attributes correctly}
+    );
+
+    like(
+        exception { StrictSubclass->new( thing => 1, bad => 99 ) },
+        qr/unknown attribute.+: bad/,
+        q{subclass that doesn't use strict correctly recognizes bad attribute}
+    );
+
+    is(
+        exception { OtherStrictSubclass->new( thing => 1, size => 'large', ) },
+        undef,
+        q{strict subclass from parent that doesn't use strict constructor handles known attributes correctly}
+    );
+
+    like(
+        exception { OtherStrictSubclass->new( thing => 1, bad => 99 ) },
+        qr/unknown attribute.+: bad/,
+        q{strict subclass from parent that doesn't use strict correctly recognizes bad attribute}
+    );
+
+    is(
+        exception { Tricky->new( thing => 1, spy => 99 ) }, undef,
+        'can work around strict constructor by deleting params in BUILD()'
+    );
+
+    like(
+        exception { Tricky->new( thing => 1, agent => 99 ) },
+        qr/unknown attribute.+: agent/,
+        'Tricky still blows up on unknown params other than spy'
+    );
+
+    like(
+        exception { InitArg->new( thing => 1 ) },
+        qr/unknown attribute.+: thing/,
+        'InitArg blows up with attribute name'
+    );
+
+    like(
+        exception { InitArg->new( size => 1 ) },
+        qr/unknown attribute.+: size/,
+        'InitArg blows up when given attribute with undef init_arg'
+    );
+
+    is(
+        exception { InitArg->new( other => 1 ) }, undef,
+        'InitArg works when given proper init_arg'
+    );
 }
-
-eval { Standard->new( thing => 1, bad => 99 ) };
-is( $@, '', 'standard Moose class ignores unknown params' );
-
-eval { Stricter->new( thing => 1, bad => 99 ) };
-like( $@, qr/unknown attribute.+: bad/,
-    'strict constructor blows up on unknown params' );
-
-eval { Subclass->new( thing => 1, size => 'large' ) };
-is( $@, '', 'subclass constructor handles known attributes correctly' );
-
-eval { Tricky->new( thing => 1, spy => 99 ) };
-is( $@, '',
-    'can work around strict constructor by deleting params in BUILD()' );
-
-eval { Tricky->new( thing => 1, agent => 99 ) };
-like( $@, qr/unknown attribute.+: agent/,
-    'Tricky still blows up on unknown params other than spy' );
-
-eval { Subclass->new( thing => 1, bad => 99 ) };
-like( $@, qr/unknown attribute.+: bad/,
-    'subclass constructor blows up on unknown params' );
-
-eval { InitArg->new( thing => 1 ) };
-like(
-    $@, qr/unknown attribute.+: thing/,
-    'InitArg blows up with attribute name'
-);
-
-eval { InitArg->new( size => 1 ) };
-like(
-    $@, qr/unknown attribute.+: size/,
-    'InitArg blows up when given attribute with undef init_arg'
-);
-
-eval { InitArg->new( other => 1 ) };
-is(
-    $@, '',
-    'InitArg works when given proper init_arg'
-);
-
-eval { ImmutableInitArg->new( thing => 1 ) };
-like(
-    $@, qr/unknown attribute.+: thing/,
-    'ImmutableInitArg blows up with attribute name'
-);
-
-eval { ImmutableInitArg->new( size => 1 ) };
-like(
-    $@, qr/unknown attribute.+: size/,
-    'ImmutableInitArg blows up when given attribute with undef init_arg'
-);
-
-eval { ImmutableInitArg->new( other => 1 ) };
-is(
-    $@, '',
-    'ImmutableInitArg works when given proper init_arg'
-);
-
-eval { Immutable->new( thing => 1, bad => 99 ) };
-like(
-    $@, qr/unknown attribute.+: bad/,
-    'strict constructor in immutable class blows up on unknown params'
-);
-
-eval { ImmutableTricky->new( thing => 1, spy => 99 ) };
-is(
-    $@, '',
-    'immutable class can work around strict constructor by deleting params in BUILD()'
-);
-
-eval { ImmutableTricky->new( thing => 1, agent => 99 ) };
-like(
-    $@, qr/unknown attribute.+: agent/,
-    'ImmutableTricky still blows up on unknown params other than spy'
-);
+@classes;
 
 done_testing();