X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02-instantiation.t;h=156bb246dc9023794ff5387844c308cf76b0357b;hb=459a67e3365a32a2a88374d81f7b9cc5f8f8412e;hp=73e92de0486f34adf0f0d93ac0a8644e3eb35e86;hpb=24f4524be2492ee3699f7ee87eb899238c6268c7;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/t/02-instantiation.t b/t/02-instantiation.t
index 73e92de..156bb24 100644
--- a/t/02-instantiation.t
+++ b/t/02-instantiation.t
@@ -2,20 +2,16 @@
 
 use Test::More;
 use Test::Exception;
+use File::Path 'remove_tree';
 
 use lib 't/lib';
-use DBICTest;
+use DBICDHTest;
 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') {
-  unlink $_ for glob('t/sql/*');
-} else {
-  mkdir 't/sql';
-}
+DBICDHTest::ready;
 
 VERSION1: {
    use_ok 'DBICVersion_v1';
@@ -25,14 +21,14 @@ 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');
 
    my $version = $s->schema_version();
-   $handler->create_install_ddl();
-   ok(-e 't/sql/DBICVersion-Schema-1.0-SQLite.sql', 'DDL for 1.0 got created successfully');
+   $handler->prepare_install();
+   #ok(-e 't/sql/DBICVersion-Schema-schema-1.0-SQLite.sql', 'DDL for 1.0 got created successfully');
 
    dies_ok {
       $s->resultset('Foo')->create({
@@ -40,6 +36,9 @@ VERSION1: {
       })
    } 'schema not deployed';
    $handler->install;
+   dies_ok {
+     $handler->install;
+   } 'cannot install twice';
    lives_ok {
       $s->resultset('Foo')->create({
          bar => 'frew',
@@ -60,10 +59,11 @@ VERSION2: {
    ok($handler, 'DBIx::Class::DeploymentHandler w/2.0 instantiates correctly');
 
    $version = $s->schema_version();
-   $handler->create_install_ddl();
-   $handler->create_update_ddl($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');
+   $handler->prepare_install();
+   $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 {
       $s->resultset('Foo')->create({
          bar => 'frew',
@@ -77,7 +77,7 @@ VERSION2: {
          baz => 'frew',
       })
    } 'schema not uppgrayyed';
-   $handler->upgrade_single_step(['1.0', '2.0']);
+   $handler->upgrade;
    lives_ok {
       $s->resultset('Foo')->create({
          bar => 'frew',
@@ -99,12 +99,12 @@ VERSION3: {
    ok($handler, 'DBIx::Class::DeploymentHandler w/3.0 instantiates correctly');
 
    $version = $s->schema_version();
-   $handler->create_install_ddl;
-   $handler->create_update_ddl( $version, '1.0');
-   $handler->create_update_ddl( $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');
+   $handler->prepare_install;
+   $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');
    dies_ok {
       $s->resultset('Foo')->create({
             bar => 'frew',