X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02-instantiation.t;h=7ab3f03ed06b4ca4c97deafa5fe7d96fcf192f97;hb=7b3d00f984e43c319a637332579e950376637a3d;hp=5173da8b1ef48c00e91b803d3641809cb6822730;hpb=91557c90ba0b3f313696c2f15dd8b56fb8358574;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/t/02-instantiation.t b/t/02-instantiation.t
index 5173da8..7ab3f03 100644
--- a/t/02-instantiation.t
+++ b/t/02-instantiation.t
@@ -10,13 +10,12 @@ use aliased 'DBIx::Class::DeploymentHandler', 'DH';
 
 use File::Path 'remove_tree';
 use Test::More;
+use File::Temp 'tempdir';
 use Test::Exception;
 
-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,16 +23,16 @@ 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',
-    sqltargs => { add_drop_table => 0 },
+    sql_translator_args => { add_drop_table => 0 },
   });
 
   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 +56,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,8 +64,8 @@ VERSION2: {
   ok($handler, 'DBIx::Class::DeploymentHandler w/2 instantiates correctly');
 
   my $version = $s->schema_version();
-  $handler->prepare_deploy();
-  $handler->prepare_upgrade(1, $version);
+  $handler->prepare_install;
+  $handler->prepare_upgrade({ from_version => 1, to_version => $version} );
   dies_ok {
     $s->resultset('Foo')->create({
       bar => 'frew',
@@ -94,7 +93,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,8 +101,8 @@ VERSION3: {
   ok($handler, 'DBIx::Class::DeploymentHandler w/3 instantiates correctly');
 
   my $version = $s->schema_version();
-  $handler->prepare_deploy;
-  $handler->prepare_upgrade( 2, $version );
+  $handler->prepare_install;
+  $handler->prepare_upgrade({ from_version => 2, to_version => $version });
   dies_ok {
     $s->resultset('Foo')->create({
         bar => 'frew',
@@ -127,7 +126,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',
   });
@@ -135,7 +134,7 @@ DOWN2: {
   ok($handler, 'DBIx::Class::DeploymentHandler w/2 instantiates correctly');
 
   my $version = $s->schema_version();
-  $handler->prepare_downgrade(3, $version);
+  $handler->prepare_downgrade({ from_version => 3, to_version => $version });
   lives_ok {
     $s->resultset('Foo')->create({
       bar => 'frew',