X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Ftext_tradition_directory.t;h=8950148cb14e6eeb175c7a4f187ddf08ca7874e3;hb=ab06f3edf9045dc9a24ee138df7ae0b9bb141098;hp=e2c2667d2033a08368c0c40f00e89fb136e8314b;hpb=12523041b91eb6461a56355b2184978f0d6aa7f3;p=scpubgit%2Fstemmatology.git

diff --git a/t/text_tradition_directory.t b/t/text_tradition_directory.t
index e2c2667..8950148 100644
--- a/t/text_tradition_directory.t
+++ b/t/text_tradition_directory.t
@@ -8,58 +8,92 @@ $| = 1;
 
 # =begin testing
 {
+use TryCatch;
 use File::Temp;
 use Text::Tradition;
-use Text::Tradition::Stemma;
 use_ok 'Text::Tradition::Directory';
 
 my $fh = File::Temp->new();
 my $file = $fh->filename;
 $fh->close;
 my $dsn = "dbi:SQLite:dbname=$file";
-
-my $d = Text::Tradition::Directory->new( 'dsn' => $dsn,
-    'extra_args' => { 'create' => 1 } );
-is( ref $d, 'Text::Tradition::Directory', "Got directory object" );
-
+my $uuid;
 my $t = Text::Tradition->new( 
-    'name'  => 'inline', 
-    'input' => 'Tabular',
-    'file'  => 't/data/simple.txt',
-    );
-my $uuid = $d->save_tradition( $t );
-ok( $uuid, "Saved test tradition" );
-
-my $s = Text::Tradition::Stemma->new( 
-	'collation' => $t->collation,
-	'dotfile' => 't/data/simple.dot' );
-my $sid = $d->save_stemma( $s );
-ok( $sid, "Saved test stemma" );
+	'name'  => 'inline', 
+	'input' => 'Tabular',
+	'file'  => 't/data/simple.txt',
+	);
 
-is( $d->tradition( $uuid ), $t, "Correct tradition returned for id" );
-is( $d->stemma( $uuid ), $s, "Correct stemma returned for id" );
-is( scalar $d->tradition_ids, 1, "Only one tradition in DB" );
+{
+	my $d = Text::Tradition::Directory->new( 'dsn' => $dsn,
+		'extra_args' => { 'create' => 1 } );
+	is( ref $d, 'Text::Tradition::Directory', "Got directory object" );
+	
+	my $scope = $d->new_scope;
+	$uuid = $d->save( $t );
+	ok( $uuid, "Saved test tradition" );
+	
+	my $s = $t->add_stemma( dotfile => 't/data/simple.dot' );
+	ok( $d->save( $t ), "Updated tradition with stemma" );
+	is( $d->tradition( $uuid ), $t, "Correct tradition returned for id" );
+	is( $d->tradition( $uuid )->stemma(0), $s, "...and it has the correct stemma" );
+	try {
+		$d->save( $s );
+	} catch( Text::Tradition::Error $e ) {
+		is( $e->ident, 'database error', "Got exception trying to save stemma directly" );
+		like( $e->message, qr/Cannot directly save non-Tradition object/, 
+			"Exception has correct message" );
+	}
+}
+my $nt = Text::Tradition->new(
+	'name' => 'CX',
+	'input' => 'CollateX',
+	'file' => 't/data/Collatex-16.xml',
+	);
+is( ref( $nt ), 'Text::Tradition', "Made new tradition" );
 
-# Connect to a new instance
-my $e = Text::Tradition::Directory->new( 'dsn' => $dsn );
-is( scalar $e->tradition_ids, 1, "One tradition preloaded from DB" );
-my $te = $e->tradition( $uuid );
-is( $te->name, $t->name, "New instance returns correct tradition" );
-my $se = $e->stemma( $uuid );
-is( $se->graph, $s->graph, "New instance returns correct stemma" );
-is( $e->tradition( 'NOT-A-UUID' ), undef, "Undef returned for non-tradition" );
-is( $e->stemma( 'NOT-A-UUID' ), undef, "Undef returned for non-stemma" );
-$te->name( "Changed name" );
-my $new_id = $e->save_tradition( $te );
-is( $new_id, $uuid, "Updated tradition ID did not change" );
+{
+	my $f = Text::Tradition::Directory->new( 'dsn' => $dsn );
+	my $scope = $f->new_scope;
+	is( scalar $f->traditionlist, 1, "Directory index has our tradition" );
+	my $nuuid = $f->save( $nt );
+	ok( $nuuid, "Stored second tradition" );
+	my @tlist = $f->traditionlist;
+	is( scalar @tlist, 2, "Directory index has both traditions" );
+	my $tf = $f->tradition( $uuid );
+	my( $tlobj ) = grep { $_->{'id'} eq $uuid } @tlist;
+	is( $tlobj->{'name'}, $tf->name, "Directory index has correct tradition name" );
+	is( $tf->name, $t->name, "Retrieved the tradition from a new directory" );
+	my $sid = $f->object_to_id( $tf->stemma(0) );
+	try {
+		$f->tradition( $sid );
+	} catch( Text::Tradition::Error $e ) {
+		is( $e->ident, 'database error', "Got exception trying to fetch stemma directly" );
+		like( $e->message, qr/not a Text::Tradition/, "Exception has correct message" );
+	}
+	try {
+		$f->delete( $sid );
+	} catch( Text::Tradition::Error $e ) {
+		is( $e->ident, 'database error', "Got exception trying to delete stemma directly" );
+		like( $e->message, qr/Cannot directly delete non-Tradition object/, 
+			"Exception has correct message" );
+	}
+	
+	$f->delete( $uuid );
+	ok( !$f->exists( $uuid ), "Object is deleted from DB" );
+	ok( !$f->exists( $sid ), "Object stemma also deleted from DB" );
+	is( scalar $f->traditionlist, 1, "Object is deleted from index" );
+}
 
-my $f = Text::Tradition::Directory->new( 'dsn' => $dsn, 'preload' => 0 );
-is( scalar $f->tradition_ids, 0, "No traditions preloaded from DB" );
-### TODO This doesn't work, as I cannot get an object scope in the
-### 'tradition' wrapper.
-# my $tf = $f->tradition( $uuid );
-# is( $tf->name, $t->name, "Next instance returns correct tradition" );
-# is( $tf->name, "Changed name", "Change to tradition carried through" );
+{
+	my $g = Text::Tradition::Directory->new( 'dsn' => $dsn );
+	my $scope = $g->new_scope;
+	is( scalar $g->traditionlist, 1, "Now one object in new directory index" );
+	my $ntobj = $g->tradition( 'CX' );
+	my @w1 = sort { $a->sigil cmp $b->sigil } $ntobj->witnesses;
+	my @w2 = sort{ $a->sigil cmp $b->sigil } $nt->witnesses;
+	is_deeply( \@w1, \@w2, "Looked up remaining tradition by name" );
+}
 }