X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Ftext_tradition_collation_relationshipstore.t;h=573b30ef82dddafac7764a6002d1367658ee1e52;hb=7604424bc5cc004f536d20099d9d348aa922ce7d;hp=48b642312ead868332c0b8d119b5486872cbac56;hpb=414cc046fb54e81ac48d607b5e05c11623934533;p=scpubgit%2Fstemmatology.git

diff --git a/t/text_tradition_collation_relationshipstore.t b/t/text_tradition_collation_relationshipstore.t
index 48b6423..573b30e 100644
--- a/t/text_tradition_collation_relationshipstore.t
+++ b/t/text_tradition_collation_relationshipstore.t
@@ -46,11 +46,9 @@ use Text::Tradition;
 use TryCatch;
 
 my $t1 = Text::Tradition->new( 'input' => 'Self', 'file' => 't/data/legendfrag.xml' );
-# Test 1: try to equate nodes that are prevented with an intermediate collation
+# Test 1.1: try to equate nodes that are prevented with an intermediate collation
 ok( $t1, "Parsed test fragment file" );
 my $c1 = $t1->collation;
-## HACK
-$c1->calculate_ranks();
 my $trel = $c1->get_relationship( '9,2', '9,3' );
 is( ref( $trel ), 'Text::Tradition::Collation::Relationship',
 	"Troublesome relationship exists" );
@@ -60,25 +58,39 @@ is( $trel->type, 'collated', "Troublesome relationship is a collation" );
 try {
 	$c1->add_relationship( '8,6', '10,3', { 'type' => 'orthographic' } );
 	ok( 1, "Added cross-collation relationship as expected" );
-} catch {
-	ok( 0, "Existing collation blocked equivalence relationship" );
+} catch( Text::Tradition::Error $e ) {
+	ok( 0, "Existing collation blocked equivalence relationship: " . $e->message );
 }
 
 try {
 	$c1->calculate_ranks();
 	ok( 1, "Successfully calculated ranks" );
-} catch {
-	ok( 0, "Collation now has a cycle" );
+} catch ( Text::Tradition::Error $e ) {
+	ok( 0, "Collation now has a cycle: " . $e->message );
 }
 
-# Test 2: try to equate nodes that are prevented with a real intermediate
-# equivalence
+# Test 1.2: attempt merge of an identical reading
+try {
+	$c1->merge_readings( '9,3', '11,5' );
+	ok( 1, "Successfully merged reading 'pontifex'" );
+} catch ( Text::Tradition::Error $e ) {
+	ok( 0, "Merge of mergeable readings failed: $e->message" );
+	
+}
+
+# Test 1.3: attempt relationship with a meta reading (should fail)
+try {
+	$c1->add_relationship( '8,1', '9,2', { 'type' => 'collated' } );
+	ok( 0, "Allowed a meta-reading to be used in a relationship" );
+} catch ( Text::Tradition::Error $e ) {
+	is( $e->message, 'Cannot set relationship on a meta reading', 
+		"Relationship link prevented for a meta reading" );
+}
 
+# Test 2.1: try to equate nodes that are prevented with a real intermediate
+# equivalence
 my $t2 = Text::Tradition->new( 'input' => 'Self', 'file' => 't/data/legendfrag.xml' );
-# Test 1: try to equate nodes that are prevented with an intermediate collation
 my $c2 = $t2->collation;
-## HACK
-$c2->calculate_ranks();
 $c2->add_relationship( '9,2', '9,3', { 'type' => 'lexical' } );
 my $trel2 = $c2->get_relationship( '9,2', '9,3' );
 is( ref( $trel2 ), 'Text::Tradition::Collation::Relationship',
@@ -87,16 +99,57 @@ is( $trel2->type, 'lexical', "Blocking relationship is not a collation" );
 # This time the link ought to fail
 try {
 	$c2->add_relationship( '8,6', '10,3', { 'type' => 'orthographic' } );
-	ok( 0, "Existing equivalence blocked crossing relationship" );
-} catch {
-	ok( 1, "Added cross-equivalent bad relationship" );
+	ok( 0, "Added cross-equivalent bad relationship" );
+} catch ( Text::Tradition::Error $e ) {
+	like( $e->message, qr/witness loop/,
+		"Existing equivalence blocked crossing relationship" );
 }
 
 try {
 	$c2->calculate_ranks();
 	ok( 1, "Successfully calculated ranks" );
-} catch {
-	ok( 0, "Collation now has a cycle" );
+} catch ( Text::Tradition::Error $e ) {
+	ok( 0, "Collation now has a cycle: " . $e->message );
+}
+
+# Test 3.1: make a straightforward pair of transpositions.
+my $t3 = Text::Tradition->new( 'input' => 'Self', 'file' => 't/data/lf2.xml' );
+# Test 1: try to equate nodes that are prevented with an intermediate collation
+my $c3 = $t3->collation;
+try {
+	$c3->add_relationship( '36,4', '38,3', { 'type' => 'transposition' } );
+	ok( 1, "Added straightforward transposition" );
+} catch ( Text::Tradition::Error $e ) {
+	ok( 0, "Failed to add normal transposition: " . $e->message );
+}
+try {
+	$c3->add_relationship( '36,3', '38,2', { 'type' => 'transposition' } );
+	ok( 1, "Added straightforward transposition complement" );
+} catch ( Text::Tradition::Error $e ) {
+	ok( 0, "Failed to add normal transposition complement: " . $e->message );
+}
+
+# Test 3.2: try to make a transposition that could be a parallel.
+try {
+	$c3->add_relationship( '28,2', '29,2', { 'type' => 'transposition' } );
+	ok( 0, "Added bad colocated transposition" );
+} catch ( Text::Tradition::Error $e ) {
+	like( $e->message, qr/Readings appear to be colocated/,
+		"Prevented bad colocated transposition" );
+}
+
+# Test 3.3: make the parallel, and then make the transposition again.
+try {
+	$c3->add_relationship( '28,3', '29,3', { 'type' => 'orthographic' } );
+	ok( 1, "Equated identical readings for transposition" );
+} catch ( Text::Tradition::Error $e ) {
+	ok( 0, "Failed to equate identical readings: " . $e->message );
+}
+try {
+	$c3->add_relationship( '28,2', '29,2', { 'type' => 'transposition' } );
+	ok( 1, "Added straightforward transposition complement" );
+} catch ( Text::Tradition::Error $e ) {
+	ok( 0, "Failed to add normal transposition complement: " . $e->message );
 }
 }