[Rt-commit] r5755 - in rt/branches/3.7-EXPERIMENTAL: . lib/RT/Shredder lib/t/regression/shredder

[ruz at bestpractical.com]

Author: ruz
Date: Sat Aug 12 01:18:52 2006
New Revision: 5755

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/lib/RT/Shredder/Plugin.pm
   rt/branches/3.7-EXPERIMENTAL/lib/RT/Shredder/Plugin/Users.pm
   rt/branches/3.7-EXPERIMENTAL/lib/t/regression/shredder/03plugin_users.t

Log:
 r3639 at cubic-pc:  cubic | 2006-08-12 05:54:19 +0400
 * update tests


Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Shredder/Plugin.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Shredder/Plugin.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Shredder/Plugin.pm	Sat Aug 12 01:18:52 2006
@@ -101,8 +101,8 @@
 
     local $@;
     my $plugin = "RT::Shredder::Plugin::$name";
-    eval "require $plugin";
-    return( 0, $@ ) if $@;
+    eval "require $plugin" or return( 0, $@ );
+    return( 0, "Plugin '$plugin' has no method new") unless $plugin->can('new');
 
     my $obj = eval { $plugin->new( @_ ) };
     return( 0, $@ ) if $@;

Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Shredder/Plugin/Users.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Shredder/Plugin/Users.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Shredder/Plugin/Users.pm	Sat Aug 12 01:18:52 2006
@@ -2,7 +2,7 @@
 
 use strict;
 use warnings FATAL => 'all';
-use base qw(RT::Shredder::Plugin::Base);
+use base qw(RT::Shredder::Plugin::Base::Search);
 
 =head1 NAME
 

Modified: rt/branches/3.7-EXPERIMENTAL/lib/t/regression/shredder/03plugin_users.t
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/t/regression/shredder/03plugin_users.t	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/t/regression/shredder/03plugin_users.t	Sat Aug 12 01:18:52 2006
@@ -7,18 +7,23 @@
 use Test::Deep;
 BEGIN { require "lib/t/regression/shredder/utils.pl"; }
 
-plan tests => 9;
+plan tests => 10;
 
-my @ARGS = qw(limit status name email replace_relations);
+my @ARGS = sort qw(limit status name email replace_relations no_tickets);
 
 use_ok('RT::Shredder::Plugin::Users');
 {
     my $plugin = new RT::Shredder::Plugin::Users;
     isa_ok($plugin, 'RT::Shredder::Plugin::Users');
-    my @args = $plugin->SupportArgs;
+
+    is(lc $plugin->Type, 'search', 'correct type');
+
+    my @args = sort $plugin->SupportArgs;
     cmp_deeply(\@args, \@ARGS, "support all args");
+
     my ($status, $msg) = $plugin->TestArgs( name => 'r??t*' );
     ok($status, "arg name = 'r??t*'") or diag("error: $msg");
+
     ($status, $msg) = $plugin->TestArgs( name => '!@#' );
     ok(!$status, "bad arg name = '!@#'");
     for (qw(any disabled enabled)) {