remove extraneous garbage from tests

[gitmo/Class-C3.git] / t / 31_next_method_skip.t

diff --git a/t/31_next_method_skip.t b/t/31_next_method_skip.t
index 26912f0..0b166ce 100644 (file)
--- a/t/31_next_method_skip.t
+++ b/t/31_next_method_skip.t
@@ -3,15 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 7;
-
-BEGIN {
-    use lib 'opt', '../opt', '..';    
-    use_ok('c3');
-    # uncomment this line, and re-run the
-    # test to see the normal p5 dispatch order
-    #$Class::C3::TURN_OFF_C3 = 1;    
-}
+use Test::More tests => 10;
 
 =pod
 
@@ -27,31 +19,40 @@ This tests the classic diamond inheritence pattern.
 
 {
     package Diamond_A;
-    use c3; 
+    use Class::C3; 
     sub bar { 'Diamond_A::bar' }        
     sub baz { 'Diamond_A::baz' }
 }
 {
     package Diamond_B;
     use base 'Diamond_A';
-    use c3;    
+    use Class::C3;    
     sub baz { 'Diamond_B::baz => ' . (shift)->next::method() }         
 }
 {
     package Diamond_C;
-    use c3;    
+    use Class::C3;    
     use base 'Diamond_A';     
     sub foo { 'Diamond_C::foo' }   
-    sub buz { 'Diamond_C::buz' }           
+    sub buz { 'Diamond_C::buz' }     
+    
+    sub woz { 'Diamond_C::woz' }
+    sub maybe { 'Diamond_C::maybe' }         
 }
 {
     package Diamond_D;
     use base ('Diamond_B', 'Diamond_C');
-    use c3; 
+    use Class::C3; 
     sub foo { 'Diamond_D::foo => ' . (shift)->next::method() } 
     sub bar { 'Diamond_D::bar => ' . (shift)->next::method() }   
     sub buz { 'Diamond_D::buz => ' . (shift)->baz() }  
-    sub fuz { 'Diamond_D::fuz => ' . (shift)->next::method() }           
+    sub fuz { 'Diamond_D::fuz => ' . (shift)->next::method() }  
+    
+    sub woz { 'Diamond_D::woz can => ' . ((shift)->next::can() ? 1 : 0) }
+    sub noz { 'Diamond_D::noz can => ' . ((shift)->next::can() ? 1 : 0) }
+
+    sub maybe { 'Diamond_D::maybe => ' . ((shift)->maybe::next::method() || 0) }
+    sub moybe { 'Diamond_D::moybe => ' . ((shift)->maybe::next::method() || 0) }             
 
 }
 
@@ -69,4 +70,8 @@ is(Diamond_D->buz, 'Diamond_D::buz => Diamond_B::baz => Diamond_A::baz', '... ca
 eval { Diamond_D->fuz };
 like($@, qr/^No next::method 'fuz' found for Diamond_D/, '... cannot re-dispatch to a method which is not there');
 
+is(Diamond_D->woz, 'Diamond_D::woz can => 1', '... can re-dispatch figured out correctly');
+is(Diamond_D->noz, 'Diamond_D::noz can => 0', '... cannot re-dispatch figured out correctly');
 
+is(Diamond_D->maybe, 'Diamond_D::maybe => Diamond_C::maybe', '... redispatched D to C when it exists');
+is(Diamond_D->moybe, 'Diamond_D::moybe => 0', '... quietly failed redispatch from D');