X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Ftext_tradition_collation_relationshipstore.t;h=16724a6ed91cb2d9168375ca24498aecc4197a3a;hb=32256f01d018a2a5799e706c57edef4680b3a276;hp=573b30ef82dddafac7764a6002d1367658ee1e52;hpb=176badfec2d54f81ec420817b9a5263633788e80;p=scpubgit%2Fstemmatology.git

diff --git a/t/text_tradition_collation_relationshipstore.t b/t/text_tradition_collation_relationshipstore.t
index 573b30e..16724a6 100644
--- a/t/text_tradition_collation_relationshipstore.t
+++ b/t/text_tradition_collation_relationshipstore.t
@@ -49,14 +49,14 @@ my $t1 = Text::Tradition->new( 'input' => 'Self', 'file' => 't/data/legendfrag.x
 # Test 1.1: try to equate nodes that are prevented with an intermediate collation
 ok( $t1, "Parsed test fragment file" );
 my $c1 = $t1->collation;
-my $trel = $c1->get_relationship( '9,2', '9,3' );
+my $trel = $c1->get_relationship( 'r9.2', 'r9.3' );
 is( ref( $trel ), 'Text::Tradition::Collation::Relationship',
 	"Troublesome relationship exists" );
 is( $trel->type, 'collated', "Troublesome relationship is a collation" );
 
 # Try to make the link we want
 try {
-	$c1->add_relationship( '8,6', '10,3', { 'type' => 'orthographic' } );
+	$c1->add_relationship( 'r8.6', 'r10.3', { 'type' => 'orthographic' } );
 	ok( 1, "Added cross-collation relationship as expected" );
 } catch( Text::Tradition::Error $e ) {
 	ok( 0, "Existing collation blocked equivalence relationship: " . $e->message );
@@ -71,7 +71,7 @@ try {
 
 # Test 1.2: attempt merge of an identical reading
 try {
-	$c1->merge_readings( '9,3', '11,5' );
+	$c1->merge_readings( 'r9.3', 'r11.5' );
 	ok( 1, "Successfully merged reading 'pontifex'" );
 } catch ( Text::Tradition::Error $e ) {
 	ok( 0, "Merge of mergeable readings failed: $e->message" );
@@ -80,7 +80,7 @@ try {
 
 # Test 1.3: attempt relationship with a meta reading (should fail)
 try {
-	$c1->add_relationship( '8,1', '9,2', { 'type' => 'collated' } );
+	$c1->add_relationship( 'r8.1', 'r9.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', 
@@ -91,14 +91,14 @@ try {
 # equivalence
 my $t2 = Text::Tradition->new( 'input' => 'Self', 'file' => 't/data/legendfrag.xml' );
 my $c2 = $t2->collation;
-$c2->add_relationship( '9,2', '9,3', { 'type' => 'lexical' } );
-my $trel2 = $c2->get_relationship( '9,2', '9,3' );
+$c2->add_relationship( 'r9.2', 'r9.3', { 'type' => 'lexical' } );
+my $trel2 = $c2->get_relationship( 'r9.2', 'r9.3' );
 is( ref( $trel2 ), 'Text::Tradition::Collation::Relationship',
 	"Created blocking relationship" );
 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' } );
+	$c2->add_relationship( 'r8.6', 'r10.3', { 'type' => 'orthographic' } );
 	ok( 0, "Added cross-equivalent bad relationship" );
 } catch ( Text::Tradition::Error $e ) {
 	like( $e->message, qr/witness loop/,
@@ -117,13 +117,13 @@ 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' } );
+	$c3->add_relationship( 'r36.4', 'r38.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' } );
+	$c3->add_relationship( 'r36.3', 'r38.2', { 'type' => 'transposition' } );
 	ok( 1, "Added straightforward transposition complement" );
 } catch ( Text::Tradition::Error $e ) {
 	ok( 0, "Failed to add normal transposition complement: " . $e->message );
@@ -131,7 +131,7 @@ try {
 
 # Test 3.2: try to make a transposition that could be a parallel.
 try {
-	$c3->add_relationship( '28,2', '29,2', { 'type' => 'transposition' } );
+	$c3->add_relationship( 'r28.2', 'r29.2', { 'type' => 'transposition' } );
 	ok( 0, "Added bad colocated transposition" );
 } catch ( Text::Tradition::Error $e ) {
 	like( $e->message, qr/Readings appear to be colocated/,
@@ -140,13 +140,13 @@ try {
 
 # Test 3.3: make the parallel, and then make the transposition again.
 try {
-	$c3->add_relationship( '28,3', '29,3', { 'type' => 'orthographic' } );
+	$c3->add_relationship( 'r28.3', 'r29.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' } );
+	$c3->add_relationship( 'r28.2', 'r29.2', { 'type' => 'transposition' } );
 	ok( 1, "Added straightforward transposition complement" );
 } catch ( Text::Tradition::Error $e ) {
 	ok( 0, "Failed to add normal transposition complement: " . $e->message );