From: <mjd...@us...> - 2009-11-24 19:21:54
|
Revision: 319 http://treebase.svn.sourceforge.net/treebase/?rev=319&view=rev Author: mjdominus Date: 2009-11-24 19:21:44 +0000 (Tue, 24 Nov 2009) Log Message: ----------- reverse attributes test for Study->matrices Modified Paths: -------------- trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm trunk/treebase-core/src/main/perl/t/22_reverse.t trunk/treebase-core/src/main/perl/test_db/matrices Modified: trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm =================================================================== --- trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm 2009-11-24 16:09:20 UTC (rev 318) +++ trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm 2009-11-24 19:21:44 UTC (rev 319) @@ -5,6 +5,7 @@ package Study; CIPRES::TreeBase::VeryBadORM->register(); +%r_attr = (matrices => 'Matrix'); package Tree; CIPRES::TreeBase::VeryBadORM->register(); Modified: trunk/treebase-core/src/main/perl/t/22_reverse.t =================================================================== --- trunk/treebase-core/src/main/perl/t/22_reverse.t 2009-11-24 16:09:20 UTC (rev 318) +++ trunk/treebase-core/src/main/perl/t/22_reverse.t 2009-11-24 19:21:44 UTC (rev 319) @@ -1,6 +1,9 @@ -use Test::More tests => 3; +use Test::More tests => 9; -use lib '../lib'; +# +# Tests for reverse attributes (%r_attr) +# + use_ok('CIPRES::TreeBase::TestObjects'); use DBI; my $dbh = DBI->connect("DBI:CSV:f_dir=test_db;csv_eol=\n"); @@ -8,21 +11,31 @@ my %x_names = map {$_ => 1} ('R' .. 'W'); -my @nodes_5040 = Tree->new(5040)->nodes; -is (scalar(@nodes_5040), 6); -{ my $RESULT = ""; - for my $node (@nodes_5040) { - if ($node->tree_id != 5040) { - my $nid = $node->id; my $tid = $node->tree_id; - $RESULT = "Node $nid has treeid = $tid; s/b 5040"; - last; +{ + my @nodes_5040 = Tree->new(5040)->nodes; + is (scalar(@nodes_5040), 6); + { my $RESULT = ""; + for my $node (@nodes_5040) { + if ($node->tree_id != 5040) { + my $nid = $node->id; my $tid = $node->tree_id; + $RESULT = "Node $nid has treeid = $tid; s/b 5040"; + last; + } + delete $x_names{$node->data}; } - delete $x_names{$node->data}; + if (%x_names) { + my $missing = each %x_names; + $RESULT = "Where is node '$missing'?"; + } + ok($RESULT eq "", $RESULT || "Tested nodes of tree 5040"); } - if (%x_names) { - my $missing = each %x_names; - $RESULT = "Where is node '$missing'?"; - } - ok($RESULT eq "", $RESULT || "Tested nodes of tree 5040"); } + +my %x_num_matrices = (1 => 1, 2 => 1, 4 => 2, 5 => 1, 7 => 1, 8 => 1); +for my $sid (1, 2, 4, 5, 7, 8) { + my $num_matrices = my @matrices = Study->new($sid)->matrices; + my $matrices = $x_num_matrices{$sid} == 1 ? "matrix" : "matrices"; + is ($num_matrices, $x_num_matrices{$sid}, "count study $sid matrices"); +} + Modified: trunk/treebase-core/src/main/perl/test_db/matrices =================================================================== --- trunk/treebase-core/src/main/perl/test_db/matrices 2009-11-24 16:09:20 UTC (rev 318) +++ trunk/treebase-core/src/main/perl/test_db/matrices 2009-11-24 19:21:44 UTC (rev 319) @@ -1,7 +1,8 @@ matrix_id,name,n_rows,study_id -1,matrix I,2,2 +1,matrix I,2,1 16,matrix XVI,17,4 4,matrix IV,5,2 64,matrix LXIV,65,8 25,matrix XXV,26,5 49,matrix XLIX,50,7 +17,matrix XVII,18,4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |