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

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

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

Log Message:
-----------
Remove owner field from study

Add link tests study -> study_author -> person

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/20_scalar.t
    trunk/treebase-core/src/main/perl/test_db/study

Added Paths:
-----------
    trunk/treebase-core/src/main/perl/t/23_link.t

Removed Paths:
-------------
    trunk/treebase-core/src/main/perl/23_link.t

Deleted: trunk/treebase-core/src/main/perl/23_link.t
===================================================================
--- trunk/treebase-core/src/main/perl/23_link.t	2009-11-24 19:33:56 UTC (rev 320)
+++ trunk/treebase-core/src/main/perl/23_link.t	2009-11-24 19:47:39 UTC (rev 321)
@@ -1,12 +0,0 @@
-use Test::More tests => 1;
-
-#
-# Tests for link attributes (%r2_attr)
-#
-
-use_ok('CIPRES::TreeBase::TestObjects');
-use DBI;
-my $dbh = DBI->connect("DBI:CSV:f_dir=test_db;csv_eol=\n");
-CIPRES::TreeBase::VeryBadORM->set_db_connection($dbh);
-
-ok(1);

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 19:33:56 UTC (rev 320)
+++ trunk/treebase-core/src/main/perl/lib/CIPRES/TreeBase/TestObjects.pm	2009-11-24 19:47:39 UTC (rev 321)
@@ -3,9 +3,18 @@
 require CIPRES::TreeBase::VeryBadORM;
 
 
+package Matrix;
+CIPRES::TreeBase::VeryBadORM->register();
+
+sub table { "matrices" }
+
+package Person;
+CIPRES::TreeBase::VeryBadORM->register();
+
 package Study;
 CIPRES::TreeBase::VeryBadORM->register();
 %r_attr = (matrices => 'Matrix');
+%r2_attr = (people => ['study_author', 'Person']);
 
 package Tree;
 CIPRES::TreeBase::VeryBadORM->register();
@@ -16,11 +25,6 @@
 sub table { "TREE" }
 sub id_attr { "TreeId" }
 
-package Matrix;
-CIPRES::TreeBase::VeryBadORM->register();
-
-sub table { "matrices" }
-
 package TreeNode;
 CIPRES::TreeBase::VeryBadORM->register();
 

Modified: trunk/treebase-core/src/main/perl/t/01_basic.t
===================================================================
--- trunk/treebase-core/src/main/perl/t/01_basic.t	2009-11-24 19:33:56 UTC (rev 320)
+++ trunk/treebase-core/src/main/perl/t/01_basic.t	2009-11-24 19:47:39 UTC (rev 321)
@@ -1,12 +1,12 @@
 
-use Test::More tests => 50;
+use Test::More tests => 49;
 
 use_ok('DBI');
 use_ok('DBD::CSV');
 
 ok(my $dbh = DBI->connect("DBI:CSV:f_dir=test_db;csv_eol=\n"));
 
-check_table('study', qw(name study_id owner tree_id));
+check_table('study', qw(name study_id 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(treenode_id tree_id left_child right_child data));

Modified: trunk/treebase-core/src/main/perl/t/20_scalar.t
===================================================================
--- trunk/treebase-core/src/main/perl/t/20_scalar.t	2009-11-24 19:33:56 UTC (rev 320)
+++ trunk/treebase-core/src/main/perl/t/20_scalar.t	2009-11-24 19:47:39 UTC (rev 321)
@@ -8,8 +8,8 @@
 ok(my $s1 = Study->new(1));
 is($s1->name, 'study one');
 
-ok(my $s8 = Study->new(8));
-is($s8->owner, 'Otto');
+ok(my $person = Person->new(8));
+is($person->first, 'Otto');
 
 is(Tree->new(120)->name, "tree cxx");
 is(Matrix->new(25)->n_rows, 26);
\ No newline at end of file

Added: trunk/treebase-core/src/main/perl/t/23_link.t
===================================================================
--- trunk/treebase-core/src/main/perl/t/23_link.t	                        (rev 0)
+++ trunk/treebase-core/src/main/perl/t/23_link.t	2009-11-24 19:47:39 UTC (rev 321)
@@ -0,0 +1,27 @@
+use Test::More tests => 2;
+
+#
+# Tests for link attributes (%r2_attr)
+#
+
+use_ok('CIPRES::TreeBase::TestObjects');
+use DBI;
+my $dbh = DBI->connect("DBI:CSV:f_dir=test_db;csv_eol=\n");
+CIPRES::TreeBase::VeryBadORM->set_db_connection($dbh);
+
+my $FAIL = "";
+my @s5_people = Study->new(5)->people;
+my %x_people = map {$_ => 1} qw(Quincunx Sax Sargent);
+for my $p (@s5_people) {
+  my $ln = $p->last;
+  if ($x_people{$ln}) {
+    delete $x_people{$ln};
+  } else {
+    $FAIL = "unexpected person '$ln' associated with study 5";
+  }
+}
+if (%x_people) {
+  $FAIL = "missing persons " . join(", ", keys %x_people) . " not associated with study 5";
+}
+ok($FAIL eq "", $FAIL || "check study 5 people");
+

Modified: trunk/treebase-core/src/main/perl/test_db/study
===================================================================
--- trunk/treebase-core/src/main/perl/test_db/study	2009-11-24 19:33:56 UTC (rev 320)
+++ trunk/treebase-core/src/main/perl/test_db/study	2009-11-24 19:47:39 UTC (rev 321)
@@ -1,7 +1,7 @@
-study_id,name,owner,tree_id
-1,study one,Juan,1
-4,study four,Balfour,24
-2,study two,Thieu,2
-8,study eight,Otto,40320
-5,study five,Quentin,120
-7,study seven,Septimus,5040
+study_id,name,tree_id
+1,study one,1
+4,study four,24
+2,study two,2
+8,study eight,40320
+5,study five,120
+7,study seven,5040


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