X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F027-modifiers.t;h=b8560ba37e156b72ebfdd6ab2dc5b29c0f1f9ca2;hb=8cbcbb47d0f02077d07873c553494a884d9c085f;hp=84e3930063df4d8a4f4b54d8cbe1a348f11e7045;hpb=c13900f12aef41dec5bc9661cb720ccb709c9a5b;p=gitmo%2FMouse.git

diff --git a/t/027-modifiers.t b/t/027-modifiers.t
index 84e3930..b8560ba 100644
--- a/t/027-modifiers.t
+++ b/t/027-modifiers.t
@@ -2,15 +2,7 @@
 use strict;
 use warnings;
 
-use Test::More;
-BEGIN {
-    if (eval "require Class::Method::Modifiers; 1") {
-        plan tests => 1;
-    }
-    else {
-        plan skip_all => "Class::Method::Modifiers required for this test";
-    }
-}
+use Test::More tests => 25;
 
 my @seen;
 my @expected = ("before 4",
@@ -117,3 +109,152 @@ BEGIN {
     };
 }
 
+# from Class::Method::Modifers' t/020-multiple-inheritance.t
+
+# inheritance tree looks like:
+#
+#    SuperL        SuperR
+#      \             /
+#      MiddleL  MiddleR
+#         \       /
+#          -Child-
+
+# the Child and MiddleR modules use modifiers
+# Child will modify a method in SuperL (sl_c)
+# Child will modify a method in SuperR (sr_c)
+# Child will modify a method in SuperR already modified by MiddleR (sr_m_c)
+# SuperL and MiddleR will both have a method of the same name, doing different
+#     things (called 'conflict' and 'cnf_mod')
+
+# every method and modifier will just return <Class:Method:STUFF>
+
+BEGIN
+{
+    {
+        package SuperL;
+        use Mouse;
+
+        sub superl { "<SuperL:superl>" }
+        sub conflict { "<SuperL:conflict>" }
+        sub cnf_mod { "<SuperL:cnf_mod>" }
+        sub sl_c { "<SuperL:sl_c>" }
+    }
+
+    {
+        package SuperR;
+        use Mouse;
+
+        sub superr { "<SuperR:superr>" }
+        sub sr_c { "<SuperR:sr_c>" }
+        sub sr_m_c { "<SuperR:sr_m_c>" }
+    }
+
+    {
+        package MiddleL;
+        use Mouse;
+        extends 'SuperL';
+
+        sub middlel { "<MiddleL:middlel>" }
+    }
+
+    {
+        package MiddleR;
+        use Mouse;
+        extends 'SuperR';
+
+        sub middler { "<MiddleR:middler>" }
+        sub conflict { "<MiddleR:conflict>" }
+        sub cnf_mod { "<MiddleR:cnf_mod>" }
+        around sr_m_c => sub {
+            my $orig = shift;
+            return "<MiddleR:sr_m_c:".$orig->(@_).">"
+        };
+    }
+
+    {
+        package Child;
+        use Mouse;
+        extends qw(MiddleL MiddleR);
+
+        sub child { "<Child:child>" }
+        around cnf_mod => sub { "<Child:cnf_mod:".shift->(@_).">" };
+        around sl_c => sub { "<Child:sl_c:".shift->(@_).">" };
+        around sr_c => sub { "<Child:sr_c:".shift->(@_).">" };
+        around sr_m_c => sub {
+            my $orig = shift;
+            return "<Child:sr_m_c:".$orig->(@_).">"
+        };
+    }
+}
+
+
+my $SuperL = SuperL->new();
+my $SuperR = SuperR->new();
+my $MiddleL = MiddleL->new();
+my $MiddleR = MiddleR->new();
+my $Child = Child->new();
+
+is($SuperL->superl, "<SuperL:superl>", "SuperL loaded correctly");
+is($SuperR->superr, "<SuperR:superr>", "SuperR loaded correctly");
+is($MiddleL->middlel, "<MiddleL:middlel>", "MiddleL loaded correctly");
+is($MiddleR->middler, "<MiddleR:middler>", "MiddleR loaded correctly");
+is($Child->child, "<Child:child>", "Child loaded correctly");
+
+is($SuperL->sl_c, "<SuperL:sl_c>", "SuperL->sl_c on SuperL");
+is($Child->sl_c, "<Child:sl_c:<SuperL:sl_c>>", "SuperL->sl_c wrapped by Child's around");
+
+is($SuperR->sr_c, "<SuperR:sr_c>", "SuperR->sr_c on SuperR");
+is($Child->sr_c, "<Child:sr_c:<SuperR:sr_c>>", "SuperR->sr_c wrapped by Child's around");
+
+is($SuperR->sr_m_c, "<SuperR:sr_m_c>", "SuperR->sr_m_c on SuperR");
+is($MiddleR->sr_m_c, "<MiddleR:sr_m_c:<SuperR:sr_m_c>>", "SuperR->sr_m_c wrapped by MiddleR's around");
+is($Child->sr_m_c, "<Child:sr_m_c:<MiddleR:sr_m_c:<SuperR:sr_m_c>>>", "MiddleR->sr_m_c's wrapping wrapped by Child's around");
+
+is($SuperL->conflict, "<SuperL:conflict>", "SuperL->conflict on SuperL");
+is($MiddleR->conflict, "<MiddleR:conflict>", "MiddleR->conflict on MiddleR");
+is($Child->conflict, "<SuperL:conflict>", "SuperL->conflict on Child");
+
+is($SuperL->cnf_mod, "<SuperL:cnf_mod>", "SuperL->cnf_mod on SuperL");
+is($MiddleR->cnf_mod, "<MiddleR:cnf_mod>", "MiddleR->cnf_mod on MiddleR");
+is($Child->cnf_mod, "<Child:cnf_mod:<SuperL:cnf_mod>>", "SuperL->cnf_mod wrapped by Child's around");
+
+# taken from Class::Method::Modifiers' t/051-undef-list-ctxt.t
+my($orig_called, $after_called);
+BEGIN
+{
+    package ParentX;
+    use Mouse;
+
+    sub orig
+    {
+        my $self = shift;
+        $orig_called = 1;
+        return;
+    }
+
+    package ChildX;
+    use Mouse;
+    extends 'ParentX';
+
+    after 'orig' => sub
+    {
+        $after_called = 1;
+    };
+}
+
+{
+    ($after_called, $orig_called) = (0, 0);
+    my $child = ChildX->new();
+    my @results = $child->orig();
+
+    ok($orig_called, "original method called");
+    ok($after_called, "after-modifier called");
+    is(@results, 0, "list context with after doesn't screw up 'return'");
+
+    ($after_called, $orig_called) = (0, 0);
+    my $result = $child->orig();
+
+    ok($orig_called, "original method called");
+    ok($after_called, "after-modifier called");
+    is($result, undef, "scalar context with after doesn't screw up 'return'");
+}