X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fversion_handlers%2Fexplict_versions.t;h=0d28f3bb10f57ad5824baa6409877d8e9eea56be;hb=b539a2166a39a25bb3d1d91b47909500b55b3ee6;hp=0c98a9a7b9ed111abc51b2b059e833bc0f3085d1;hpb=d53e0bfc728d1d5551bbbe840a4c761ef3e33a60;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/t/version_handlers/explict_versions.t b/t/version_handlers/explict_versions.t
index 0c98a9a..0d28f3b 100644
--- a/t/version_handlers/explict_versions.t
+++ b/t/version_handlers/explict_versions.t
@@ -4,75 +4,64 @@ use Test::More;
 use Test::Exception;
 
 use lib 't/lib';
-use DBICDHTest;
-use DBICTest;
-use DBIx::Class::DeploymentHandler;
-use DBIx::Class::DeploymentHandler::VersionHandler::ExplicitVersions;
-my $db = 'dbi:SQLite:db.db';
-my @connection = ($db, '', '', { ignore_version => 1 });
-my $sql_dir = 't/sql';
-
-DBICDHTest::ready;
-
-use DBICVersion_v1;
-my $s = DBICVersion::Schema->connect(@connection);
-
-my $handler = DBIx::Class::DeploymentHandler->new({
-   upgrade_directory => $sql_dir,
-   schema => $s,
-   databases => 'SQLite',
-   sqltargs => { add_drop_table => 0 },
-});
-
-my $v_storage = $handler->version_storage;
-
-my $version = $s->schema_version();
-$handler->prepare_install();
-
-$handler->install;
+use aliased
+  'DBIx::Class::DeploymentHandler::VersionHandler::ExplicitVersions';
 
 my $versions = [map "$_.0", 0..100];
 
 {
-  my $vh = DBIx::Class::DeploymentHandler::VersionHandler::ExplicitVersions->new({
-    schema => $s,
+  my $vh = ExplicitVersions->new({
     ordered_versions => $versions,
     to_version => '1.0',
-    version_storage => $v_storage,
+    schema_version => '1.0',
+    database_version => '1.0',
   });
 
   ok $vh, 'VersionHandler gets instantiated';
 
-  ok( !$vh->next_version_set, 'next version set returns undef if we are at the version requested' );
+  ok(
+    !$vh->next_version_set,
+    'next version set returns undef if we are at the version requested'
+  );
 }
 
 {
-  my $vh = DBIx::Class::DeploymentHandler::VersionHandler::ExplicitVersions->new({
-    schema => $s,
+  my $vh = ExplicitVersions->new({
     ordered_versions => $versions,
     to_version => '5.0',
-    version_storage => $v_storage,
+    schema_version => '1.0',
+    database_version => '1.0',
   });
 
   ok $vh, 'VersionHandler gets instantiated';
-  ok( eq_array($vh->next_version_set, [qw( 1.0 2.0 )]), 'first version pair works' );
-  ok( eq_array($vh->next_version_set, [qw( 2.0 3.0 )]), 'second version pair works' );
-  ok( eq_array($vh->next_version_set, [qw( 3.0 4.0 )]), 'third version pair works' );
-  ok( eq_array($vh->next_version_set, [qw( 4.0 5.0 )]), 'fourth version pair works' );
+  ok(
+    eq_array($vh->next_version_set, [qw( 1.0 2.0 )]),
+    'first version pair works'
+  );
+  ok(
+    eq_array($vh->next_version_set, [qw( 2.0 3.0 )]),
+    'second version pair works'
+  );
+  ok(
+    eq_array($vh->next_version_set, [qw( 3.0 4.0 )]),
+    'third version pair works'
+  );
+  ok(
+    eq_array($vh->next_version_set, [qw( 4.0 5.0 )]),
+    'fourth version pair works'
+  );
   ok( !$vh->next_version_set, 'no more versions after final pair' );
   ok( !$vh->next_version_set, 'still no more versions after final pair' );
 }
 
 dies_ok {
-  my $vh = DBIx::Class::DeploymentHandler::VersionHandler::ExplicitVersions->new({
-    schema => $s,
+  my $vh = ExplicitVersions->new({
     ordered_versions => $versions,
     to_version => '0.0',
-    version_storage => $v_storage,
+    schema_version => '1.0',
+    database_version => '1.0',
   });
 } 'cannot request a version before the current version';
 
 done_testing;
-__END__
-
-vim: ts=2 sw=2 expandtab
+#vim: ts=2 sw=2 expandtab