X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F03-deprecated.t;h=f29244a22bdadbaa6856b851e1b136db6cf771d8;hb=6e2665d32fec2eb9c168202abaf45e26fa87470e;hp=288299fd70696fc25681b65e34130973f9701e32;hpb=4a65f60b80222596f851950728f0a115f511481c;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/t/03-deprecated.t b/t/03-deprecated.t
index 288299f..f29244a 100644
--- a/t/03-deprecated.t
+++ b/t/03-deprecated.t
@@ -1,5 +1,8 @@
 #!perl
 
+use strict;
+use warnings;
+
 use lib 't/lib';
 use DBICDHTest;
 use aliased 'DBIx::Class::DeploymentHandler::Deprecated';
@@ -10,28 +13,26 @@ 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';
 
-ready;
-
 VERSION1: {
   use_ok 'DBICVersion_v1';
   my $s = DBICVersion::Schema->connect(@connection);
   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');
 
   my $version = $s->schema_version();
-  $handler->prepare_install();
+  $handler->prepare_deploy();
 
   dies_ok {
     $s->resultset('Foo')->create({
@@ -55,7 +56,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',
   });
@@ -63,8 +64,8 @@ VERSION2: {
   ok($handler, 'DBIx::Class::DeploymentHandler w/2.0 instantiates correctly');
 
   my $version = $s->schema_version();
-  $handler->prepare_install();
-  $handler->prepare_upgrade('1.0', $version);
+  $handler->prepare_deploy();
+  $handler->prepare_upgrade({ from_version => '1.0', to_version => $version });
   dies_ok {
     $s->resultset('Foo')->create({
       bar => 'frew',
@@ -92,7 +93,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',
   });
@@ -100,8 +101,8 @@ VERSION3: {
   ok($handler, 'DBIx::Class::DeploymentHandler w/3.0 instantiates correctly');
 
   my $version = $s->schema_version();
-  $handler->prepare_install;
-  $handler->prepare_upgrade( '2.0', $version );
+  $handler->prepare_deploy;
+  $handler->prepare_upgrade({ from_version => '2.0', to_version => $version });
   dies_ok {
     $s->resultset('Foo')->create({
         bar => 'frew',