X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02-instantiation.t;h=96996441603876c41db25bed078ad559cd4f3fd1;hb=84afdcb37642d456f42de873944347b45555066b;hp=7d673099496fe15df9ba8e5772af1da887caa007;hpb=aa5ad00e656c25a27bb08df4443ec0adecc7c524;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/t/02-instantiation.t b/t/02-instantiation.t
index 7d67309..9699644 100644
--- a/t/02-instantiation.t
+++ b/t/02-instantiation.t
@@ -5,17 +5,14 @@ use Test::Exception;
 use File::Path 'remove_tree';
 
 use lib 't/lib';
+use DBICDHTest;
 use DBICTest;
 use DBIx::Class::DeploymentHandler;
 my $db = 'dbi:SQLite:db.db';
 my @connection = ($db, '', '', { ignore_version => 1 });
 my $sql_dir = 't/sql';
 
-unlink 'db.db' if -e 'db.db';
-if (-d 't/sql') {
-  remove_tree('t/sql');
-  mkdir 't/sql';
-}
+DBICDHTest::ready;
 
 VERSION1: {
    use_ok 'DBICVersion_v1';
@@ -25,7 +22,7 @@ VERSION1: {
       upgrade_directory => $sql_dir,
       schema => $s,
       databases => 'SQLite',
-    sqltargs => { add_drop_table => 0 },
+      sqltargs => { add_drop_table => 0 },
    });
 
    ok($handler, 'DBIx::Class::DeploymentHandler w/1.0 instantiates correctly');
@@ -40,6 +37,9 @@ VERSION1: {
       })
    } 'schema not deployed';
    $handler->install;
+   dies_ok {
+     $handler->install;
+   } 'cannot install twice';
    lives_ok {
       $s->resultset('Foo')->create({
          bar => 'frew',
@@ -61,7 +61,8 @@ VERSION2: {
 
    $version = $s->schema_version();
    $handler->prepare_install();
-   $handler->prepare_update('1.0', $version);
+   $handler->prepare_upgrade('1.0', $version);
+   $handler->prepare_upgrade($version, '1.0');
    #ok(-e 't/sql/DBICVersion-Schema-schema-2.0-SQLite.sql', 'DDL for 2.0 got created successfully');
    #ok(-e 't/sql/DBICVersion-Schema-diff-1.0-2.0-SQLite.sql', 'DDL for migration from 1.0 to 2.0 got created successfully');
    dies_ok {
@@ -100,8 +101,8 @@ VERSION3: {
 
    $version = $s->schema_version();
    $handler->prepare_install;
-   $handler->prepare_update( '1.0', $version );
-   $handler->prepare_update( '2.0', $version );
+   $handler->prepare_upgrade( '1.0', $version );
+   $handler->prepare_upgrade( '2.0', $version );
    #ok(-e 't/sql/DBICVersion-Schema-schema-3.0-SQLite.sql', 'DDL for 3.0 got created successfully');
    #ok(-e 't/sql/DBICVersion-Schema-diff-1.0-3.0-SQLite.sql', 'DDL for migration from 1.0 to 3.0 got created successfully');
    #ok(-e 't/sql/DBICVersion-Schema-diff-2.0-3.0-SQLite.sql', 'DDL for migration from 2.0 to 3.0 got created successfully');