[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Wed Jun 18 12:30:56 EDT 2003
Update of /home/repository/moby/moby-live/Perl/scripts
In directory pub.open-bio.org:/tmp/cvs-serv10984/Perl/scripts

Modified Files:
	testMOBYClientCentral_v05.pl 
Log Message:
error in the code for service registration.  secondary articles always failed due to a badly written test.  Documentation updated, including the new retrieveObjectDefinition method

moby-live/Perl/scripts testMOBYClientCentral_v05.pl,1.3,1.4
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/scripts/testMOBYClientCentral_v05.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- /home/repository/moby/moby-live/Perl/scripts/testMOBYClientCentral_v05.pl	2003/06/10 17:22:06	1.3
+++ /home/repository/moby/moby-live/Perl/scripts/testMOBYClientCentral_v05.pl	2003/06/18 16:30:56	1.4
@@ -124,18 +124,18 @@
     category  =>  "moby",
     URL    =>  "http://illuminae/cgi-bin/service.pl",
 	input =>[
-        [articleName1 => [Object => ['Genbank/GI']]], # Simple
+        ['articleName1', [Object => ['Genbank/GI']]], # Simple
 	        ],
 	output =>[
-        [articleName2 => [String => ['Genbank/GI']]], # Simple
+        ['articleName2', [String => ['Genbank/GI']]], # Simple
 	         ],
 	secondary => {
         parametername1 => {
-            datatype => TYPE,
-    		default => DEFAULT,
-			max => MAX,
-			min => MIN,
-			enum => ['one', 'two']}}), 18, 1);
+            datatype => 'Int',
+    		default => 0,
+			max => 10,
+			min => -10,
+			enum => [-10, 10, 0]}}), 18, 1);
 
 TEST($C->registerService(
     serviceName  => "myfirstservice",  
@@ -146,18 +146,12 @@
     category  =>  "moby",
     URL    =>  "http://illuminae/cgi-bin/service.pl",
 	input =>[
-        [articleName1 => [Object => ['Genbank/GI']]], # Simple
+        ['articleName1', [Object => ['Genbank/GI']]], # Simple
 	        ],
 	output =>[
-        [articleName2 => [String => ['Genbank/GI']]], # Simple
+        ['articleName2', [String => ['Genbank/GI']]], # Simple
 	         ],
-	secondary => {
-        parametername1 => {
-            datatype => TYPE,
-    		default => DEFAULT,
-			max => MAX,
-			min => MIN,
-			enum => ['one', 'two']}}), 19, 0);
+	), 19, 0);
 
 TEST($C->registerService(
     serviceName  => "myfirstservice2",  
@@ -168,18 +162,12 @@
     category  =>  "moby",
     URL    =>  "http://illuminae/cgi-bin/service.pl",
 	input =>[
-        [articleName1 => [[Object => ['Genbank/GI']]]], # Simple
+        ['articleName1', [[Object => ['Genbank/GI']]]], # Simple
 	        ],
 	output =>[
-        [articleName2 => [String => ['Genbank/GI']]], # Simple
+        ['articleName2', [String => ['Genbank/GI']]], # Simple
 	         ],
-	secondary => {
-        parametername1 => {
-            datatype => TYPE,
-    		default => DEFAULT,
-			max => MAX,
-			min => MIN,
-			enum => ['one', 'two']}}), 20, 1);
+	), 20, 1);
 
 TEST($C->deregisterService(
     serviceName  => "myfirstservice2",  
@@ -194,9 +182,9 @@
     authURI      => "www.illuminae.com",      
     ), 23, 1);
 
-TEST($C->deregisterObjectClass(objectType => "YetMoreCrap"), 25, 1);
-TEST($C->deregisterObjectClass(objectType => "TotalCrap"), 24, 1);
-TEST($C->deregisterNamespace(namespaceType =>'Genbank/GI'), 27, 1);
+TEST($C->deregisterObjectClass(objectType => "YetMoreCrap"), 24, 1);
+TEST($C->deregisterObjectClass(objectType => "TotalCrap"), 25, 1);
+TEST($C->deregisterNamespace(namespaceType =>'Genbank/GI'), 26, 1);
 
 exit 0;
 
@@ -223,9 +211,9 @@
 $reg = MOBY::Central->findService($m);
 my $n = grep /authURI\s*\=/, split "<", $reg;
 if ($n == 2){
-    print "test 29\t\t[PASS]\n";
+    print "test 27\t\t[PASS]\n";
 } else {
-    print "test 29\n\n[FAIL]\n$reg\n\n";
+    print "test 27\n\n[FAIL]\n$reg\n\n";
 }
 
 
@@ -254,9 +242,9 @@
 $reg = MOBY::Central->findService($m);
 $n = grep /authURI\s*\=/, split "<", $reg;
 if ($n == 1){
-    print "test 30\t\t[PASS]\n";
+    print "test 28\t\t[PASS]\n";
 } else {
-    print "test 30\n\n[FAIL]\n$reg\n\n";
+    print "test 28\n\n[FAIL]\n$reg\n\n";
 }
 
 
@@ -285,9 +273,9 @@
 $reg = MOBY::Central->findService($m);
 $n = grep /authURI\s*\=/, split "<", $reg;
 if ($n == 0){
-    print "test 31\t\t[PASS]\n";
+    print "test 29\t\t[PASS]\n";
 } else {
-    print "test 31\n\n[FAIL]\n$reg\n\n";
+    print "test 29\n\n[FAIL]\n$reg\n\n";
 }
 
 
@@ -299,7 +287,7 @@
           <serviceName>MyCrappyService</serviceName>
         </deregisterService>};
 # deregister service
-TEST(MOBY::Central->deregisterService($m), 32, 1);
+TEST(MOBY::Central->deregisterService($m), 30, 1);
 
 
 
@@ -309,7 +297,7 @@
           <serviceName>MyCrappyService2</serviceName>
         </deregisterService>};
 # deregister service
-TEST(MOBY::Central->deregisterService($m), 33, 1);
+TEST(MOBY::Central->deregisterService($m), 31, 1);
 
 
 
@@ -317,7 +305,7 @@
            <namespaceType>Genbank:Crap</namespaceType>
         </deregisterNamespace>};
 # deregister unused namespace
-TEST(MOBY::Central->deregisterNamespace($m), 34, 1);
+TEST(MOBY::Central->deregisterNamespace($m), 32, 1);
 
 
 
@@ -327,7 +315,7 @@
 </deregisterObjectClass>
 };
 # deregister unused object class
-TEST(MOBY::Central->deregisterObjectClass($m), 35, 1);
+TEST(MOBY::Central->deregisterObjectClass($m), 33, 1);
 
 
 
@@ -336,7 +324,7 @@
         </deregisterServiceType>
 };
 # deregister unused service type
-TEST(MOBY::Central->deregisterServiceType($m), 36, 1);
+TEST(MOBY::Central->deregisterServiceType($m), 34, 1);
 
 
 $m=q{<deregisterObjectClass>
@@ -344,7 +332,7 @@
 </deregisterObjectClass>
 };
 # deregister unused object class
-TEST(MOBY::Central->deregisterObjectClass($m), 37, 1);
+TEST(MOBY::Central->deregisterObjectClass($m), 35, 1);
 
 
 #