[Module-build-checkins] Module-Build/t signature.t,1.8,1.9

[Randy W. S. <si...@us...>]

Update of /cvsroot/module-build/Module-Build/t
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23270/t

Modified Files:
	signature.t 
Log Message:
use Test::More

Index: signature.t
===================================================================
RCS file: /cvsroot/module-build/Module-Build/t/signature.t,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- signature.t	7 Jan 2005 10:15:54 -0000	1.8
+++ signature.t	28 Jun 2005 04:27:16 -0000	1.9
@@ -1,30 +1,48 @@
-#!perl -w
+#!/usr/bin/perl -w
+
+use lib 't/lib';
 use strict;
-use Test;
-use File::Spec;
 
-my $common_pl = File::Spec->catfile('t', 'common.pl');
+use File::Spec ();
+my $common_pl = File::Spec->catfile( 't', 'common.pl' );
 require $common_pl;
 
-use Module::Build;
-skip_test("Skipping unless \$ENV{TEST_SIGNATURE} is true") unless $ENV{TEST_SIGNATURE};
-need_module('Module::Signature');
-plan tests => 7;
+#########################
 
+use Test::More;
 
-my $base_dir = File::Spec->catdir( Module::Build->cwd, 't', 'Sample' );
+if ( $ENV{TEST_SIGNATURE} ) {
+  if ( have_module( 'Module::Signature' ) ) {
+    plan tests => 7;
+  } else {
+    plan skip_all => '$ENV{TEST_SIGNATURE} is set, but Module::Signature not found';
+  }
+} else {
+  plan skip_all => '$ENV{TEST_SIGNATURE} is not set';
+}
+
+#########################
+
+
+use Cwd ();
+my $cwd = Cwd::cwd;
+
+
+use Module::Build;
+
+my $base_dir = File::Spec->catdir( $cwd, 't', 'Sample' );
 chdir $base_dir or die "can't chdir to $base_dir: $!";
 
 
-my $build = new Module::Build( module_name => 'Sample',
-			       requires => { 'File::Spec' => 0 },
-			       license => 'perl',
-			       sign => 1,
-			     );
+my $build = Module::Build->new( module_name => 'Sample',
+			        requires => { 'File::Spec' => 0 },
+			        license => 'perl',
+			        sign => 1,
+			      );
 
 {
   eval {$build->dispatch('distdir')};
-  ok $@, '';
+  ok ! $@;
   chdir $build->dist_dir or die "Can't chdir to ", $build->dist_dir, ": $!";
   ok -e 'SIGNATURE';
   
@@ -43,10 +61,10 @@
     local *Module::Build::Base::ACTION_distmeta = sub { push @run_order, 'distmeta' };
     eval { $build->dispatch('distdir') };
   }
-  ok $@, '';
-  ok $run_order[0], 'distmeta';
-  ok $run_order[1], 'sign';
+  ok ! $@;
+  is $run_order[0], 'distmeta';
+  is $run_order[1], 'sign';
 }
 
 eval { $build->dispatch('realclean') };
-ok $@, '';
+ok ! $@;