X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02-instantiation.t;h=4f8ca04ad6204cef05c5b49f096133aa2c981bec;hb=d50f25217d0b10029e1fb5ea140eb5547df67592;hp=82acd105aa22572c062fe33d1d5d5be43387c187;hpb=76d311e71dd647d82d18271d12e86baf11f5e525;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/t/02-instantiation.t b/t/02-instantiation.t
index 82acd10..4f8ca04 100644
--- a/t/02-instantiation.t
+++ b/t/02-instantiation.t
@@ -6,7 +6,6 @@ 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 });
@@ -22,14 +21,13 @@ 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->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({
@@ -37,6 +35,9 @@ VERSION1: {
       })
    } 'schema not deployed';
    $handler->install;
+   dies_ok {
+     $handler->install;
+   } 'cannot install twice';
    lives_ok {
       $s->resultset('Foo')->create({
          bar => 'frew',
@@ -60,15 +61,12 @@ VERSION2: {
    $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',
          baz => 'frew',
       })
    } 'schema not deployed';
-   #$handler->install('1.0');
    dies_ok {
       $s->resultset('Foo')->create({
          bar => 'frew',
@@ -100,9 +98,6 @@ VERSION3: {
    $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',