X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class-DeploymentHandler.git;a=blobdiff_plain;f=t%2F02-instantiation.t;h=7a2753a3955c24e18b8cac02fe80030f45c27c4d;hp=69ad0896a911d473a2c54163c39aee6b27b319e4;hb=cdb45dee99a52a37f6e61bfbec2e4af8f3a59f51;hpb=087d8c8a1a623567fc60a3d61cc8cff0bfdb90be

diff --git a/t/02-instantiation.t b/t/02-instantiation.t
index 69ad089..7a2753a 100644
--- a/t/02-instantiation.t
+++ b/t/02-instantiation.t
@@ -20,8 +20,8 @@ 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({
     script_directory => $sql_dir,
@@ -53,8 +53,8 @@ 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({
     script_directory => $sql_dir,
@@ -90,8 +90,8 @@ 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({
     script_directory => $sql_dir,
@@ -123,21 +123,22 @@ VERSION3: {
 
 DOWN2: {
   use_ok 'DBICVersion_v4';
-  my $s = DBICVersion::Schema->connect(@connection);
-  $DBICVersion::Schema::VERSION = 2;
-  ok($s, 'DBICVersion::Schema 2 instantiates correctly');
+  my $s_old = DBICVersion::Schema3->connect(@connection);
+  my $s_new = DBICVersion::Schema4->connect(@connection);
+  $DBICVersion::Schema4::VERSION = 2;
+  ok($s_new, 'DBICVersion::Schema 2 instantiates correctly');
   my $handler = DH->new({
     script_directory => $sql_dir,
-    schema => $s,
+    schema => $s_new,
     databases => 'SQLite',
   });
 
   ok($handler, 'DBIx::Class::DeploymentHandler w/2 instantiates correctly');
 
-  my $version = $s->schema_version();
+  my $version = $s_new->schema_version();
   $handler->prepare_downgrade({ from_version => 3, to_version => $version });
   lives_ok {
-    $s->resultset('Foo')->create({
+    $s_old->resultset('Foo')->create({
       bar => 'frew',
       baz => 'frew',
       biff => 'frew',
@@ -145,14 +146,14 @@ DOWN2: {
   } 'schema at version 3';
   $handler->downgrade;
   dies_ok {
-    $s->resultset('Foo')->create({
+    $s_old->resultset('Foo')->create({
       bar => 'frew',
       baz => 'frew',
       biff => 'frew',
     })
   } 'schema not at version 3';
   lives_ok {
-    $s->resultset('Foo')->create({
+    $s_new->resultset('Foo')->create({
       bar => 'frew',
       baz => 'frew',
     })