X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F03-deprecated.t;h=98e22fe3b11e51c92ba9b1de63a84db8de54a70b;hb=88a309e8b280faede9227e21c9f4c012aed31a52;hp=5eb19d3bf274efe232b6c136336570cdb04d07eb;hpb=91557c90ba0b3f313696c2f15dd8b56fb8358574;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/t/03-deprecated.t b/t/03-deprecated.t
index 5eb19d3..98e22fe 100644
--- a/t/03-deprecated.t
+++ b/t/03-deprecated.t
@@ -7,15 +7,13 @@ use lib 't/lib';
 use DBICDHTest;
 use aliased 'DBIx::Class::DeploymentHandler::Deprecated';
 
-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';
@@ -23,10 +21,10 @@ VERSION1: {
   is $s->schema_version, '1.0', 'schema version is at 1.0';
   ok($s, 'DBICVersion::Schema 1.0 instantiates correctly');
   my $handler = Deprecated->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.0 instantiates correctly');
@@ -39,7 +37,7 @@ VERSION1: {
       bar => 'frew',
     })
   } 'schema not deployed';
-  $handler->install;
+  $handler->install({ version => '1.0' });
   dies_ok {
     $handler->install;
   } 'cannot install twice';
@@ -56,7 +54,7 @@ VERSION2: {
   is $s->schema_version, '2.0', 'schema version is at 2.0';
   ok($s, 'DBICVersion::Schema 2.0 instantiates correctly');
   my $handler = Deprecated->new({
-    upgrade_directory => $sql_dir,
+    script_directory => $sql_dir,
     schema => $s,
     databases => 'SQLite',
   });
@@ -65,7 +63,7 @@ VERSION2: {
 
   my $version = $s->schema_version();
   $handler->prepare_deploy();
-  $handler->prepare_upgrade('1.0', $version);
+  $handler->prepare_upgrade({ from_version => '1.0', to_version => $version });
   dies_ok {
     $s->resultset('Foo')->create({
       bar => 'frew',
@@ -93,7 +91,7 @@ VERSION3: {
   is $s->schema_version, '3.0', 'schema version is at 3.0';
   ok($s, 'DBICVersion::Schema 3.0 instantiates correctly');
   my $handler = Deprecated->new({
-    upgrade_directory => $sql_dir,
+    script_directory => $sql_dir,
     schema => $s,
     databases => 'SQLite',
   });
@@ -102,7 +100,7 @@ VERSION3: {
 
   my $version = $s->schema_version();
   $handler->prepare_deploy;
-  $handler->prepare_upgrade( '2.0', $version );
+  $handler->prepare_upgrade({ from_version => '2.0', to_version => $version });
   dies_ok {
     $s->resultset('Foo')->create({
         bar => 'frew',