[Treebase-guts] SF.net SVN: treebase:[303] trunk/treebase-core/src/main/perl/t

[<mjd...@us...>]

Revision: 303
          http://treebase.svn.sourceforge.net/treebase/?rev=303&view=rev
Author:   mjdominus
Date:     2009-11-24 03:50:24 +0000 (Tue, 24 Nov 2009)

Log Message:
-----------
add "node" data for trees

Modified Paths:
--------------
    trunk/treebase-core/src/main/perl/t/01_basic.t
    trunk/treebase-core/src/main/perl/t/21_subobject.t
    trunk/treebase-core/src/main/perl/test_db/TREE

Added Paths:
-----------
    trunk/treebase-core/src/main/perl/test_db/node

Modified: trunk/treebase-core/src/main/perl/t/01_basic.t
===================================================================
--- trunk/treebase-core/src/main/perl/t/01_basic.t	2009-11-24 03:34:05 UTC (rev 302)
+++ trunk/treebase-core/src/main/perl/t/01_basic.t	2009-11-24 03:50:24 UTC (rev 303)
@@ -1,5 +1,5 @@
 
-use Test::More tests => 27;
+use Test::More tests => 36;
 
 use_ok('DBI');
 use_ok('DBD::CSV');
@@ -9,6 +9,7 @@
 check_table('study', qw(name study_id owner tree_id));
 check_table('matrices', qw(matrix_id name n_rows study_id));
 check_table('TREE', qw(TreeId name root_node_id));
+check_table('node', qw(node_id tree_id left_child right_child data));
 
 use_ok('CIPRES::TreeBase::TestObjects');
 

Modified: trunk/treebase-core/src/main/perl/t/21_subobject.t
===================================================================
--- trunk/treebase-core/src/main/perl/t/21_subobject.t	2009-11-24 03:34:05 UTC (rev 302)
+++ trunk/treebase-core/src/main/perl/t/21_subobject.t	2009-11-24 03:50:24 UTC (rev 303)
@@ -5,5 +5,7 @@
 my $dbh = DBI->connect("DBI:CSV:f_dir=test_db;csv_eol=\n");
 CIPRES::TreeBase::VeryBadORM->set_db_connection($dbh);
 
-is(Study->new(4)->Tree->name, "tree xxiv");
-is(Study->new(4)->tree->name, "tree xxiv");
+is(Study->new(4)->Tree->name, "tree xxiv");  # use correct subobject name
+is(Study->new(4)->tree->name, "tree xxiv");  # use alternate capitalization
+
+

Modified: trunk/treebase-core/src/main/perl/test_db/TREE
===================================================================
--- trunk/treebase-core/src/main/perl/test_db/TREE	2009-11-24 03:34:05 UTC (rev 302)
+++ trunk/treebase-core/src/main/perl/test_db/TREE	2009-11-24 03:50:24 UTC (rev 303)
@@ -1,8 +1,8 @@
 TreeId,name,root_node_id
-1,tree i,
-2,tree ii,
-24,tree xxiv,
-120,tree cxx,
-5040,tree Vxl,
-40320,tree XLcccxx,
-119,tree cxix,
\ No newline at end of file
+1,tree i,105
+2,tree ii,178
+24,tree xxiv,55
+120,tree cxx,145
+5040,tree Vxl,51
+40320,tree XLcccxx,156
+119,tree cxix,28
\ No newline at end of file

Added: trunk/treebase-core/src/main/perl/test_db/node
===================================================================
--- trunk/treebase-core/src/main/perl/test_db/node	                        (rev 0)
+++ trunk/treebase-core/src/main/perl/test_db/node	2009-11-24 03:50:24 UTC (rev 303)
@@ -0,0 +1,30 @@
+node_id,tree_id,left_child,right_child,data
+8,2,,,D
+28,119,,,CC
+29,120,,,P
+51,5040,172,147,R
+55,24,65,,E
+65,24,131,,F
+77,5040,,,V
+92,120,,,N
+103,40320,,106,Y
+105,1,,,A
+106,40320,198,,Z
+107,120,,,Q
+131,24,,,G
+132,120,,,O
+142,120,,132,L
+145,120,149,153,H
+147,5040,,77,T
+149,120,151,142,I
+151,120,92,,K
+153,120,185,,J
+156,40320,103,,X
+169,5040,,171,U
+171,5040,,,W
+172,5040,169,,S
+174,40320,,,BB
+176,2,,,C
+178,2,176,8,B
+185,120,29,107,M
+198,40320,174,,AA


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.