Merged latest trunk changes to contextual_uri_for branch

[catagits/Catalyst-Runtime.git] / t / unit_core_plugin.t

diff --git a/t/unit_core_plugin.t b/t/unit_core_plugin.t
index 93d08d8..8781eba 100644 (file)
--- a/t/unit_core_plugin.t
+++ b/t/unit_core_plugin.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 24;
+use Test::More tests => 22;
 
 use lib 't/lib';
 
@@ -16,40 +16,17 @@ use lib 't/lib';
     sub count { $count++ }
 }
 
-my $warnings = 0;
-
-use PluginTestApp;
-my $logger = Class::MOP::Class->create_anon_class(
-    methods => {
-        warn => sub {
-            if ($_[1] =~ /plugin method is deprecated/) {
-               $warnings++;
-                return;
-            }
-            die "Caught unexpected warning: " . $_[1];
-        },
-    },
-)->new_object;
-PluginTestApp->log($logger);
-
 use Catalyst::Test qw/PluginTestApp/;
 
 ok( get("/compile_time_plugins"), "get ok" );
-is( $warnings, 0, 'no warnings' );
-# FIXME - Run time plugin support is insane, and should be removed
-#         for Catalyst 5.9
 ok( get("/run_time_plugins"),     "get ok" );
 
-is( $warnings, 1, '1 warning' );
-
 use_ok 'TestApp';
 my @expected = qw(
   Catalyst::Plugin::Test::Errors
   Catalyst::Plugin::Test::Headers
   Catalyst::Plugin::Test::Inline
-  Catalyst::Plugin::Test::MangleDollarUnderScore
   Catalyst::Plugin::Test::Plugin
-  TestApp::Plugin::AddDispatchTypes
   TestApp::Plugin::FullyQualified
 );