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

diff --git a/t/02-instantiation.t b/t/02-instantiation.t
index 8a0de18..8cdd65d 100644
--- a/t/02-instantiation.t
+++ b/t/02-instantiation.t
@@ -8,15 +8,13 @@ use DBICDHTest;
 use DBIx::Class::DeploymentHandler;
 use aliased 'DBIx::Class::DeploymentHandler', 'DH';
 
-use File::Path 'remove_tree';
 use Test::More;
-use Test::Exception;
+use File::Temp 'tempdir';
+use Test::Fatal qw(lives_ok dies_ok);
 
-DBICDHTest::ready;
-
-my $db = 'dbi:SQLite:db.db';
-my @connection = ($db, '', '', { ignore_version => 1 });
-my $sql_dir = 't/sql';
+my $dbh = DBICDHTest::dbh();
+my @connection = (sub { $dbh }, { ignore_version => 1 });
+my $sql_dir = tempdir( CLEANUP => 1 );
 
 VERSION1: {
   use_ok 'DBICVersion_v1';
@@ -24,7 +22,7 @@ VERSION1: {
   $DBICVersion::Schema::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 +31,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({
@@ -57,7 +55,7 @@ VERSION2: {
   $DBICVersion::Schema::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 +63,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({
@@ -94,7 +92,7 @@ VERSION3: {
   $DBICVersion::Schema::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 +100,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({
@@ -127,7 +125,7 @@ DOWN2: {
   $DBICVersion::Schema::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',
   });