X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fstorage%2Freconnect.t;h=557bff8cab086fd0be7618bda41561b90b2103b1;hb=9bea2000ccd0828327e98c3e17c0be3e7df5c593;hp=17bd75f3f290a3be6642165b93b37beeae2fa1bf;hpb=64819b0e69a844bb790701e13931afcc34f3d981;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/storage/reconnect.t b/t/storage/reconnect.t
index 17bd75f..557bff8 100644
--- a/t/storage/reconnect.t
+++ b/t/storage/reconnect.t
@@ -15,7 +15,7 @@ my $db_tmp  = "$db_orig.tmp";
 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,31 +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 {
+    my @art_three = $schema->resultset("Artist")->search( {}, { order_by => { -desc => 'name' } } );
+  }  qr/not a database/, 'The operation failed';
 }
 
-# otherwise win32 can't unlink the fake db file
-# as root sqlite will have the file open and won't reconnect
-$schema->storage->_dbh->disconnect if $^O eq 'MSWin32' or $> == 0;
+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: $!";
@@ -66,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" );