X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fc3_mro.t;h=d987544e93644a9581dfa0c3b7dbb764b3bf8117;hb=79f5d5718d885ee1c3f288159a31562f9cf5b02f;hp=e54645c14e29daf75de2399c43643a7e1da2bb14;hpb=5fb67d522575fa73fb6e291dd6d2fce8a69bf9e3;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/c3_mro.t b/t/c3_mro.t
index e54645c..d987544 100644
--- a/t/c3_mro.t
+++ b/t/c3_mro.t
@@ -4,16 +4,18 @@ 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;
 {
+  # problem with @INC on win32, see:
+  # http://rt.cpan.org/Ticket/Display.html?id=26452
+  if ($^O eq 'MSWin32') { require Win32; Win32::GetCwd(); }
+
   local @INC = grep {/blib/} @INC;
   @cat_mods = (
-    'Catalyst',
+    'Catalyst', 
     Module::Pluggable::Object->new(search_path => ['Catalyst'])->plugins,
   );
 }
@@ -30,7 +32,7 @@ plan tests => scalar @cat_mods;
 #
 foreach my $cat_mod (@cat_mods) {
   eval " require $cat_mod ";
-  eval { Class::C3::calculateMRO($cat_mod) };
-  ok(!$@, "calculateMRO for $cat_mod");
+  eval { mro::get_linear_isa($cat_mod, 'c3') };
+  ok(!$@, "calculateMRO for $cat_mod: $@");
 }