[Catalyst-commits] r9208 - in Catalyst-Runtime/5.80/trunk/t: . lib/Catalyst/Plugin/Test lib/TestApp/Plugin

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2009-02-04 22:43:11 +0000 (Wed, 04 Feb 2009)
New Revision: 9208

Modified:
   Catalyst-Runtime/5.80/trunk/t/c3_mro.t
   Catalyst-Runtime/5.80/trunk/t/lib/Catalyst/Plugin/Test/Errors.pm
   Catalyst-Runtime/5.80/trunk/t/lib/Catalyst/Plugin/Test/Headers.pm
   Catalyst-Runtime/5.80/trunk/t/lib/Catalyst/Plugin/Test/Plugin.pm
   Catalyst-Runtime/5.80/trunk/t/lib/TestApp/Plugin/AddDispatchTypes.pm
Log:
Use MRO::Compat instead of Class::C3 as we already depend on it.

Modified: Catalyst-Runtime/5.80/trunk/t/c3_mro.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/c3_mro.t	2009-02-04 21:46:49 UTC (rev 9207)
+++ Catalyst-Runtime/5.80/trunk/t/c3_mro.t	2009-02-04 22:43:11 UTC (rev 9208)
@@ -4,10 +4,8 @@
 use Test::More;
 require Catalyst;
 require Module::Pluggable::Object;
+use MRO::Compat;
 
-eval "require Class::C3";
-plan skip_all => "This test requires Class::C3" if $@;
-
 # Get a list of all Catalyst:: packages in blib via M::P::O
 my @cat_mods;
 {
@@ -34,7 +32,7 @@
 #
 foreach my $cat_mod (@cat_mods) {
   eval " require $cat_mod ";
-  eval { Class::C3::calculateMRO($cat_mod) };
+  eval { mro::get_linear_isa($cat_mod, 'c3') };
   ok(!$@, "calculateMRO for $cat_mod: $@");
 }
 

Modified: Catalyst-Runtime/5.80/trunk/t/lib/Catalyst/Plugin/Test/Errors.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/lib/Catalyst/Plugin/Test/Errors.pm	2009-02-04 21:46:49 UTC (rev 9207)
+++ Catalyst-Runtime/5.80/trunk/t/lib/Catalyst/Plugin/Test/Errors.pm	2009-02-04 22:43:11 UTC (rev 9208)
@@ -1,7 +1,7 @@
 package Catalyst::Plugin::Test::Errors;
 
 use strict;
-use Class::C3;
+use MRO::Compat;
 
 sub error {
     my $c = shift;

Modified: Catalyst-Runtime/5.80/trunk/t/lib/Catalyst/Plugin/Test/Headers.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/lib/Catalyst/Plugin/Test/Headers.pm	2009-02-04 21:46:49 UTC (rev 9207)
+++ Catalyst-Runtime/5.80/trunk/t/lib/Catalyst/Plugin/Test/Headers.pm	2009-02-04 22:43:11 UTC (rev 9208)
@@ -1,7 +1,7 @@
 package Catalyst::Plugin::Test::Headers;
 
 use strict;
-use Class::C3;
+use MRO::Compat;
 
 sub prepare {
     my $class = shift;

Modified: Catalyst-Runtime/5.80/trunk/t/lib/Catalyst/Plugin/Test/Plugin.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/lib/Catalyst/Plugin/Test/Plugin.pm	2009-02-04 21:46:49 UTC (rev 9207)
+++ Catalyst-Runtime/5.80/trunk/t/lib/Catalyst/Plugin/Test/Plugin.pm	2009-02-04 22:43:11 UTC (rev 9208)
@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use Class::C3;
+use MRO::Compat;
 
 use base qw/Catalyst::Base Class::Data::Inheritable/;
 

Modified: Catalyst-Runtime/5.80/trunk/t/lib/TestApp/Plugin/AddDispatchTypes.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/lib/TestApp/Plugin/AddDispatchTypes.pm	2009-02-04 21:46:49 UTC (rev 9207)
+++ Catalyst-Runtime/5.80/trunk/t/lib/TestApp/Plugin/AddDispatchTypes.pm	2009-02-04 22:43:11 UTC (rev 9208)
@@ -1,7 +1,7 @@
 package TestApp::Plugin::AddDispatchTypes;
 use strict;
 use warnings;
-use Class::C3;
+use MRO::Compat;
 
 sub setup_dispatcher {
     my $class = shift;