From: Arthur Axel 'fREW' Schmidt Date: Tue, 23 Feb 2010 16:09:34 +0000 (-0600) Subject: whitespace, and deletion/creation of files that matter X-Git-Tag: v0.001000_01~140 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b9c4146b78c5485de4c363de99e24dd1994f7627;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git whitespace, and deletion/creation of files that matter --- diff --git a/t/02-instantiation.t b/t/02-instantiation.t index 6053739..57e141a 100644 --- a/t/02-instantiation.t +++ b/t/02-instantiation.t @@ -9,108 +9,111 @@ use DBIx::Class::DeploymentHandler; my $db = 'dbi:SQLite:db.db'; my $sql_dir = 't/sql'; +unlink 'db.db' if -e 'db.db'; +mkdir 't/sql' unless -d 't/sql'; + VERSION1: { - use_ok 'DBICVersion_v1'; - my $s = DBICVersion::Schema->connect($db); - ok($s, 'DBICVersion::Schema 1.0 instantiates correctly'); - my $handler = DBIx::Class::DeploymentHandler->new({ - upgrade_directory => $sql_dir, - schema => $s, - databases => ['SQLite'], - }); + use_ok 'DBICVersion_v1'; + my $s = DBICVersion::Schema->connect($db); + ok($s, 'DBICVersion::Schema 1.0 instantiates correctly'); + my $handler = DBIx::Class::DeploymentHandler->new({ + upgrade_directory => $sql_dir, + schema => $s, + databases => ['SQLite'], + }); - ok($handler, 'DBIx::Class::DeploymentHandler w/1.0 instantiates correctly'); + ok($handler, 'DBIx::Class::DeploymentHandler w/1.0 instantiates correctly'); - my $version = $s->schema_version(); - $handler->create_ddl_dir( $version, 0); - ok(-e 't/sql/DBICVersion-Schema-1.0-SQLite.sql', 'DDL for 1.0 got created successfully'); + my $version = $s->schema_version(); + $handler->create_ddl_dir( $version, 0); + ok(-e 't/sql/DBICVersion-Schema-1.0-SQLite.sql', 'DDL for 1.0 got created successfully'); - dies_ok { - $s->resultset('Foo')->create({ - bar => 'frew', - }) - } 'schema not deployed'; - $handler->install; - lives_ok { - $s->resultset('Foo')->create({ - bar => 'frew', - }) - } 'schema is deployed'; + dies_ok { + $s->resultset('Foo')->create({ + bar => 'frew', + }) + } 'schema not deployed'; + $handler->install; + lives_ok { + $s->resultset('Foo')->create({ + bar => 'frew', + }) + } 'schema is deployed'; } VERSION2: { - use_ok 'DBICVersion_v2'; - my $s = DBICVersion::Schema->connect($db); - ok($s, 'DBICVersion::Schema 2.0 instantiates correctly'); - my $handler = DBIx::Class::DeploymentHandler->new({ - upgrade_directory => $sql_dir, - schema => $s, - databases => ['SQLite'], - }); + use_ok 'DBICVersion_v2'; + my $s = DBICVersion::Schema->connect($db); + ok($s, 'DBICVersion::Schema 2.0 instantiates correctly'); + my $handler = DBIx::Class::DeploymentHandler->new({ + upgrade_directory => $sql_dir, + schema => $s, + databases => ['SQLite'], + }); - ok($handler, 'DBIx::Class::DeploymentHandler w/2.0 instantiates correctly'); + ok($handler, 'DBIx::Class::DeploymentHandler w/2.0 instantiates correctly'); - $version = $s->schema_version(); - $handler->create_ddl_dir($version, 0); - $handler->create_ddl_dir($version, '1.0'); - ok(-e 't/sql/DBICVersion-Schema-2.0-SQLite.sql', 'DDL for 2.0 got created successfully'); - ok(-e 't/sql/DBICVersion-Schema-1.0-2.0-SQLite.sql', 'DDL for migration from 1.0 to 2.0 got created successfully'); - dies_ok { - $s->resultset('Foo')->create({ - bar => 'frew', - baz => 'frew', - }) - } 'schema not deployed'; - #$handler->install('1.0'); - dies_ok { - $s->resultset('Foo')->create({ - bar => 'frew', - baz => 'frew', - }) - } 'schema not uppgrayyed'; - $handler->upgrade_single_step('1.0', '2.0'); - lives_ok { - $s->resultset('Foo')->create({ - bar => 'frew', - baz => 'frew', - }) - } 'schema is deployed'; + $version = $s->schema_version(); + $handler->create_ddl_dir($version, 0); + $handler->create_ddl_dir($version, '1.0'); + ok(-e 't/sql/DBICVersion-Schema-2.0-SQLite.sql', 'DDL for 2.0 got created successfully'); + ok(-e 't/sql/DBICVersion-Schema-1.0-2.0-SQLite.sql', 'DDL for migration from 1.0 to 2.0 got created successfully'); + dies_ok { + $s->resultset('Foo')->create({ + bar => 'frew', + baz => 'frew', + }) + } 'schema not deployed'; + #$handler->install('1.0'); + dies_ok { + $s->resultset('Foo')->create({ + bar => 'frew', + baz => 'frew', + }) + } 'schema not uppgrayyed'; + $handler->upgrade_single_step('1.0', '2.0'); + lives_ok { + $s->resultset('Foo')->create({ + bar => 'frew', + baz => 'frew', + }) + } 'schema is deployed'; } VERSION3: { - use_ok 'DBICVersion_v3'; - my $s = DBICVersion::Schema->connect($db); - ok($s, 'DBICVersion::Schema 3.0 instantiates correctly'); - my $handler = DBIx::Class::DeploymentHandler->new({ - upgrade_directory => $sql_dir, - schema => $s, - databases => ['SQLite'], - }); + use_ok 'DBICVersion_v3'; + my $s = DBICVersion::Schema->connect($db); + ok($s, 'DBICVersion::Schema 3.0 instantiates correctly'); + my $handler = DBIx::Class::DeploymentHandler->new({ + upgrade_directory => $sql_dir, + schema => $s, + databases => ['SQLite'], + }); - ok($handler, 'DBIx::Class::DeploymentHandler w/3.0 instantiates correctly'); + ok($handler, 'DBIx::Class::DeploymentHandler w/3.0 instantiates correctly'); - $version = $s->schema_version(); - $handler->create_ddl_dir( $version, 0); - $handler->create_ddl_dir( $version, '1.0'); - $handler->create_ddl_dir( $version, '2.0'); - ok(-e 't/sql/DBICVersion-Schema-3.0-SQLite.sql', 'DDL for 3.0 got created successfully'); - ok(-e 't/sql/DBICVersion-Schema-1.0-3.0-SQLite.sql', 'DDL for migration from 1.0 to 3.0 got created successfully'); - ok(-e 't/sql/DBICVersion-Schema-2.0-3.0-SQLite.sql', 'DDL for migration from 2.0 to 3.0 got created successfully'); - dies_ok { - $s->resultset('Foo')->create({ - bar => 'frew', - baz => 'frew', - biff => 'frew', - }) - } 'schema not deployed'; - $handler->upgrade; - lives_ok { - $s->resultset('Foo')->create({ - bar => 'frew', - baz => 'frew', - biff => 'frew', - }) - } 'schema is deployed'; + $version = $s->schema_version(); + $handler->create_ddl_dir( $version, 0); + $handler->create_ddl_dir( $version, '1.0'); + $handler->create_ddl_dir( $version, '2.0'); + ok(-e 't/sql/DBICVersion-Schema-3.0-SQLite.sql', 'DDL for 3.0 got created successfully'); + ok(-e 't/sql/DBICVersion-Schema-1.0-3.0-SQLite.sql', 'DDL for migration from 1.0 to 3.0 got created successfully'); + ok(-e 't/sql/DBICVersion-Schema-2.0-3.0-SQLite.sql', 'DDL for migration from 2.0 to 3.0 got created successfully'); + dies_ok { + $s->resultset('Foo')->create({ + bar => 'frew', + baz => 'frew', + biff => 'frew', + }) + } 'schema not deployed'; + $handler->upgrade; + lives_ok { + $s->resultset('Foo')->create({ + bar => 'frew', + baz => 'frew', + biff => 'frew', + }) + } 'schema is deployed'; } done_testing;