Use MRO::Compat instead of Class::C3 as we already depend on it.

diff --git a/t/c3_mro.t b/t/c3_mro.t
index 57c3bdb..d987544 100644 (file)
--- a/t/c3_mro.t
+++ b/t/c3_mro.t
@@ -4,9 +4,7 @@ use warnings;
 use Test::More;
 require Catalyst;
 require Module::Pluggable::Object;
-
-eval "require Class::C3";
-plan skip_all => "This test requires Class::C3" if $@;
+use MRO::Compat;
 
 # Get a list of all Catalyst:: packages in blib via M::P::O
 my @cat_mods;
@@ -34,7 +32,7 @@ plan tests => scalar @cat_mods;
 #
 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: $@");
 }
 

diff --git a/t/lib/Catalyst/Plugin/Test/Errors.pm b/t/lib/Catalyst/Plugin/Test/Errors.pm
index 8876a4d..51e4873 100644 (file)
--- a/t/lib/Catalyst/Plugin/Test/Errors.pm
+++ b/t/lib/Catalyst/Plugin/Test/Errors.pm
@@ -1,7 +1,7 @@
 package Catalyst::Plugin::Test::Errors;
 
 use strict;
-use Class::C3;
+use MRO::Compat;
 
 sub error {
     my $c = shift;

diff --git a/t/lib/Catalyst/Plugin/Test/Headers.pm b/t/lib/Catalyst/Plugin/Test/Headers.pm
index 3d01b55..3d4feb3 100644 (file)
--- a/t/lib/Catalyst/Plugin/Test/Headers.pm
+++ b/t/lib/Catalyst/Plugin/Test/Headers.pm
@@ -1,7 +1,7 @@
 package Catalyst::Plugin::Test::Headers;
 
 use strict;
-use Class::C3;
+use MRO::Compat;
 
 sub prepare {
     my $class = shift;

diff --git a/t/lib/Catalyst/Plugin/Test/Plugin.pm b/t/lib/Catalyst/Plugin/Test/Plugin.pm
index 809a13a..5cb6e4a 100644 (file)
--- a/t/lib/Catalyst/Plugin/Test/Plugin.pm
+++ b/t/lib/Catalyst/Plugin/Test/Plugin.pm
@@ -2,7 +2,7 @@ package Catalyst::Plugin::Test::Plugin;
 
 use strict;
 use warnings;
-use Class::C3;
+use MRO::Compat;
 
 use base qw/Catalyst::Base Class::Data::Inheritable/;
 

diff --git a/t/lib/TestApp/Plugin/AddDispatchTypes.pm b/t/lib/TestApp/Plugin/AddDispatchTypes.pm
index 9f247db..c1d30e5 100644 (file)
--- a/t/lib/TestApp/Plugin/AddDispatchTypes.pm
+++ b/t/lib/TestApp/Plugin/AddDispatchTypes.pm
@@ -1,7 +1,7 @@
 package TestApp::Plugin::AddDispatchTypes;
 use strict;
 use warnings;
-use Class::C3;
+use MRO::Compat;
 
 sub setup_dispatcher {
     my $class = shift;