[MOBY-guts] biomoby commit

[Frank Gibbons]

fgibbons
Fri Sep 16 12:36:39 EDT 2005
Update of /home/repository/moby/moby-live/Perl/t
In directory pub.open-bio.org:/tmp/cvs-serv23680/t

Modified Files:
	Client-Central.t 
Log Message:
 - Relationships property works now, remove from TODO.  retrieveObjectSchema not implemented, put on TODO list.

moby-live/Perl/t Client-Central.t,1.41,1.42
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/t/Client-Central.t,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- /home/repository/moby/moby-live/Perl/t/Client-Central.t	2005/09/01 13:50:46	1.41
+++ /home/repository/moby/moby-live/Perl/t/Client-Central.t	2005/09/16 16:36:39	1.42
@@ -61,7 +61,7 @@
 my @mandatory = qw/findService retrieveService
 retrieveResourceURLs retrieveServiceProviders retrieveServiceNames
 retrieveServiceTypes retrieveObjectNames retrieveObjectDefinition
-retrieveNamespaces retrieveObjectSchema Relationships/;
+retrieveNamespaces Relationships/;
 
 my @mandatory_if_write_access = qw/registerObjectClass deregisterObjectClass 
 registerServiceType deregisterServiceType 
@@ -80,6 +80,12 @@
 can_ok($C, @optional_recommended)
   or diag("Registry does not supply certain optional methods;\n"
 	  . "you should consider adding them");
+
+TODO: {
+  local $TODO = "Method 'retrieveObjectSchema yet to be implemented";
+  can_ok($C, "retrieveObjectSchema")
+    or diag("Registry should be able to return Object Schema");
+}
 ################## MOBY Registration Tests #################
 
 ##################    OBJECT REGISTRATION    #############
@@ -154,11 +160,8 @@
   or diag("Relationships didn't return a hashref for object types") ;
 isa_ok( $r->{'isa'}, 'ARRAY') 
   or diag("Relationships didn't return a hash of arrayrefs");
-TODO: {
-  local $TODO = "Objects don't correctly prepend LSID";
-  is(shift @{$r->{'isa'}}, "Object") 
-    or diag("Relationships(objectType) doesn't have the right parentage.");
-}
+is(shift @{$r->{'isa'}}, "Object") 
+  or diag("Relationships(objectType) doesn't have the right parentage.");
 
 $r = $C->Relationships(serviceType => $ServiceType{serviceType});
 isa_ok($r, "HASH", "Relationship types hash") 
@@ -166,12 +169,9 @@
 #print STDERR "\n\n\nkeys ",(keys %rel), "\n\n\n";
 isa_ok($r->{'isa'}, 'ARRAY') 
   or diag("Relationships didn't return a hash of arrayrefs for services");
-TODO: {
-  local $TODO = "Objects don't correctly prepend LSID";
-  is(shift @{$r->{'isa'}}, 
-     $ServiceType{Relationships}->{ISA}->[0])
-    or diag("Relationships (serviceType) doesn't have the right parentage.");
-}
+is(shift @{$r->{'isa'}}, 
+   $ServiceType{Relationships}->{ISA}->[0])
+  or diag("Relationships (serviceType) doesn't have the right parentage.");
 
 #############        SERVICE INSTANCE REGISTRATION      ###########
 # Set up a service registration hash. We'll mess with it piece by piece in the next several tests, 
@@ -498,11 +498,8 @@
 $r = $C->retrieveObjectDefinition(objectType => $Obj{objectType});
 isa_ok($r , "HASH", "Object definition returns hashref")
   or diag("Object definition did not return as a hashref") ;
-TODO: {
-  local $TODO = "Objects don't correctly prepend LSID";
-  is($r->{objectType}, $Obj{objectType}, "Object reporting correct type")
-    or diag("Object definition did not report correct type");
-}
+is($r->{objectType}, $Obj{objectType}, "Object reporting correct type")
+  or diag("Object definition did not report correct type");
 is($r->{description}, $Obj{description},
    "Object reporting correct desccription")
   or diag("Object definition did not report correct desc");
@@ -529,15 +526,12 @@
   or diag("Object didn't return an array of arrays for its ISA relationships");
 isa_ok($hasa, 'ARRAY', "")
   or diag("Object didn't return an array of arrays for its HASA relationships");
-TODO: {
-  local $TODO = "Objects don't correctly prepend LSID prefix";
-  is(${$isa}[0],  $Obj{Relationships}->{ISA}->[0]->[0])  or diag("ISA reporting wrong object type");
-  is(${$isa}[1],  $Obj{Relationships}->{ISA}->[0]->[1])  or diag("ISA reporting wrong object name");
-  is(${$hasa}[0], $Obj{Relationships}->{HASA}->[0]->[0]) or diag("HASA reporting wrong object type");
-  is(${$hasa}[1], $Obj{Relationships}->{HASA}->[0]->[1]) or diag("HASA reporting wrong object name");
-  is($r->{objectLSID}, "urn:lsid:biomoby.org:objectclass:" . $Obj{objectType}) 
-    or diag("Object class LSID reported incorrectly");
-}
+is(${$isa}[0],  $Obj{Relationships}->{ISA}->[0]->[0])  or diag("ISA reporting wrong object type");
+is(${$isa}[1],  $Obj{Relationships}->{ISA}->[0]->[1])  or diag("ISA reporting wrong object name");
+is(${$hasa}[0], $Obj{Relationships}->{HASA}->[0]->[0]) or diag("HASA reporting wrong object type");
+is(${$hasa}[1], $Obj{Relationships}->{HASA}->[0]->[1]) or diag("HASA reporting wrong object name");
+is($r->{objectLSID}, "urn:lsid:biomoby.org:objectclass:" . $Obj{objectType}) 
+  or diag("Object class LSID reported incorrectly");
 
 
 $r = $C->retrieveNamespaces();