X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fdeploy_methods%2Fsql_translator.t;fp=t%2Fdeploy_methods%2Fsql_translator.t;h=315858418c41c0b103d49db7e34c5d5358756e8d;hb=297e662fab9ba5a6798db95abbdbca2181373c92;hp=dc2bf18a144630911518bd08817d4271476fb0e6;hpb=bfc0b6500e66b496856d508d7e80d93340565ff5;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/t/deploy_methods/sql_translator.t b/t/deploy_methods/sql_translator.t
index dc2bf18..3158584 100644
--- a/t/deploy_methods/sql_translator.t
+++ b/t/deploy_methods/sql_translator.t
@@ -9,8 +9,7 @@ use Test::Fatal qw(lives_ok dies_ok);
 use lib 't/lib';
 use DBICDHTest;
 use aliased 'DBIx::Class::DeploymentHandler::DeployMethod::SQL::Translator';
-use File::Spec::Functions qw(catfile splitdir);
-use File::Path qw(rmtree mkpath);
+use Path::Class qw(dir file);
 use File::Temp qw(tempfile tempdir);
 
 my $dbh = DBICDHTest::dbh();
@@ -19,17 +18,17 @@ my $sql_dir = tempdir( CLEANUP => 1 );
 my (undef, $stuffthatran_fn) = tempfile(OPEN => 0);
 
 for (qw(initialize upgrade downgrade deploy)) {
-   mkpath(catfile(splitdir($sql_dir), '_common',  $_, '_any' ));
+   dir($sql_dir, '_common',  $_, '_any')->mkpath;
    open my $fh, '>',
-      catfile(splitdir($sql_dir), '_common', $_, qw(_any 000-win.pl ));
+      file($sql_dir, '_common', $_, qw(_any 000-win.pl ));
    print {$fh} qq^sub {open my \$fh, ">>", '$stuffthatran_fn'; use Data::Dumper::Concise; print {\$fh} join(",", \@{\$_[1]||[]}) . "\\n";  }^;
    close $fh;
 }
 
 for (qw(initialize upgrade downgrade deploy)) {
-   mkpath(catfile(splitdir($sql_dir), 'SQLite',  $_, '_any' ));
+   dir($sql_dir, 'SQLite',  $_, '_any')->mkpath;
    open my $fh, '>',
-      catfile(splitdir($sql_dir), 'SQLite', $_, qw(_any 000-win2.pl ));
+      file($sql_dir, 'SQLite', $_, qw(_any 000-win2.pl ));
    print {$fh} qq^sub {open my \$fh, ">>", '$stuffthatran_fn'; use Data::Dumper::Concise; print {\$fh} join(",", \@{\$_[1]||[]}) . "\\n";  }^;
    close $fh;
 }
