X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class-DeploymentHandler.git;a=blobdiff_plain;f=t%2F02-instantiation.t;h=69ad0896a911d473a2c54163c39aee6b27b319e4;hp=2b2499ccf64d2c65a32d2d76a3081d83cffdbcfd;hb=f3b5161e466df2a94f2704177f0173e7d940c4d5;hpb=199410d3e84cf0c8a9c77c032ab882c29ad9acfd

diff --git a/t/02-instantiation.t b/t/02-instantiation.t
index 2b2499c..69ad089 100644
--- a/t/02-instantiation.t
+++ b/t/02-instantiation.t
@@ -1,128 +1,162 @@
 #!perl
 
-use Test::More;
-use Test::Exception;
+use strict;
+use warnings;
 
 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';
+use aliased 'DBIx::Class::DeploymentHandler', 'DH';
 
-unlink 'db.db' if -e 'db.db';
-if (-d 't/sql') {
-  unlink $_ for glob('t/sql/*');
-} else {
-  mkdir 't/sql';
-}
+use File::Path 'remove_tree';
+use Test::More;
+use Test::Exception;
+
+DBICDHTest::ready;
+
+my $dbh = DBICDHTest::dbh();
+my @connection = (sub { $dbh }, { ignore_version => 1 });
+my $sql_dir = 't/sql';
 
 VERSION1: {
-   use_ok 'DBICVersion_v1';
-   my $s = DBICVersion::Schema->connect(@connection);
-   ok($s, 'DBICVersion::Schema 1.0 instantiates correctly');
-   my $handler = DBIx::Class::DeploymentHandler->new({
-      upgrade_directory => $sql_dir,
-      schema => $s,
-      databases => 'SQLite',
-    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-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';
+  use_ok 'DBICVersion_v1';
+  my $s = DBICVersion::Schema->connect(@connection);
+  $DBICVersion::Schema::VERSION = 1;
+  ok($s, 'DBICVersion::Schema 1 instantiates correctly');
+  my $handler = DH->new({
+    script_directory => $sql_dir,
+    schema => $s,
+    databases => 'SQLite',
+    sql_translator_args => { add_drop_table => 0 },
+  });
+
+  ok($handler, 'DBIx::Class::DeploymentHandler w/1 instantiates correctly');
+
+  my $version = $s->schema_version;
+  $handler->prepare_install;
+
+  dies_ok {
+    $s->resultset('Foo')->create({
+      bar => 'frew',
+    })
+  } 'schema not deployed';
+  $handler->install;
+  dies_ok {
+    $handler->install;
+  } 'cannot install twice';
+  lives_ok {
+    $s->resultset('Foo')->create({
+      bar => 'frew',
+    })
+  } 'schema is deployed';
 }
 
 VERSION2: {
-   use_ok 'DBICVersion_v2';
-   my $s = DBICVersion::Schema->connect(@connection);
-   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');
-
-   $version = $s->schema_version();
-   $handler->prepare_install();
-   $handler->prepare_update($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';
+  use_ok 'DBICVersion_v2';
+  my $s = DBICVersion::Schema->connect(@connection);
+  $DBICVersion::Schema::VERSION = 2;
+  ok($s, 'DBICVersion::Schema 2 instantiates correctly');
+  my $handler = DH->new({
+    script_directory => $sql_dir,
+    schema => $s,
+    databases => 'SQLite',
+  });
+
+  ok($handler, 'DBIx::Class::DeploymentHandler w/2 instantiates correctly');
+
+  my $version = $s->schema_version();
+  $handler->prepare_install;
+  $handler->prepare_upgrade({ from_version => 1, to_version => $version} );
+  dies_ok {
+    $s->resultset('Foo')->create({
+      bar => 'frew',
+      baz => 'frew',
+    })
+  } 'schema not deployed';
+  dies_ok {
+    $s->resultset('Foo')->create({
+      bar => 'frew',
+      baz => 'frew',
+    })
+  } 'schema not uppgrayyed';
+  $handler->upgrade;
+  lives_ok {
+    $s->resultset('Foo')->create({
+      bar => 'frew',
+      baz => 'frew',
+    })
+  } 'schema is deployed';
 }
 
 VERSION3: {
-   use_ok 'DBICVersion_v3';
-   my $s = DBICVersion::Schema->connect(@connection);
-   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');
-
-   $version = $s->schema_version();
-   $handler->prepare_install;
-   $handler->prepare_update( $version, '1.0');
-   $handler->prepare_update( $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',
+  use_ok 'DBICVersion_v3';
+  my $s = DBICVersion::Schema->connect(@connection);
+  $DBICVersion::Schema::VERSION = 3;
+  ok($s, 'DBICVersion::Schema 3 instantiates correctly');
+  my $handler = DH->new({
+    script_directory => $sql_dir,
+    schema => $s,
+    databases => 'SQLite',
+  });
+
+  ok($handler, 'DBIx::Class::DeploymentHandler w/3 instantiates correctly');
+
+  my $version = $s->schema_version();
+  $handler->prepare_install;
+  $handler->prepare_upgrade({ from_version => 2, to_version => $version });
+  dies_ok {
+    $s->resultset('Foo')->create({
+        bar => 'frew',
+        baz => 'frew',
+        biff => 'frew',
       })
-   } 'schema is deployed';
+  } 'schema not deployed';
+  $handler->upgrade;
+  lives_ok {
+    $s->resultset('Foo')->create({
+      bar => 'frew',
+      baz => 'frew',
+      biff => 'frew',
+    })
+  } 'schema is deployed';
 }
 
-done_testing;
-__END__
+DOWN2: {
+  use_ok 'DBICVersion_v4';
+  my $s = DBICVersion::Schema->connect(@connection);
+  $DBICVersion::Schema::VERSION = 2;
+  ok($s, 'DBICVersion::Schema 2 instantiates correctly');
+  my $handler = DH->new({
+    script_directory => $sql_dir,
+    schema => $s,
+    databases => 'SQLite',
+  });
+
+  ok($handler, 'DBIx::Class::DeploymentHandler w/2 instantiates correctly');
 
-vim: ts=2 sw=2 expandtab
+  my $version = $s->schema_version();
+  $handler->prepare_downgrade({ from_version => 3, to_version => $version });
+  lives_ok {
+    $s->resultset('Foo')->create({
+      bar => 'frew',
+      baz => 'frew',
+      biff => 'frew',
+    })
+  } 'schema at version 3';
+  $handler->downgrade;
+  dies_ok {
+    $s->resultset('Foo')->create({
+      bar => 'frew',
+      baz => 'frew',
+      biff => 'frew',
+    })
+  } 'schema not at version 3';
+  lives_ok {
+    $s->resultset('Foo')->create({
+      bar => 'frew',
+      baz => 'frew',
+    })
+  } 'schema is at version 2';
+}
+
+done_testing;