change all the tests to use the new test schema namespace

[dbsrgits/DBIx-Class-DeploymentHandler.git] / t / 02-instantiation-no-ddl.t

diff --git a/t/02-instantiation-no-ddl.t b/t/02-instantiation-no-ddl.t
index ff169c3..02d4f7d 100644 (file)
--- a/t/02-instantiation-no-ddl.t
+++ b/t/02-instantiation-no-ddl.t
@@ -11,30 +11,31 @@ use aliased 'DBIx::Class::DeploymentHandler', 'DH';
 use File::Path 'remove_tree';
 use Test::More;
 use Test::Exception;
+use DBI;
 
 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';
 
 VERSION1: {
   use_ok 'DBICVersion_v1';
-  my $s = DBICVersion::Schema->connect(@connection);
-  $DBICVersion::Schema::VERSION = 1;
+  my $s = DBICVersion::Schema1->connect(@connection);
+  $DBICVersion::Schema1::VERSION = 1;
   ok($s, 'DBICVersion::Schema 1 instantiates correctly');
   my $handler = DH->new({
     ignore_ddl => 1,
     script_directory => $sql_dir,
     schema => $s,
-    databases => 'SQLite',
+    databases => [],
     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({
@@ -54,20 +55,21 @@ VERSION1: {
 
 VERSION2: {
   use_ok 'DBICVersion_v2';
-  my $s = DBICVersion::Schema->connect(@connection);
-  $DBICVersion::Schema::VERSION = 2;
+  my $s = DBICVersion::Schema2->connect(@connection);
+  $DBICVersion::Schema2::VERSION = 2;
   ok($s, 'DBICVersion::Schema 2 instantiates correctly');
   my $handler = DH->new({
     ignore_ddl => 1,
     script_directory => $sql_dir,
     schema => $s,
-    databases => 'SQLite',
+    databases => [],
   });
 
   ok($handler, 'DBIx::Class::DeploymentHandler w/2 instantiates correctly');
 
   my $version = $s->schema_version();
-  $handler->prepare_deploy();
+  $handler->prepare_install;
+#$handler->prepare_upgrade({ from_version => 1, to_version => 2 });
   dies_ok {
     $s->resultset('Foo')->create({
       bar => 'frew',
@@ -91,20 +93,20 @@ VERSION2: {
 
 VERSION3: {
   use_ok 'DBICVersion_v3';
-  my $s = DBICVersion::Schema->connect(@connection);
-  $DBICVersion::Schema::VERSION = 3;
+  my $s = DBICVersion::Schema3->connect(@connection);
+  $DBICVersion::Schema3::VERSION = 3;
   ok($s, 'DBICVersion::Schema 3 instantiates correctly');
   my $handler = DH->new({
     ignore_ddl => 1,
     script_directory => $sql_dir,
     schema => $s,
-    databases => 'SQLite',
+    databases => [],
   });
 
   ok($handler, 'DBIx::Class::DeploymentHandler w/3 instantiates correctly');
 
   my $version = $s->schema_version();
-  $handler->prepare_deploy;
+  $handler->prepare_install;
   dies_ok {
     $s->resultset('Foo')->create({
         bar => 'frew',
@@ -124,14 +126,14 @@ VERSION3: {
 
 DOWN2: {
   use_ok 'DBICVersion_v4';
-  my $s = DBICVersion::Schema->connect(@connection);
-  $DBICVersion::Schema::VERSION = 2;
+  my $s = DBICVersion::Schema4->connect(@connection);
+  $DBICVersion::Schema4::VERSION = 2;
   ok($s, 'DBICVersion::Schema 2 instantiates correctly');
   my $handler = DH->new({
     ignore_ddl => 1,
     script_directory => $sql_dir,
     schema => $s,
-    databases => 'SQLite',
+    databases => [],
   });
 
   ok($handler, 'DBIx::Class::DeploymentHandler w/2 instantiates correctly');
@@ -141,7 +143,6 @@ DOWN2: {
     $s->resultset('Foo')->create({
       bar => 'frew',
       baz => 'frew',
-      biff => 'frew',
     })
   } 'schema at version 3';
   $handler->downgrade;
@@ -158,6 +159,10 @@ DOWN2: {
       baz => 'frew',
     })
   } 'schema is at version 2';
+
+  is $handler->version_storage->database_version => 2, 
+    'database version is down to 2';
+
 }
 
 done_testing;