Warn-free test suite with later DBIC

[dbsrgits/DBIx-Class-DeploymentHandler.git] / t / deploy_methods / sql_translator_deprecated.t

diff --git a/t/deploy_methods/sql_translator_deprecated.t b/t/deploy_methods/sql_translator_deprecated.t
index 1b4f0b5..709fcd0 100644 (file)
--- a/t/deploy_methods/sql_translator_deprecated.t
+++ b/t/deploy_methods/sql_translator_deprecated.t
@@ -6,12 +6,12 @@ use Test::Exception;
 use lib 't/lib';
 use DBICDHTest;
 use aliased
-       'DBIx::Class::DeploymentHandler::DeployMethod::SQL::Translator::Deprecated';
+   'DBIx::Class::DeploymentHandler::DeployMethod::SQL::Translator::Deprecated';
 
 use File::Spec::Functions;
 
-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';
 
 DBICDHTest::ready;
@@ -21,14 +21,14 @@ VERSION1: {
    my $s = DBICVersion::Schema->connect(@connection);
    my $dm = Deprecated->new({
       schema            => $s,
-      upgrade_directory => $sql_dir,
+      script_directory => $sql_dir,
       databases         => ['SQLite'],
-      sqltargs          => { add_drop_table => 0 },
+      sql_translator_args          => { add_drop_table => 0 },
    });
 
    ok( $dm, 'DBIC::DH::DM::SQLT::Deprecated gets instantiated correctly' );
 
-   $dm->prepare_install();
+   $dm->prepare_deploy;
 
    ok(
       -f catfile(qw( t sql DBICVersion-Schema-1.0-SQLite.sql )),
@@ -40,7 +40,7 @@ VERSION1: {
          bar => 'frew',
       })
    } 'schema not deployed';
-   $dm->_deploy;
+   $dm->deploy;
    lives_ok {
       $s->resultset('Foo')->create({
          bar => 'frew',
@@ -49,41 +49,45 @@ VERSION1: {
 }
 
 VERSION2: {
-       use_ok 'DBICVersion_v2';
-       my $s = DBICVersion::Schema->connect(@connection);
+   use_ok 'DBICVersion_v2';
+   my $s = DBICVersion::Schema->connect(@connection);
    my $dm = Deprecated->new({
       schema            => $s,
-      upgrade_directory => $sql_dir,
+      script_directory => $sql_dir,
       databases         => ['SQLite'],
    });
 
    ok(
-               $dm,
-               'DBIC::DH::DM::SQLT::Deprecated gets instantiated correctly w/ version 2.0'
-       );
+      $dm,
+      'DBIC::DH::DM::SQLT::Deprecated gets instantiated correctly w/ version 2.0'
+   );
 
-       $version = $s->schema_version();
-       $dm->prepare_install();
-       $dm->prepare_upgrade('1.0', $version);
-       dies_ok {
-               $s->resultset('Foo')->create({
-                       bar => 'frew',
-                       baz => 'frew',
-               })
-       } 'schema not deployed';
-       dies_ok {
-               $s->resultset('Foo')->create({
-                       bar => 'frew',
-                       baz => 'frew',
-               })
-       } 'schema not uppgrayyed';
-       $dm->_upgrade_single_step(['1.0', $version]);
-       lives_ok {
-               $s->resultset('Foo')->create({
-                       bar => 'frew',
-                       baz => 'frew',
-               })
-       } 'schema is deployed';
+   $version = $s->schema_version;
+   $dm->prepare_deploy;
+   $dm->prepare_upgrade({
+     from_version => '1.0',
+     to_version => $version,
+     version_set => ['1.0', $version]
+   });
+   dies_ok {
+      $s->resultset('Foo')->create({
+         bar => 'frew',
+         baz => 'frew',
+      })
+   } 'schema not deployed';
+   dies_ok {
+      $s->resultset('Foo')->create({
+         bar => 'frew',
+         baz => 'frew',
+      })
+   } 'schema not uppgrayyed';
+   $dm->upgrade_single_step({ version_set => ['1.0', $version] });
+   lives_ok {
+      $s->resultset('Foo')->create({
+         bar => 'frew',
+         baz => 'frew',
+      })
+   } 'schema is deployed';
 }
 done_testing;
 #vim: ts=2 sw=2 expandtab