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

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

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

Log Message:
-----------
register TreeNode; add test for explicit subobject specification

Modified Paths:
--------------
    trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm
    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/node

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 03:50:24 UTC (rev 303)
+++ trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm	2009-11-24 03:56:01 UTC (rev 304)
@@ -9,6 +9,8 @@
 package Tree;
 CIPRES::TreeBase::VeryBadORM->register();
 
+%subobject = (root_node => 'TreeNode');
+
 sub table { "TREE" }
 sub id_attr { "TreeId" }
 
@@ -17,4 +19,9 @@
 
 sub table { "matrices" }
 
+package TreeNode;
+CIPRES::TreeBase::VeryBadORM->register();
+
+sub table { "node" }
+
 1;

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:50:24 UTC (rev 303)
+++ trunk/treebase-core/src/main/perl/t/01_basic.t	2009-11-24 03:56:01 UTC (rev 304)
@@ -9,7 +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));
+check_table('node', qw(treenode_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:50:24 UTC (rev 303)
+++ trunk/treebase-core/src/main/perl/t/21_subobject.t	2009-11-24 03:56:01 UTC (rev 304)
@@ -1,4 +1,4 @@
-use Test::More tests => 3;
+use Test::More tests => 4;
 
 use_ok('CIPRES::TreeBase::TestObjects');
 use DBI;
@@ -8,4 +8,5 @@
 is(Study->new(4)->Tree->name, "tree xxiv");  # use correct subobject name
 is(Study->new(4)->tree->name, "tree xxiv");  # use alternate capitalization
 
-
+# root_node's class is defined by %Tree::subobject, not by the default behavior
+is(Tree->new(24)->root_node->id, Tree->new(24)->root_node_id);  

Modified: trunk/treebase-core/src/main/perl/test_db/node
===================================================================
--- trunk/treebase-core/src/main/perl/test_db/node	2009-11-24 03:50:24 UTC (rev 303)
+++ trunk/treebase-core/src/main/perl/test_db/node	2009-11-24 03:56:01 UTC (rev 304)
@@ -1,4 +1,4 @@
-node_id,tree_id,left_child,right_child,data
+treenode_id,tree_id,left_child,right_child,data
 8,2,,,D
 28,119,,,CC
 29,120,,,P


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