Author: jkeenan
Date: Sat Jul 19 16:45:41 2008
New Revision: 29618
Removed:
branches/parallel/t/steps/inter_shlibs-02.t
Modified:
branches/parallel/MANIFEST
branches/parallel/t/steps/inter_shlibs-01.t
Log:
Consolidate multiple test files per configuration step into a single file.
Modified: branches/parallel/MANIFEST
==============================================================================
--- branches/parallel/MANIFEST (original)
+++ branches/parallel/MANIFEST Sat Jul 19 16:45:41 2008
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Wed Jul 16 12:22:12 2008 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Sat Jul 19 23:45:14 2008 UT
#
# See tools/dev/install_files.pl for documentation on the
# format of this file.
@@ -3685,7 +3685,6 @@
t/steps/inter_make-01.t []
t/steps/inter_progs-01.t []
t/steps/inter_shlibs-01.t []
-t/steps/inter_shlibs-02.t []
t/steps/inter_types-01.t []
t/steps/inter_types-02.t []
t/steps/inter_yacc-01.t []
Modified: branches/parallel/t/steps/inter_shlibs-01.t
==============================================================================
--- branches/parallel/t/steps/inter_shlibs-01.t (original)
+++ branches/parallel/t/steps/inter_shlibs-01.t Sat Jul 19 16:45:41 2008
@@ -5,14 +5,19 @@
use strict;
use warnings;
-use Test::More tests => 14;
+use Test::More tests => 21;
use Carp;
use lib qw( lib t/configure/testlib );
use_ok('config::init::defaults');
use_ok('config::inter::shlibs');
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw( test_step_thru_runstep);
+use Parrot::Configure::Test qw(
+ test_step_thru_runstep
+ rerun_defaults_for_testing
+ test_step_constructor_and_description
+);
+use IO::CaptureOutput qw| capture |;
use Tie::Filehandle::Preempt::Stdin;
my $args = process_options(
@@ -27,18 +32,12 @@
test_step_thru_runstep( $conf, q{init::defaults}, $args );
my $pkg = q{inter::shlibs};
-
$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my ( $task, $step_name, $step);
-$task = $conf->steps->[-1];
-$step_name = $task->step;
-
-$step = $step_name->new();
-ok( defined $step, "$step_name constructor returned defined value" );
-isa_ok( $step, $step_name );
-ok( $step->description(), "$step_name has description" );
+my $serialized = $conf->pcfreeze();
+
+$conf->options->set( %{$args} );
+my $step = test_step_constructor_and_description($conf);
my ( @prompts, $prompt, $object );
$prompt = q{foobar};
@@ -52,12 +51,42 @@
open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
my $ret = $step->runstep($conf);
close STDOUT or croak "Unable to close after myout";
- ok( $ret, "$step_name runstep() returned true value" );
+ ok( $ret, "runstep() returned true value" );
is( $step->result(), $prompt, "Expected result was set" );
}
undef $object;
untie *STDIN;
[EMAIL PROTECTED] = ();
+
+$conf->replenish($serialized);
+
+$args = process_options(
+ {
+ argv => [q{--ask}],
+ mode => q{configure},
+ }
+);
+$conf->options->set( %{$args} );
+$step = test_step_constructor_and_description($conf);
+$prompt = q{ };
+push @prompts, $prompt;
+
+$object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;
+can_ok( 'Tie::Filehandle::Preempt::Stdin', ('READLINE') );
+isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
+
+{
+ open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
+ my $ret = $step->runstep($conf);
+ close STDOUT or croak "Unable to close after myout";
+ ok( $ret, "runstep() returned true value" );
+ is( $step->result(), q{done}, "Expected result was set" );
+}
+
+undef $object;
+untie *STDIN;
[EMAIL PROTECTED] = ();
pass("Completed all tests in $0");
