[Bast-commits] r8684 - in
DBIx-Class/0.08/branches/dbicadmin_refactor:
lib/DBIx/Class/Optional t/admin
ribasushi at dev.catalyst.perl.org
ribasushi at dev.catalyst.perl.org
Sat Feb 13 10:05:18 GMT 2010
Author: ribasushi
Date: 2010-02-13 10:05:17 +0000 (Sat, 13 Feb 2010)
New Revision: 8684
Modified:
DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Optional/Dependencies.pm
DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/01load.t
DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/02ddl.t
DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/03data.t
DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/10script.t
Log:
Switch tests to Optional::Deps
Modified: DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Optional/Dependencies.pm
===================================================================
--- DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Optional/Dependencies.pm 2010-02-13 09:37:30 UTC (rev 8683)
+++ DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Optional/Dependencies.pm 2010-02-13 10:05:17 UTC (rev 8684)
@@ -16,6 +16,14 @@
'MooseX::Types' => '0.21',
};
+my $admin_basic = {
+ %$moose_basic,
+ 'MooseX::Types::Path::Class' => '0.05',
+ 'MooseX::Types::JSON' => '0.02',
+ 'namespace::autoclean' => '0.09',
+ 'parent' => '0.223',
+};
+
my $reqs = {
dist => {
#'Module::Install::Pod::Inherit' => '0.01',
@@ -35,11 +43,18 @@
admin => {
req => {
+ %$admin_basic,
+ },
+ pod => {
+ title => 'DBIx::Class::Admin',
+ desc => 'Modules required for the DBIx::Class administrative library',
+ },
+ },
+
+ dbicadmin => {
+ req => {
%$moose_basic,
- 'MooseX::Types::Path::Class'=> '0.05',
- 'MooseX::Types::JSON' => '0.02',
- 'namespace::autoclean' => '0.09',
- 'parent' => '0.223',
+ %$admin_basic,
'Getopt::Long::Descriptive' => '0.081',
'JSON::Any' => '1.22',
'Text::CSV' => '1.16',
Modified: DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/01load.t
===================================================================
--- DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/01load.t 2010-02-13 09:37:30 UTC (rev 8683)
+++ DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/01load.t 2010-02-13 10:05:17 UTC (rev 8684)
@@ -3,10 +3,10 @@
use Test::More;
-
BEGIN {
- eval "use DBIx::Class::Admin";
- plan skip_all => "Deps not installed: $@" if $@;
+ require DBIx::Class;
+ plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for('admin')
+ unless DBIx::Class::Optional::Dependencies->req_ok_for('admin');
}
use_ok 'DBIx::Class::Admin';
Modified: DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/02ddl.t
===================================================================
--- DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/02ddl.t 2010-02-13 09:37:30 UTC (rev 8683)
+++ DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/02ddl.t 2010-02-13 10:05:17 UTC (rev 8684)
@@ -5,13 +5,15 @@
use Test::Exception;
use Test::Warn;
-
BEGIN {
- eval "use DBIx::Class::Admin";
- plan skip_all => "Deps not installed: $@" if $@;
+ require DBIx::Class;
+ plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for('admin')
+ unless DBIx::Class::Optional::Dependencies->req_ok_for('admin');
+
+ plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for('deploy')
+ unless DBIx::Class::Optional::Dependencies->req_ok_for('deploy');
}
-
use lib qw(t/lib);
use DBICTest;
@@ -51,7 +53,7 @@
#);
clean_dir($sql_dir);
-require DBICVersionOrig;
+require DBICVersion_v1;
my $admin = DBIx::Class::Admin->new(
schema_class => 'DBICVersion::Schema',
@@ -70,7 +72,7 @@
is($schema->get_db_version, $DBICVersion::Schema::VERSION, 'Schema deployed and versions match');
-require DBICVersionNew;
+require DBICVersion_v2;
$admin = DBIx::Class::Admin->new(
schema_class => 'DBICVersion::Schema',
@@ -79,9 +81,6 @@
);
lives_ok { $admin->create($schema->storage->sqlt_type(), {}, "1.0" ); } 'Can create diff for ' . $schema->storage->sqlt_type;
-# sleep required for upgrade table to hold a distinct time of upgrade value
-# otherwise the returned of get_db_version can be undeterministic
-sleep 1;
{
local $SIG{__WARN__} = sub { warn $_[0] unless $_[0] =~ /DB version .+? is lower than the schema version/ };
lives_ok {$admin->upgrade();} 'upgrade the schema';
@@ -106,7 +105,7 @@
lives_ok { $admin->install(); } 'install schema version 3.0';
is($admin->schema->get_db_version, "3.0", 'db thinks its version 3.0');
dies_ok { $admin->install("4.0"); } 'cannot install to allready existing version';
-sleep 1;
+
$admin->force(1);
warnings_exist ( sub {
lives_ok { $admin->install("4.0") } 'can force install to allready existing version'
Modified: DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/03data.t
===================================================================
--- DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/03data.t 2010-02-13 09:37:30 UTC (rev 8683)
+++ DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/03data.t 2010-02-13 10:05:17 UTC (rev 8684)
@@ -7,8 +7,9 @@
use Test::Deep;
BEGIN {
- eval "use DBIx::Class::Admin";
- plan skip_all => "Deps not installed: $@" if $@;
+ require DBIx::Class;
+ plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for('admin')
+ unless DBIx::Class::Optional::Dependencies->req_ok_for('admin');
}
use lib 't/lib';
Modified: DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/10script.t
===================================================================
--- DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/10script.t 2010-02-13 09:37:30 UTC (rev 8683)
+++ DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/10script.t 2010-02-13 10:05:17 UTC (rev 8684)
@@ -10,21 +10,11 @@
BEGIN {
- eval "require DBIx::Class::Admin";
- plan skip_all => "Deps not installed: $@" if $@;
-
- eval "require Getopt::Long::Descriptive";
- plan skip_all => 'Install Getopt::Long::Descriptive to run this test' if ($@);
-
- eval 'require JSON::Any';
- plan skip_all => 'Install JSON::Any to run this test' if ($@);
-
- eval 'require Text::CSV_XS';
- if ($@) {
- eval 'require Text::CSV_PP';
- plan skip_all => 'Install Text::CSV_XS or Text::CSV_PP to run this test' if ($@);
- }
+ require DBIx::Class;
+ plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for('dbicadmin')
+ unless DBIx::Class::Optional::Dependencies->req_ok_for('dbicadmin');
}
+
my @json_backends = qw/XS JSON DWIW/;
my $tests_per_run = 5;
@@ -43,8 +33,6 @@
}
sub test_dbicadmin {
-# $ENV{PERL5LIB} = join ':', @INC;
-
my $schema = DBICTest->init_schema( sqlite_use_file => 1 ); # reinit a fresh db for every run
my $employees = $schema->resultset('Employee');
More information about the Bast-commits
mailing list