fix niggly bug in TEI parsing; test GraphML in/out

[scpubgit/stemmatology.git] / t / stemma.t

diff --git a/t/stemma.t b/t/stemma.t
index 7f3bc7d..8d2fd6e 100644 (file)
--- a/t/stemma.t
+++ b/t/stemma.t
@@ -5,6 +5,7 @@ use File::Which;
 use Test::More;
 use lib 'lib';
 use Text::Tradition;
+use Text::Tradition::StemmaUtil qw/ make_character_matrix /;
 use XML::LibXML;
 use XML::LibXML::XPathContext;
 
@@ -29,7 +30,7 @@ ok( $stemma->isa( 'Text::Tradition::Stemma' ), 'Got the right sort of object' );
 is( $stemma->graph, '1-2,1-A,2-B,2-C', "Got the correct graph" );
 
 # Test for character matrix creation
-my $m = $stemma->make_character_matrix();
+my $m = make_character_matrix( $c->make_alignment_table() );
  ## check number of rows
 is( scalar @$m, 3, "Found three witnesses in char matrix" );
  ## check number of columns
@@ -49,7 +50,7 @@ foreach my $i ( 0 .. $#wits ) {
 
 # Test that pars runs
 SKIP: {
-    skip "pars not installed", 3 unless File::Which::which('pars');
+    skip "pars not in path", 3 unless File::Which::which('pars');
     my( $status, $tree ) = $stemma->run_phylip_pars();
     ok( $status, "pars ran successfully" );
     print STDERR "Error was $tree\n" unless $status;