renamed set of cds functions

[curl-de-sac.git] / webtest / cds_test01.php

diff --git a/webtest/cds_test01.php b/webtest/cds_test01.php
index ed005fc..58d1f7c 100755 (executable)
--- a/webtest/cds_test01.php
+++ b/webtest/cds_test01.php
@@ -8,9 +8,9 @@ require_once('Obj/curl-de-sac.phh');
 class short_cmd extends CDS_cmd {
     var $short_data;
 
-    function short_cmd($ch, $cmd_cls, $short_data)
+    function short_cmd($cmd_cls, $ch, $short_data)
     {
-        parent::__construct($ch, $cmd_cls);
+        parent::__construct($cmd_cls, $ch);
         $this->short_data = $short_data;
     }
 }
@@ -49,9 +49,9 @@ class short_cmd_cls extends CDS_cmd_cls {
 class long_cmd extends CDS_cmd {
     var $long_data;
 
-    function long_cmd($ch, $cmd_cls, $long_data)
+    function long_cmd($cmd_cls, $ch, $long_data)
     {
-        parent::__construct($ch, $cmd_cls);
+        parent::__construct($cmd_cls, $ch);
         $this->long_data = $long_data;
     }
 }
@@ -98,7 +98,7 @@ function main()
 
     // registrer cds_cmd 1
     printf("Register CLS1\n");
-    if (($cds->cmd_register($cmd_cls1)) == FALSE) {
+    if (($cds->cmd_cls_register($cmd_cls1)) == FALSE) {
         fprintf(STDERR, "cmd_cls1 registration failed\n");
         exit(1);
     }
@@ -108,21 +108,21 @@ function main()
 
     // register cds_cmd 2
     printf("Register CLS2\n");
-    if (($cds->cmd_register($cmd_cls2)) == FALSE) {
+    if (($cds->cmd_cls_register($cmd_cls2)) == FALSE) {
         fprintf(STDERR, "cmd_cls2 registration failed\n");
         exit(2);
     }
 
     // register cds_cmd 2 (retry)
     printf("Re-register CLS2 (must go wrong)\n");
-    if (($cds->cmd_register($cmd_cls2)) != FALSE) {
+    if (($cds->cmd_cls_register($cmd_cls2)) != FALSE) {
         fprintf(STDERR, "cmd_cls2 re-registration success\n");
         exit(3);
     }
 
     print_r($cds);
     printf("Deregister CLS2\n");
-    if (($cds->cmd_deregister($cmd_cls2)) == FALSE) {
+    if (($cds->cmd_cls_deregister($cmd_cls2)) == FALSE) {
         fprintf(STDERR, "cmd_cls2 deregistration failed\n");
         exit(4);
     }
@@ -130,24 +130,24 @@ function main()
 
     // re-re-register cds_cmd 2
     printf("Re-re-register CLS2\n");
-    if (($cds->cmd_register($cmd_cls2)) == FALSE) {
+    if (($cds->cmd_cls_register($cmd_cls2)) == FALSE) {
         fprintf(STDERR, "cmd_cls2 re-re-registration failed\n");
         exit(5);
     }
 
     printf("Deregister all\n");
-    $cds->cmd_deregister_all();
+    $cds->cmd_cls_deregister_all();
 
     // registrer cds_cmd 1
     printf("Register CLS1\n");
-    if (($cds->cmd_register($cmd_cls1)) == FALSE) {
+    if (($cds->cmd_cls_register($cmd_cls1)) == FALSE) {
         fprintf(STDERR, "cmd_cls1 registration failed\n");
         exit(1);
     }
 
     // register cds_cmd 2
     printf("Register CLS2\n");
-    if (($cds->cmd_register($cmd_cls2)) == FALSE) {
+    if (($cds->cmd_cls_register($cmd_cls2)) == FALSE) {
         fprintf(STDERR, "cmd_cls2 registration failed\n");
         exit(2);
     }