--- trunk/t/database.t	2004/07/13 12:45:55	107
+++ trunk/t/database.t	2004/07/13 17:41:12	108
@@ -1,66 +1,48 @@
-#                              -*- Mode: Perl -*- 
-# database.t -- 
-# ITIID           : $ITI$ $Header $__Header$
-# Author          : Ulrich Pfeifer
-# Created On      : Thu Aug  8 12:14:23 1996
-# Last Modified By: Ulrich Pfeifer
-# Last Modified On: Sun Nov 22 18:44:33 1998
-# Language        : CPerl
-# Update Count    : 16
-# Status          : Unknown, Use with caution!
-# 
-# Copyright (c) 1996-1997, Ulrich Pfeifer
-# 
+#!/usr/bin/perl -w
+#
+# test WAIT::Database
 
-######################### We start with some black magic to print on failure.
+use strict;
+use Test::More;
+use Test::Exception;
+use File::Path qw(rmtree);
+use blib;
 
-BEGIN { $| = 1; print "1..13\n"; }
-END {print "not ok 1\n" unless $loaded;}
-#use diagnostics;
-use WAIT::Database;
-$loaded = 1;
-print "ok 1\n";
+BEGIN { use_ok('WAIT::Database'); }
 
-######################### End of black magic.
+plan tests => 9;
 
-# Insert your test code below (better if it prints "ok 13"
-# (correspondingly "not ok 13") depending on the success of chunk 13
-# of the test code):
+my $db;
 
-$test = 2;
+if (-e './test') {
+	warn "test directory exists, removing!\n";
+	rmtree('./test');
+}
 
-$db = create WAIT::Database name => 'test';
+ok($db = WAIT::Database->create(name => 'test'), "create");
 
-print ((defined $db)? "ok $test\n" : "not ok $test\n"); $test++;
+ok($db->close, "close");
 
-$status = $db->close();
+ok(!defined($db), "object empty");
 
-print (($status)? "ok $test\n" : "not ok $test\n"); $test++;
+ok($db = WAIT::Database->open(name => 'test'), "open");
 
-print ((!defined $db)? "ok $test\n" : "not ok $test\n"); $test++;
+ok(!$db->sync, "sync without tables");
 
-$db = WAIT::Database->open(name => 'test');
+# can't test this
+#undef $WAIT::Database::self;
+#ok(!defined($WAIT::Database::self) , 'undef $WAIT::Database::self');
 
-print ((defined $db)? "ok $test\n" : "not ok $test\n"); $test++;
+ok($db->dispose, "dispose");
 
-$db->sync;
-print "ok $test\n"; $test++;
+ok(! $db, '$db empty');
 
-undef $self;                    # perl -w
-undef $WAIT::Database::self;     # perl -w
-print ((!defined $self)? "ok $test\n" : "not ok $test\n"); $test++;
-print ((!defined $WAIT::Database::self)? "ok $test\n" : "not ok $test\n"); $test++;
+{
+	my $db = WAIT::Database->create(name => 'test');
+	$db->close();
+}
+ok(!defined($db), "create+close");
 
-$status = $db->dispose;
+ok(WAIT::Database->dispose(name => 'test'), "dispose");
 
-print (($status)? "ok $test\n" : "not ok $test\n"); $test++;
-print ((!defined $db)? "ok $test\n" : "not ok $test\n"); $test++;
-
-{my $db = WAIT::Database->create(name => 'test'); $db->close()}
-print ((!defined $db)? "ok $test\n" : "not ok $test\n"); $test++;
-
-$status = WAIT::Database->dispose(name => 'test');
-print (($status)? "ok $test\n" : "not ok $test\n"); $test++;
-
-$db = WAIT::Database->open(name => 'test');
-print ((!defined $db)? "ok $test\n" : "not ok $test\n"); $test++;
+dies_ok { $db = WAIT::Database->open(name => 'test') } "open non-existing database";