Changeset 22025

Timestamp:

10/24/08 13:26:03 (5 years ago)

Author:

yappo

Message:

refactoring

Location:

lang/perl/Module-Setup/trunk

Files:

• lib/Module/Setup/Test/Utils.pm (modified) (4 diffs)
• t/030_plugin/illegalplugin.t (modified) (1 diff)

lang/perl/Module-Setup/trunk/lib/Module/Setup/Test/Utils.pm

@@ -35 +35 @@
 my $setup_dir;
 sub setup_dir (@) {
-    $setup_dir ||= File::Temp->newdir;
+    $setup_dir = File::Temp->newdir unless $setup_dir;
     _path_dir($setup_dir, @_);
 }
@@ -64 +64 @@
 my $target_dir;
 sub target_dir (@) {
-    $target_dir ||= File::Temp->newdir;
+    $target_dir = File::Temp->newdir unless $target_dir;
     _path_dir($target_dir, @_);
 }
@@ -80 +80 @@
     @argv = @{ $argv[0] } if ref $argv[0] eq 'ARRAY';
 
-    $options->{module_setup_dir} ||= setup_dir;
+    $options->{module_setup_dir} = setup_dir unless $options->{module_setup_dir};
     if ($options->{target}) {
         $options->{target} = target_dir;
@@ -94 +94 @@
 sub dialog (;&) {
     my $code = shift;
-    if (ref $code eq 'CODE') {
-        no warnings 'redefine';
-        *Module::Setup::dialog = $code;
-    }
+    no warnings 'redefine';
+    *Module::Setup::dialog = $code;
 }
 

lang/perl/Module-Setup/trunk/t/030_plugin/illegalplugin.t

@@ -2 +2 @@
 use Test::More tests => 1;
 
-my $module_setup_dir = File::Temp->newdir;
-my $target           = File::Temp->newdir;
 eval {
-    module_setup { flavor_class => '+t::Flavor::IllegalPlugin', target => 1 }, 'IllegalPlugin';
+    module_setup { flavor_class => '+t::Flavor::IllegalPlugin', target => 1, module_setup_dir => setup_dir }, 'IllegalPlugin';
 };
 like $@, qr/Can't locate IllegalPlugin.pm/;