Some stylistic test changes in preparation for next commits

[dbsrgits/DBIx-Class.git] / t / storage / reconnect.t

diff --git a/t/storage/reconnect.t b/t/storage/reconnect.t
index d8ddbbc..75681d3 100644 (file)
--- a/t/storage/reconnect.t
+++ b/t/storage/reconnect.t
@@ -8,14 +8,14 @@ use Test::Exception;
 use lib qw(t/lib);
 use DBICTest;
 
-my $db_orig = "$FindBin::Bin/../var/DBIxClass.db";
+my $db_orig = DBICTest->_sqlite_dbfilename;
 my $db_tmp  = "$db_orig.tmp";
 
 # Set up the "usual" sqlite for DBICTest
 my $schema = DBICTest->init_schema( sqlite_use_file => 1 );
 
 # Make sure we're connected by doing something
-my @art = $schema->resultset("Artist")->search({ }, { order_by => 'name DESC'});
+my @art = $schema->resultset("Artist")->search({ }, { order_by => { -desc => 'name' }});
 cmp_ok(@art, '==', 3, "Three artists returned");
 
 # Disconnect the dbh, and be sneaky about it
@@ -32,30 +32,28 @@ cmp_ok(@art, '==', 3, "Three artists returned");
 #   2. It catches the exception, checks ->{Active}/->ping, sees the disconnected state...
 #   3. Reconnects, and retries the operation
 #   4. Success!
-my @art_two = $schema->resultset("Artist")->search({ }, { order_by => 'name DESC'});
+my @art_two = $schema->resultset("Artist")->search({ }, { order_by => { -desc => 'name' }});
 cmp_ok(@art_two, '==', 3, "Three artists returned");
 
 ### Now, disconnect the dbh, and move the db file;
-# create a new one and chmod 000 to prevent SQLite from connecting.
+# create a new one full of garbage, prevent SQLite from connecting.
 $schema->storage->_dbh->disconnect;
 move( $db_orig, $db_tmp )
   or die "failed to move $db_orig to $db_tmp: $!";
-open DBFILE, '>', $db_orig;
-print DBFILE 'THIS IS NOT A REAL DATABASE';
-close DBFILE;
-chmod 0000, $db_orig;
+open my $db_file, '>', $db_orig;
+print $db_file 'THIS IS NOT A REAL DATABASE';
+close $db_file;
 
-### Try the operation again... it should fail, since there's no db
+### Try the operation again... it should fail, since there's no valid db
 {
-    # Catch the DBI connection error
-    local $SIG{__WARN__} = sub {};
-    dies_ok {
-        my @art_three = $schema->resultset("Artist")->search( {}, { order_by => 'name DESC' } );
-    } 'The operation failed';
+  # Catch the DBI connection error
+  local $SIG{__WARN__} = sub {};
+  throws_ok {
+    $schema->resultset("Artist")->create({ name => 'not gonna happen' });
+  }  qr/not a database/, 'The operation failed';
 }
 
-# otherwise can't unlink the fake db file
-$schema->storage->_dbh->disconnect if $^O eq 'MSWin32';
+ok (! $schema->storage->connected, 'We are not connected' );
 
 ### Now, move the db file back to the correct name
 unlink($db_orig) or die "could not delete $db_orig: $!";
@@ -65,7 +63,7 @@ move( $db_tmp, $db_orig )
 ### Try the operation again... this time, it should succeed
 my @art_four;
 lives_ok {
-    @art_four = $schema->resultset("Artist")->search( {}, { order_by => 'name DESC' } );
+    @art_four = $schema->resultset("Artist")->search( {}, { order_by => { -desc => 'name' } } );
 } 'The operation succeeded';
 cmp_ok( @art_four, '==', 3, "Three artists returned" );