[Bast-commits] r4687 - in trunk/DBIx-Class-Journal: . t/lib t/lib/DBICTest

[nothingmuch at dev.catalyst.perl.org]

Author: nothingmuch
Date: 2008-07-30 07:29:00 +0100 (Wed, 30 Jul 2008)
New Revision: 4687

Modified:
   trunk/DBIx-Class-Journal/Makefile.PL
   trunk/DBIx-Class-Journal/t/lib/DBICTest.pm
   trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema.pm
Log:
Test::TempDir

Modified: trunk/DBIx-Class-Journal/Makefile.PL
===================================================================
--- trunk/DBIx-Class-Journal/Makefile.PL	2008-07-30 06:20:28 UTC (rev 4686)
+++ trunk/DBIx-Class-Journal/Makefile.PL	2008-07-30 06:29:00 UTC (rev 4687)
@@ -5,5 +5,6 @@
      VERSION_FROM  => 'lib/DBIx/Class/Schema/Journal.pm',
      PREREQ_PM     => { 'DBIx::Class'           => 0.08,
                         'DBD::SQLite'           => 0.12,
+                        'Test::Tempdir'         => 0.04,
                     },
 );

Modified: trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema.pm
===================================================================
--- trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema.pm	2008-07-30 06:20:28 UTC (rev 4686)
+++ trunk/DBIx-Class-Journal/t/lib/DBICTest/Schema.pm	2008-07-30 06:29:00 UTC (rev 4687)
@@ -5,8 +5,6 @@
 
 __PACKAGE__->load_components(qw/+DBIx::Class::Schema::Journal/);
 
-__PACKAGE__->journal_connection(['dbi:SQLite:t/var/Audit.db']);
-
 no warnings qw/qw/;
 DBICTest::Schema->load_classes(
 qw/

Modified: trunk/DBIx-Class-Journal/t/lib/DBICTest.pm
===================================================================
--- trunk/DBIx-Class-Journal/t/lib/DBICTest.pm	2008-07-30 06:20:28 UTC (rev 4686)
+++ trunk/DBIx-Class-Journal/t/lib/DBICTest.pm	2008-07-30 06:29:00 UTC (rev 4687)
@@ -1,6 +1,8 @@
 package # hide from PAUSE 
     DBICTest;
 
+use Test::TempDir;
+
 use strict;
 use warnings;
 use DBICTest::Schema;
@@ -45,15 +47,8 @@
 sub init_schema {
     my $self = shift;
     my %args = @_;
-    my $db_file = "t/var/DBIxClass.db";
-    my $db_audit = 't/var/Audit.db';
+    my $db_file = temp_root->file("main.db");
 
-    unlink($db_file) if -e $db_file;
-    unlink($db_file . "-journal") if -e $db_file . "-journal";
-    unlink($db_audit) if -e $db_audit;
-    unlink($db_audit . "-journal") if -e $db_audit . "-journal";
-    mkdir("t/var") unless -d "t/var";
-
     my $dsn = $ENV{"DBICTEST_DSN"} || "dbi:SQLite:${db_file}";
     my $dbuser = $ENV{"DBICTEST_DBUSER"} || '';
     my $dbpass = $ENV{"DBICTEST_DBPASS"} || '';