X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02-instantiation.t;h=7a2753a3955c24e18b8cac02fe80030f45c27c4d;hb=cdb45dee99a52a37f6e61bfbec2e4af8f3a59f51;hp=8a0de18ad74a746991395c79732c941c7caa26c7;hpb=be140a5f1f8ab40705bf4cbedb74761c4994a765;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/t/02-instantiation.t b/t/02-instantiation.t
index 8a0de18..7a2753a 100644
--- a/t/02-instantiation.t
+++ b/t/02-instantiation.t
@@ -14,17 +14,17 @@ use Test::Exception;
 
 DBICDHTest::ready;
 
-my $db = 'dbi:SQLite:db.db';
-my @connection = ($db, '', '', { ignore_version => 1 });
+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);
-  $DBICVersion::Schema::VERSION = 1;
+  my $s = DBICVersion::Schema1->connect(@connection);
+  $DBICVersion::Schema1::VERSION = 1;
   ok($s, 'DBICVersion::Schema 1 instantiates correctly');
   my $handler = DH->new({
-    upgrade_directory => $sql_dir,
+    script_directory => $sql_dir,
     schema => $s,
     databases => 'SQLite',
     sql_translator_args => { add_drop_table => 0 },
@@ -33,7 +33,7 @@ VERSION1: {
   ok($handler, 'DBIx::Class::DeploymentHandler w/1 instantiates correctly');
 
   my $version = $s->schema_version;
-  $handler->prepare_deploy;
+  $handler->prepare_install;
 
   dies_ok {
     $s->resultset('Foo')->create({
@@ -53,11 +53,11 @@ VERSION1: {
 
 VERSION2: {
   use_ok 'DBICVersion_v2';
-  my $s = DBICVersion::Schema->connect(@connection);
-  $DBICVersion::Schema::VERSION = 2;
+  my $s = DBICVersion::Schema2->connect(@connection);
+  $DBICVersion::Schema2::VERSION = 2;
   ok($s, 'DBICVersion::Schema 2 instantiates correctly');
   my $handler = DH->new({
-    upgrade_directory => $sql_dir,
+    script_directory => $sql_dir,
     schema => $s,
     databases => 'SQLite',
   });
@@ -65,7 +65,7 @@ VERSION2: {
   ok($handler, 'DBIx::Class::DeploymentHandler w/2 instantiates correctly');
 
   my $version = $s->schema_version();
-  $handler->prepare_deploy();
+  $handler->prepare_install;
   $handler->prepare_upgrade({ from_version => 1, to_version => $version} );
   dies_ok {
     $s->resultset('Foo')->create({
@@ -90,11 +90,11 @@ VERSION2: {
 
 VERSION3: {
   use_ok 'DBICVersion_v3';
-  my $s = DBICVersion::Schema->connect(@connection);
-  $DBICVersion::Schema::VERSION = 3;
+  my $s = DBICVersion::Schema3->connect(@connection);
+  $DBICVersion::Schema3::VERSION = 3;
   ok($s, 'DBICVersion::Schema 3 instantiates correctly');
   my $handler = DH->new({
-    upgrade_directory => $sql_dir,
+    script_directory => $sql_dir,
     schema => $s,
     databases => 'SQLite',
   });
@@ -102,7 +102,7 @@ VERSION3: {
   ok($handler, 'DBIx::Class::DeploymentHandler w/3 instantiates correctly');
 
   my $version = $s->schema_version();
-  $handler->prepare_deploy;
+  $handler->prepare_install;
   $handler->prepare_upgrade({ from_version => 2, to_version => $version });
   dies_ok {
     $s->resultset('Foo')->create({
@@ -123,21 +123,22 @@ VERSION3: {
 
 DOWN2: {
   use_ok 'DBICVersion_v4';
-  my $s = DBICVersion::Schema->connect(@connection);
-  $DBICVersion::Schema::VERSION = 2;
-  ok($s, 'DBICVersion::Schema 2 instantiates correctly');
+  my $s_old = DBICVersion::Schema3->connect(@connection);
+  my $s_new = DBICVersion::Schema4->connect(@connection);
+  $DBICVersion::Schema4::VERSION = 2;
+  ok($s_new, 'DBICVersion::Schema 2 instantiates correctly');
   my $handler = DH->new({
-    upgrade_directory => $sql_dir,
-    schema => $s,
+    script_directory => $sql_dir,
+    schema => $s_new,
     databases => 'SQLite',
   });
 
   ok($handler, 'DBIx::Class::DeploymentHandler w/2 instantiates correctly');
 
-  my $version = $s->schema_version();
+  my $version = $s_new->schema_version();
   $handler->prepare_downgrade({ from_version => 3, to_version => $version });
   lives_ok {
-    $s->resultset('Foo')->create({
+    $s_old->resultset('Foo')->create({
       bar => 'frew',
       baz => 'frew',
       biff => 'frew',
@@ -145,14 +146,14 @@ DOWN2: {
   } 'schema at version 3';
   $handler->downgrade;
   dies_ok {
-    $s->resultset('Foo')->create({
+    $s_old->resultset('Foo')->create({
       bar => 'frew',
       baz => 'frew',
       biff => 'frew',
     })
   } 'schema not at version 3';
   lives_ok {
-    $s->resultset('Foo')->create({
+    $s_new->resultset('Foo')->create({
       bar => 'frew',
       baz => 'frew',
     })