From ff4e03a80cfbfbc4bc6c16608992012a50092c9d Mon Sep 17 00:00:00 2001
From: Michiel Dethmers <git@phplist.com>
Date: Thu, 19 Nov 2015 13:11:01 +0000
Subject: [PATCH] update some tests with the new method names, although
 restapi_test should be retired

---
 plugins/restapi_test/main.php                 | 39 +++++++------------
 .../restapi_test/phplist_restapi_helper.php   | 26 ++++++-------
 2 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/plugins/restapi_test/main.php b/plugins/restapi_test/main.php
index 5bf1e57..6a8ca78 100644
--- a/plugins/restapi_test/main.php
+++ b/plugins/restapi_test/main.php
@@ -289,50 +289,50 @@
 
     ?>
 
-    <h2>Step <?php echo $step++; ?> - Create a message</h2>
+    <h2>Step <?php echo $step++; ?> - Create a campaign</h2>
     <?php
 
-    $result = $api->messageAdd('Test API from plugin', $admin_address, $admin_address, 'TEST API', 'TEST API', $template_id, date('Y-m-d H:i:s'));
+    $result = $api->campaignAdd('Test API from plugin', $admin_address, $admin_address, 'TEST API', 'TEST API', $template_id, date('Y-m-d H:i:s'));
     if ($result->status != 'success') {
         echo $result->data->message;
 
         return;
     }
     $message_id = $result->data->id;
-    echo 'Message created (ID='.$message_id.').';
+    echo 'campaign created (ID='.$message_id.').';
 
     ?>
 
-    <h2>Step <?php echo $step++; ?> - Update message</h2>
+    <h2>Step <?php echo $step++; ?> - Update campaign</h2>
     <?php
 
-    $result = $api->messageUpdate($message_id, 'Test API from plugin updated '.date('Y-m-d H:i:s'), $admin_address, $admin_address, 'TEST API', 'TEST API', $template_id, date('Y-m-d H:i:s'), 'submitted', $subscriber_id);
-    if ($result->status != 'success') {
-        echo $result->data->message;
+    //$result = $api->campaignUpdate($message_id, 'Test API from plugin updated '.date('Y-m-d H:i:s'), $admin_address, $admin_address, 'TEST API', 'TEST API', $template_id, date('Y-m-d H:i:s'), 'submitted', $subscriber_id);
+    //if ($result->status != 'success') {
+        //echo $result->data->message;
 
-        return;
-    }
-    echo 'Message updated and submitted (ID='.$result->data->id.').';
+        //return;
+    //}
+    //echo 'Campaign updated and submitted (ID='.$result->data->id.').';
 
     ?>
 
-    <h2>Step <?php echo $step++; ?> - Messages count</h2>
+    <h2>Step <?php echo $step++; ?> - Campaigns count</h2>
     <?php
 
-    $result = $api->messagesGet();
+    $result = $api->campaignsGet();
     if ($result->status != 'success') {
         echo $result->data->message;
 
         return;
     }
-    echo 'Messages in phpList: '.count($result->data).'.';
+    echo 'Campaigns in phpList: '.count($result->data).'.';
 
     ?>
 
-    <h2>Step <?php echo $step++; ?> - Assign message to list</h2>
+    <h2>Step <?php echo $step++; ?> - Assign campaign to list</h2>
     <?php
 
-    $result = $api->listMessageAdd($list_id, $message_id);
+    $result = $api->listCampaignAdd($list_id, $message_id);
     if ($result->status != 'success') {
         echo $result->data->message;
 
@@ -341,15 +341,6 @@
     echo 'Message assigned to the created list.';
     ?>
 
-    <h2>Step <?php echo $step++; ?> - Process Queue</h2>
-    <?php
-
-    $result = $api->processQueue($login, $password, true);
-
-    sleep(5);
-
-    ?>
-
     <h2>Step <?php echo $step++; ?> - Unassign subscriber from list</h2>
     <?php
 
diff --git a/plugins/restapi_test/phplist_restapi_helper.php b/plugins/restapi_test/phplist_restapi_helper.php
index 98fe246..cdb7b36 100644
--- a/plugins/restapi_test/phplist_restapi_helper.php
+++ b/plugins/restapi_test/phplist_restapi_helper.php
@@ -195,16 +195,16 @@ public function listSubscriberDelete($list_id, $subscriber_id)
         return $result;
     }
 
-    public function listMessageAdd($list_id, $message_id)
+    public function listCampaignAdd($list_id, $message_id)
     {
 
         //Post Data
         $post_params = array(
             'list_id'    => $list_id,
-            'message_id' => $message_id,
+            'campaign_id' => $message_id,
         );
 
-        $result = $this->callAPI('listMessageAdd', $post_params);
+        $result = $this->callAPI('listCampaignAdd', $post_params);
 
         return $result;
     }
@@ -215,10 +215,10 @@ public function listMessageDelete($list_id, $message_id)
         //Post Data
         $post_params = array(
             'list_id'    => $list_id,
-            'message_id' => $message_id,
+            'campaign_id' => $message_id,
         );
 
-        $result = $this->callAPI('listMessageDelete', $post_params);
+        $result = $this->callAPI('listCampaignDelete', $post_params);
 
         return $result;
     }
@@ -403,7 +403,7 @@ public function templateDelete($id)
      * Messages
      ************************************************************/
 
-    public function messageGet($id)
+    public function campaignGet($id)
     {
 
         //Post Data
@@ -411,24 +411,24 @@ public function messageGet($id)
             'id' => $id,
         );
 
-        $result = $this->callAPI('messageGet', $post_params);
+        $result = $this->callAPI('campaignGet', $post_params);
 
         return $result;
     }
 
-    public function messagesGet()
+    public function campaignsGet()
     {
 
         //Post Data
         $post_params = array(
         );
 
-        $result = $this->callAPI('messagesGet', $post_params);
+        $result = $this->callAPI('campaignsGet', $post_params);
 
         return $result;
     }
 
-    public function messageAdd($subject, $fromfield, $replyto, $message, $textmessage, $template, $embargo, $status = 'draft', $owner = 0, $sendformat = 'HTML', $footer = '', $rsstemplate = '')
+    public function campaignAdd($subject, $fromfield, $replyto, $message, $textmessage, $template, $embargo, $status = 'draft', $owner = 0, $sendformat = 'HTML', $footer = '', $rsstemplate = '')
     {
 
         //Post Data
@@ -447,12 +447,12 @@ public function messageAdd($subject, $fromfield, $replyto, $message, $textmessag
             'owner'       => $owner,
         );
 
-        $result = $this->callAPI('messageAdd', $post_params);
+        $result = $this->callAPI('campaignAdd', $post_params);
 
         return $result;
     }
 
-    public function messageUpdate($id, $subject, $fromfield, $replyto, $message, $textmessage, $template, $embargo, $status = 'draft', $owner = 0, $sendformat = 'HTML', $footer = '', $rsstemplate = '')
+    public function campaignUpdate($id, $subject, $fromfield, $replyto, $message, $textmessage, $template, $embargo, $status = 'draft', $owner = 0, $sendformat = 'HTML', $footer = '', $rsstemplate = '')
     {
 
         //Post Data
@@ -472,7 +472,7 @@ public function messageUpdate($id, $subject, $fromfield, $replyto, $message, $te
             'owner'       => $owner,
         );
 
-        $result = $this->callAPI('messageUpdate', $post_params);
+        $result = $this->callAPI('campaignUpdate', $post_params);
 
         return $result;
     }