@@ -48,9 +47,9 @@ VERSION1: {
 
    $dm->prepare_deploy;
 
-   mkpath(catfile(splitdir($sql_dir), qw(SQLite initialize 1.0 )));
+   dir($sql_dir, qw(SQLite initialize 1.0 ))->mkpath;
    open my $prerun, '>',
-      catfile(splitdir($sql_dir), qw(SQLite initialize 1.0 003-semiautomatic.pl ));
+      file($sql_dir, qw(SQLite initialize 1.0 003-semiautomatic.pl ));
    my (undef, $fn) = tempfile(OPEN => 0);
    print {$prerun} "sub { open my \$fh, '>', '$fn'}";
    close $prerun;
@@ -61,7 +60,7 @@ VERSION1: {
    dies_ok {$dm->prepare_deploy} 'prepare_deploy dies if you run it twice' ;
 
    ok(
-      -f catfile(splitdir($sql_dir), qw(SQLite deploy 1.0 001-auto.sql )),
+      -f file($sql_dir, qw(SQLite deploy 1.0 001-auto.sql )),
       '1.0 schema gets generated properly'
    );
 
@@ -96,10 +95,10 @@ VERSION2: {
    my $version = $s->schema_version();
    $dm->prepare_deploy;
    ok(
-      -f catfile(splitdir($sql_dir), qw(SQLite deploy 2.0 001-auto.sql )),
+      -f file($sql_dir, qw(SQLite deploy 2.0 001-auto.sql )),
       '2.0 schema gets generated properly'
    );
-   mkpath(catfile(splitdir($sql_dir), qw(SQLite upgrade 1.0-2.0 )));
+   dir($sql_dir, qw(SQLite upgrade 1.0-2.0 ))->mkpath;
    $dm->prepare_upgrade({
      from_version => '1.0',
      to_version => '2.0',
@@ -117,17 +116,17 @@ VERSION2: {
       ok( $warned, 'prepare_upgrade with a bogus preversion warns' );
    }
    ok(
-      -f catfile(splitdir($sql_dir), qw(SQLite upgrade 1.0-2.0 001-auto.sql )),
+      -f file($sql_dir, qw(SQLite upgrade 1.0-2.0 001-auto.sql )),
       '1.0-2.0 diff gets generated properly and default start and end versions get set'
    );
-   mkpath(catfile(splitdir($sql_dir), qw(SQLite downgrade 2.0-1.0 )));
+   dir($sql_dir, qw(SQLite downgrade 2.0-1.0 ))->mkpath;
    $dm->prepare_downgrade({
      from_version => $version,
      to_version => '1.0',
      version_set => [$version, '1.0']
    });
    ok(
-      -f catfile(splitdir($sql_dir), qw(SQLite downgrade 2.0-1.0 001-auto.sql )),
+      -f file($sql_dir, qw(SQLite downgrade 2.0-1.0 001-auto.sql )),
       '2.0-1.0 diff gets generated properly'
    );
    dies_ok {
@@ -143,14 +142,14 @@ VERSION2: {
       })
    } 'schema not uppgrayyed';
 
-   mkpath catfile(splitdir($sql_dir), qw(_common upgrade 1.0-2.0 ));
+   dir($sql_dir, qw(_common upgrade 1.0-2.0 ))->mkpath;
    open my $common, '>',
-      catfile(splitdir($sql_dir), qw(_common upgrade 1.0-2.0 002-semiautomatic.sql ));
+      file($sql_dir, qw(_common upgrade 1.0-2.0 002-semiautomatic.sql ));
    print {$common} qq<INSERT INTO Foo (bar, baz) VALUES ("hello", "world");\n\n>;
    close $common;
 
    open my $common_pl, '>',
-      catfile(splitdir($sql_dir), qw(_common upgrade 1.0-2.0 003-semiautomatic.pl ));
+      file($sql_dir, qw(_common upgrade 1.0-2.0 003-semiautomatic.pl ));
    print {$common_pl} q|
       sub {
          my $schema = shift;
@@ -203,7 +202,7 @@ VERSION3: {
    my $version = $s->schema_version();
    $dm->prepare_deploy;
    ok(
-      -f catfile(splitdir($sql_dir), qw(SQLite deploy 3.0 001-auto.sql )),
+      -f file($sql_dir, qw(SQLite deploy 3.0 001-auto.sql )),
       '2.0 schema gets generated properly'
    );
    $dm->prepare_downgrade({
@@ -212,7 +211,7 @@ VERSION3: {
      version_set => [$version, '1.0']
    });
    ok(
-      -f catfile(splitdir($sql_dir), qw(SQLite downgrade 3.0-1.0 001-auto.sql )),
+      -f file($sql_dir, qw(SQLite downgrade 3.0-1.0 001-auto.sql )),
       '3.0-1.0 diff gets generated properly'
    );
    $dm->prepare_upgrade({
@@ -221,7 +220,7 @@ VERSION3: {
      version_set => ['1.0', $version]
    });
    ok(
-      -f catfile(splitdir($sql_dir), qw(SQLite upgrade 1.0-3.0 001-auto.sql )),
+      -f file($sql_dir, qw(SQLite upgrade 1.0-3.0 001-auto.sql )),
       '1.0-3.0 diff gets generated properly'
    );
    $dm->prepare_upgrade({
@@ -238,7 +237,7 @@ VERSION3: {
       }
    'prepare_upgrade dies if you clobber an existing upgrade file' ;
    ok(
-      -f catfile(splitdir($sql_dir), qw(SQLite upgrade 1.0-2.0 001-auto.sql )),
+      -f file($sql_dir, qw(SQLite upgrade 1.0-2.0 001-auto.sql )),
       '2.0-3.0 diff gets generated properly'
    );
    dies_ok {