[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Fri Jul 29 13:12:49 EDT 2005
Update of /home/repository/moby/moby-live/Perl/t
In directory pub.open-bio.org:/tmp/cvs-serv10610/t

Modified Files:
	Client-Central.t 
Log Message:
fixed test

moby-live/Perl/t Client-Central.t,1.22,1.23
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/t/Client-Central.t,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- /home/repository/moby/moby-live/Perl/t/Client-Central.t	2005/07/29 17:11:04	1.22
+++ /home/repository/moby/moby-live/Perl/t/Client-Central.t	2005/07/29 17:12:49	1.23
@@ -117,6 +117,22 @@
 
 
 
+$r = $C->Relationships(objectType => "Rubbish");
+isa_ok($r, "HASH", "Relationship types hash") or diag("Relationships didn't return a hashref for object types") ;
+%rel= %{$r};
+#print STDERR "\n\n\nkeys ",(keys %rel),"\n\n\n";
+isa_ok($rel{'urn:lsid:biomoby.org:objectrelation:isa'}, "ARRAY") or diag("Relationships didn't return a hash of arrayrefs");
+is(shift(@{$rel{'urn:lsid:biomoby.org:objectrelation:isa'}}), "Object") or diag("Relationships arrayref didn't return the right parentage.");
+
+$r = $C->Relationships(serviceType => "RubbishyService");
+isa_ok($r, "HASH", "Relationship types hash") or diag("Relationships didn't return a hashref for service types") ;
+%rel= %{$r};
+print STDERR "\n\n\nkeys ",(keys %rel),"\n\n\n";
+isa_ok($rel{'urn:lsid:biomoby.org:servicerelation:isa'}, "ARRAY") or diag("Relationships didn't return a hash of arrayrefs for servies");
+is(shift(@{$rel{'urn:lsid:biomoby.org:servicerelation:isa'}}), "Retrieval") or diag("Relationships arrayref didn't return the right parentage for service types.");
+
+
+
 # Test 9  # should fail
 $r = $C->registerService(
     serviceName  => "myfirstservice",  
@@ -411,21 +427,6 @@
 is($on{Rubbish}, "a human-readable description of the object") or diag("object name definition not returned correctly");
 
 
-$r = $C->Relationships(objectType => "Rubbish");
-isa_ok($r, "HASH", "Relationship types hash") or diag("Relationships didn't return a hashref for object types") ;
-%rel= %{$r};
-#print STDERR "\n\n\nkeys ",(keys %rel),"\n\n\n";
-isa_ok($rel{'urn:lsid:biomoby.org:objectrelation:isa'}, "ARRAY") or diag("Relationships didn't return a hash of arrayrefs");
-is(shift(@{$rel{'urn:lsid:biomoby.org:objectrelation:isa'}}), "Object") or diag("Relationships arrayref didn't return the right parentage.");
-
-$r = $C->Relationships(serviceType => "RubbishyService");
-isa_ok($r, "HASH", "Relationship types hash") or diag("Relationships didn't return a hashref for service types") ;
-%rel= %{$r};
-print STDERR "\n\n\nkeys ",(keys %rel),"\n\n\n";
-isa_ok($rel{'urn:lsid:biomoby.org:servicerelation:isa'}, "ARRAY") or diag("Relationships didn't return a hash of arrayrefs for servies");
-is(shift(@{$rel{'urn:lsid:biomoby.org:servicerelation:isa'}}), "Retrieval") or diag("Relationships arrayref didn't return the right parentage for service types.");
-
-
 $r = $C->deregisterObjectClass(objectType => "Rubbish");
 ( ok($r->success,"Object deregistration successful")
 ) or diag("Object deregistration failure: ".$r->message) ;