Author: stvn
Date: Tue May 11 17:51:15 2004
New Revision: 341
Modified:
dbi/trunk/t/01basics.t
dbi/trunk/t/02dbidrv.t
dbi/trunk/t/03handle.t
dbi/trunk/t/04mods.t
dbi/trunk/t/05thrclone.t
dbi/trunk/t/06attrs.t
dbi/trunk/t/07kids.t
dbi/trunk/t/08keeperr.t
dbi/trunk/t/10examp.t
dbi/trunk/t/15array.t
dbi/trunk/t/20meta.t
dbi/trunk/t/30subclass.t
dbi/trunk/t/40profile.t
dbi/trunk/t/41prof_dump.t
dbi/trunk/t/42prof_data.t
dbi/trunk/t/50dbm.t
dbi/trunk/t/60preparse.t
dbi/trunk/t/pod.t
Log:
Adding in recent test changes
Modified: dbi/trunk/t/01basics.t
==============================================================================
--- dbi/trunk/t/01basics.t (original)
+++ dbi/trunk/t/01basics.t Tue May 11 17:51:15 2004
@@ -1,7 +1,6 @@
-#!perl
+#!perl -w
use strict;
-use warnings;
use Test::More tests => 109;
Modified: dbi/trunk/t/02dbidrv.t
==============================================================================
--- dbi/trunk/t/02dbidrv.t (original)
+++ dbi/trunk/t/02dbidrv.t Tue May 11 17:51:15 2004
@@ -1,7 +1,6 @@
-#!perl
+#!perl -w
use strict;
-use warnings;
use Test::More tests => 48;
@@ -201,7 +200,7 @@
eval {
$DBI::rows = 1
};
- like($@, qr/Can't modify/, '... trying to assign to $DBI::rows should throw an
excpetion');
+ like($@, qr/Can't modify/, '... trying to assign to $DBI::rows should throw an
excpetion'); #'
}
is($drh->{FetchHashKeyName}, 'NAME', '... FetchHashKeyName is NAME');
Modified: dbi/trunk/t/03handle.t
==============================================================================
--- dbi/trunk/t/03handle.t (original)
+++ dbi/trunk/t/03handle.t Tue May 11 17:51:15 2004
@@ -1,8 +1,10 @@
#!perl -w
use strict;
+
use Test::More tests => 68;
-use Data::Dumper;
+
+#use Data::Dumper;
# handle tests
Modified: dbi/trunk/t/04mods.t
==============================================================================
--- dbi/trunk/t/04mods.t (original)
+++ dbi/trunk/t/04mods.t Tue May 11 17:51:15 2004
@@ -1,11 +1,14 @@
#!perl -w
use strict;
-use Test::More tests=>6;
-BEGIN { use_ok( 'DBI' ); }
-BEGIN { use_ok( 'DBI::Const::GetInfoType', qw(%GetInfoType) ); }
-BEGIN { use_ok( 'DBI::Const::GetInfoReturn', qw(%GetInfoReturnTypes
%GetInfoReturnValues) ); }
+use Test::More tests => 6;
+
+BEGIN {
+ use_ok( 'DBI' );
+ use_ok( 'DBI::Const::GetInfoType', qw(%GetInfoType) );
+ use_ok( 'DBI::Const::GetInfoReturn', qw(%GetInfoReturnTypes
%GetInfoReturnValues) );
+}
ok(keys %GetInfoType);
Modified: dbi/trunk/t/05thrclone.t
==============================================================================
--- dbi/trunk/t/05thrclone.t (original)
+++ dbi/trunk/t/05thrclone.t Tue May 11 17:51:15 2004
@@ -5,25 +5,28 @@
use strict;
use Config qw(%Config);
+use Test::More;
+
BEGIN {
- if (!$Config{useithreads} || $] < 5.008) {
- print "1..0 # Skipped: this $^O perl $] not configured to support iThreads\n";
- exit 0;
- }
+ if (!$Config{useithreads} || $] < 5.008) {
+ plan skip_all => "this $^O perl $] not configured to support iThreads";
+ }
+ else {
+ plan tests => 11;
+ }
}
-use threads;
-use Test::More tests => 10;
+BEGIN {
+ use_ok('DBI');
+}
-# ---
+use threads;
{
package threads_sub;
use base qw(threads);
}
-use DBI;
-
$DBI::neat_maxlen = 12345;
my @connect_args = ("dbi:ExampleP:", '', '');
Modified: dbi/trunk/t/06attrs.t
==============================================================================
--- dbi/trunk/t/06attrs.t (original)
+++ dbi/trunk/t/06attrs.t Tue May 11 17:51:15 2004
@@ -1,17 +1,22 @@
#!perl -w
use strict;
+
use Test::More tests => 144;
-BEGIN { use_ok( 'DBI' ) }
+BEGIN {
+ use_ok( 'DBI' )
+}
$|=1;
# Connect to the example driver.
my $dbh = DBI->connect('dbi:ExampleP:dummy', '', '',
- { PrintError => 0,
+ {
+ PrintError => 0,
RaiseError => 1,
});
+
isa_ok( $dbh, 'DBI::db' );
# Clean up when we're done.
Modified: dbi/trunk/t/07kids.t
==============================================================================
--- dbi/trunk/t/07kids.t (original)
+++ dbi/trunk/t/07kids.t Tue May 11 17:51:15 2004
@@ -1,7 +1,6 @@
-#!perl
+#!perl -w
use strict;
-use warnings;
use Test::More;
Modified: dbi/trunk/t/08keeperr.t
==============================================================================
--- dbi/trunk/t/08keeperr.t (original)
+++ dbi/trunk/t/08keeperr.t Tue May 11 17:51:15 2004
@@ -1,6 +1,7 @@
-#!../perl -w
+#!perl -w
use strict;
+
use Test::More tests => 63;
$|=1;
Modified: dbi/trunk/t/10examp.t
==============================================================================
--- dbi/trunk/t/10examp.t (original)
+++ dbi/trunk/t/10examp.t Tue May 11 17:51:15 2004
@@ -1,4 +1,4 @@
-#!perl -wT
+#!perl -w
use lib qw(blib/arch blib/lib); # needed since -T ignores PERL5LIB
use DBI qw(:sql_types);
Modified: dbi/trunk/t/15array.t
==============================================================================
--- dbi/trunk/t/15array.t (original)
+++ dbi/trunk/t/15array.t Tue May 11 17:51:15 2004
@@ -1,7 +1,6 @@
-#!perl
+#!perl -w
use strict;
-use warnings;
use Test::More tests => 42;
Modified: dbi/trunk/t/20meta.t
==============================================================================
--- dbi/trunk/t/20meta.t (original)
+++ dbi/trunk/t/20meta.t Tue May 11 17:51:15 2004
@@ -1,4 +1,4 @@
-#!../perl -w
+#!perl -w
use Test::More tests => 8;
Modified: dbi/trunk/t/30subclass.t
==============================================================================
--- dbi/trunk/t/30subclass.t (original)
+++ dbi/trunk/t/30subclass.t Tue May 11 17:51:15 2004
@@ -5,7 +5,6 @@
$|=1;
$^W=1;
-use vars qw($tests);
my $calls = 0;
Modified: dbi/trunk/t/40profile.t
==============================================================================
--- dbi/trunk/t/40profile.t (original)
+++ dbi/trunk/t/40profile.t Tue May 11 17:51:15 2004
@@ -1,4 +1,5 @@
#!perl -w
+
use strict;
#
@@ -152,7 +153,7 @@
my $do_sql = "set foo=1";
$dbh->do($do_sql); # check dbh do() gets associated with right statement
-ok(keys %{$data->{$do_sql}}, 2); # XXX extra one is DESTROY
+ok(keys %{$data->{$do_sql}}, 1); # XXX extra one is DESTROY
ok(exists $data->{$do_sql}{do});
print "Profile Data keys: @{[ keys %{$data->{$do_sql}} ]}\n";
Modified: dbi/trunk/t/41prof_dump.t
==============================================================================
--- dbi/trunk/t/41prof_dump.t (original)
+++ dbi/trunk/t/41prof_dump.t Tue May 11 17:51:15 2004
@@ -1,4 +1,5 @@
-#!perl -Tw
+#!perl -w
+
use strict;
#
@@ -7,17 +8,18 @@
use DBI;
+use Test::More;
+
BEGIN {
- if ($DBI::PurePerl) {
- print "1..0 # Skipped: profiling not supported for DBI::PurePerl\n";
- exit 0;
- }
+ if ($DBI::PurePerl) {
+ plan skip_all => 'profiling not supported for DBI::PurePerl';
+ }
+ else {
+ plan tests => 11;
+ }
}
BEGIN {
- use Test::More;
-
- plan tests => 11;
use_ok( 'DBI' );
use_ok( 'DBI::ProfileDumper' );
}
Modified: dbi/trunk/t/42prof_data.t
==============================================================================
--- dbi/trunk/t/42prof_data.t (original)
+++ dbi/trunk/t/42prof_data.t Tue May 11 17:51:15 2004
@@ -1,18 +1,21 @@
#!perl -w
+
use strict;
use DBI;
+use Test::More;
+
BEGIN {
- if ($DBI::PurePerl) {
- print "1..0 # Skipped: profiling not supported for DBI::PurePerl\n";
- exit 0;
- }
+ if ($DBI::PurePerl) {
+ plan skip_all => 'profiling not supported for DBI::PurePerl';
+ }
+ else {
+ plan tests => 32;
+ }
}
BEGIN {
- use Test::More;
- plan tests=>32;
use_ok( 'DBI::ProfileDumper' );
use_ok( 'DBI::ProfileData' );
}
Modified: dbi/trunk/t/50dbm.t
==============================================================================
--- dbi/trunk/t/50dbm.t (original)
+++ dbi/trunk/t/50dbm.t Tue May 11 17:51:15 2004
@@ -1,4 +1,5 @@
-#!perl
+#!perl -w
+
use strict;
use File::Path;
use Test::More;
@@ -42,14 +43,13 @@
print "Using MLDBM serializers: @mldbm_types\n" if @mldbm_types;
my $num_tests = ([EMAIL PROTECTED]) * @dbm_types * 11;
+
if (!$num_tests) {
- plan tests => 1;
- SKIP: {
- skip("No DBM modules available",1);
- }
- exit;
+ plan skip_all => "No DBM modules available";
}
- plan tests => $num_tests;
+ else {
+ plan tests => $num_tests;
+ }
}
my $dir = './test_output';
Modified: dbi/trunk/t/60preparse.t
==============================================================================
--- dbi/trunk/t/60preparse.t (original)
+++ dbi/trunk/t/60preparse.t Tue May 11 17:51:15 2004
@@ -1,18 +1,20 @@
-#!perl -Tw
+#!perl -w
use DBI qw(:preparse_flags);
$|=1;
+use Test::More;
+
BEGIN {
- if ($DBI::PurePerl) {
- print "1..0 # Skipped: preparse not supported for DBI::PurePerl\n";
- exit 0;
- }
+ if ($DBI::PurePerl) {
+ plan skip_all => 'preparse not supported for DBI::PurePerl';
+ }
+ else {
+ plan tests => 39;
+ }
}
-use Test::More tests=>39;
-
my $dbh = DBI->connect("dbi:ExampleP:", "", "", {
PrintError => 0,
});
Modified: dbi/trunk/t/pod.t
==============================================================================
--- dbi/trunk/t/pod.t (original)
+++ dbi/trunk/t/pod.t Tue May 11 17:51:15 2004
@@ -1,5 +1,8 @@
+#!perl -w
+
use Test::More;
eval "use Test::Pod 1.00";
plan skip_all => "Test::Pod 1.00 required for testing POD" if $@;
all_pod_files_ok();
+
1;
