X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fdeploy_methods%2Fsql_translator_deprecated.t;h=768b514db23e18d299e0fb71a5c3a77feb0c897f;hb=migration_schema;hp=1b4f0b53324af9f42ccedeca1295a3ce3415b344;hpb=d50f25217d0b10029e1fb5ea140eb5547df67592;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/t/deploy_methods/sql_translator_deprecated.t b/t/deploy_methods/sql_translator_deprecated.t
index 1b4f0b5..768b514 100644
--- a/t/deploy_methods/sql_translator_deprecated.t
+++ b/t/deploy_methods/sql_translator_deprecated.t
@@ -6,32 +6,32 @@ 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;
 
 VERSION1: {
    use_ok 'DBICVersion_v1';
-   my $s = DBICVersion::Schema->connect(@connection);
+   my $s = DBICVersion::Schema1->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 )),
+      -f catfile(qw( t sql DBICVersion-Schema1-1.0-SQLite.sql )),
       '1.0 schema gets generated properly'
    );
 
@@ -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::Schema2->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