Index: /branches/release-36/t/21-callbacks.t
===================================================================
--- /branches/release-36/t/21-callbacks.t (revision 1459)
+++ /branches/release-36/t/21-callbacks.t (revision 2069)
@@ -4,7 +4,11 @@
 use warnings;
 
-use Test::More tests => 8;
+use Test::More tests => 5;
 use CGI;
 use DB_File;
+
+use lib 'extlib';
+use lib 't/lib';
+use lib 'lib';
 
 use MT;
@@ -91,47 +95,2 @@
 =cut
 
-### Test app callbacks
-
-my @result_cats = ();
-
-my $cms = MT::App::CMS->new(Config => $T_CFG);
-
-my $app_post_save_called;
-MT->add_callback('AppPostEntrySave', 1, $plugin, 
-                 sub { 
-                       $app_post_save_called = 1;
-                       my @plcmts = MT::Placement->load({entry_id => $_[2]->id});
-                       for my $plcmt (@plcmts) {
-                           push @result_cats, $plcmt->category_id;
-                       }
-                   } );
-
-MT::unplug();
-my $q = CGI->new();
-#$q->param(id => $entry2->id);
-$q->param(blog_id => $entry2->blog_id);
-$q->param(category_ids => 17);
-# $q->param(username => 'Chuck D');
-# $q->param(password => 'bass');
-$q->param(text => "Buddha blessed and boo-ya blasted; 
-these are the words that she manifested.");
-$cms->{query} = $q;
-$cms->{perms} = MT::Permission->new();
-$cms->{perms}->can_post(1);
-$cms->{author} = MT::Author->new();
-$cms->{author}->name("Mel E. Mel");
-$cms->{author}->id(1);
-
-# fake out the magic; we're not testing that right now
-no warnings qw(once redefine);
-*MT::App::CMS::validate_magic = sub { 1; };
-use warnings qw(once redefine);
-
-my $handler = $cms->handler_to_coderef( $cms->handlers_for_mode('save_entry') );
-my $ret = $handler->($cms);
-ok(!defined $ret && $cms->{redirect}, 'entry save was successful');
-diag('Error: ' . $cms->errstr) if !defined $ret && !$cms->{redirect};
-
-ok($app_post_save_called, 'AppPostEntrySave callback was called');
-is($result_cats[0], 17, 'result_cats = 17');
-
Index: /branches/release-36/t/21-app-callbacks.t
===================================================================
--- /branches/release-36/t/21-app-callbacks.t (revision 2069)
+++ /branches/release-36/t/21-app-callbacks.t (revision 2069)
@@ -0,0 +1,73 @@
+#!/usr/bin/perl
+# $Id$
+use strict;
+use warnings;
+
+use Test::More tests => 3;
+use CGI;
+use DB_File;
+
+use lib 'extlib';
+use lib 't/lib';
+use lib 'lib';
+
+use MT;
+use MT::Plugin;
+use MT::Entry;
+use MT::App::CMS;
+use MT::Permission;
+
+use vars qw($T_CFG);
+
+use lib 't';
+require 'test-common.pl';
+
+### Test app callbacks
+
+my @result_cats = ();
+
+my $cms = MT::App::CMS->new(Config => $T_CFG);
+
+my $plugin = MT::Plugin->new({name => "21-callbacks.t"});
+
+my $entry2 = MT::Entry->load({}, { limit => 1 });
+
+my $app_post_save_called;
+MT->add_callback('AppPostEntrySave', 1, $plugin, 
+                 sub { 
+                       $app_post_save_called = 1;
+                       my @plcmts = MT::Placement->load({entry_id => $_[2]->id});
+                       for my $plcmt (@plcmts) {
+                           push @result_cats, $plcmt->category_id;
+                       }
+                   } );
+
+MT::unplug();
+my $q = CGI->new();
+#$q->param(id => $entry2->id);
+$q->param(blog_id => $entry2->blog_id);
+$q->param(category_ids => 17);
+# $q->param(username => 'Chuck D');
+# $q->param(password => 'bass');
+$q->param(text => "Buddha blessed and boo-ya blasted; 
+these are the words that she manifested.");
+$cms->{query} = $q;
+$cms->{perms} = MT::Permission->new();
+$cms->{perms}->can_post(1);
+$cms->{author} = MT::Author->new();
+$cms->{author}->name("Mel E. Mel");
+$cms->{author}->id(1);
+
+# fake out the magic; we're not testing that right now
+no warnings qw(once redefine);
+*MT::App::CMS::validate_magic = sub { 1; };
+use warnings qw(once redefine);
+
+my $handler = $cms->handler_to_coderef( $cms->handlers_for_mode('save_entry') );
+my $ret = $handler->($cms);
+ok(!defined $ret && $cms->{redirect}, 'entry save was successful');
+diag('Error: ' . $cms->errstr) if !defined $ret && !$cms->{redirect};
+
+ok($app_post_save_called, 'AppPostEntrySave callback was called');
+is($result_cats[0], 17, 'result_cats = 17');
+