Action schedule API modifications

[civicrm-core.git] / tests / phpunit / api / v3 / MailingGroupTest.php

diff --git a/tests/phpunit/api/v3/MailingGroupTest.php b/tests/phpunit/api/v3/MailingGroupTest.php
index bd20a11c526feacc400659e0b6d604c335a806ae..6d614a631390f7b4b163fac7b883faba0e8e94a7 100644 (file)
--- a/tests/phpunit/api/v3/MailingGroupTest.php
+++ b/tests/phpunit/api/v3/MailingGroupTest.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
-| CiviCRM version 4.3                                                |
+| CiviCRM version 4.4                                                |
 +--------------------------------------------------------------------+
 | Copyright CiviCRM LLC (c) 2004-2013                                |
 +--------------------------------------------------------------------+
@@ -36,7 +36,8 @@ class api_v3_MailingGroupTest extends CiviUnitTestCase {
   protected $_groupID;
   protected $_email;
   protected $_apiversion;
-  public $_eNoticeCompliant = FALSE;
+  public $_eNoticeCompliant = TRUE;
+
   function get_info() {
     return array(
       'name' => 'Mailer Group',
@@ -48,8 +49,8 @@ class api_v3_MailingGroupTest extends CiviUnitTestCase {
   function setUp() {
     parent::setUp();
     $this->_apiversion = 3;
-    $this->_groupID    = $this->groupCreate(NULL);
-    $this->_email      = 'test@test.test';
+    $this->_groupID = $this->groupCreate(NULL);
+    $this->_email = 'test@test.test';
   }
 
   function tearDown() {
@@ -65,7 +66,8 @@ class api_v3_MailingGroupTest extends CiviUnitTestCase {
     $params = array(
       'email' => $this->_email,
       'group_id' => 'Wrong Group ID',
-      'contact_id' => '2121',      'time_stamp' => '20111111010101',
+      'contact_id' => '2121',
+      'time_stamp' => '20111111010101',
       'hash' => 'sasa',
     );
     $result = $this->callAPIFailure('mailing_event_subscribe', 'create', $params);
@@ -85,17 +87,19 @@ class api_v3_MailingGroupTest extends CiviUnitTestCase {
       'first_name' => 'Test',
       'last_name' => 'Test',
       'email' => $this->_email,
-      'contact_type' => 'Individual',    );
+      'contact_type' => 'Individual',
+    );
     $contactID = $this->individualCreate($params);
 
     $params = array(
       'email' => $this->_email,
       'group_id' => $this->_groupID,
-      'contact_id' => $contactID,      'hash' => 'b15de8b64e2cec34',
+      'contact_id' => $contactID,
+      'hash' => 'b15de8b64e2cec34',
       'time_stamp' => '20101212121212',
     );
     $result = $this->callAPIAndDocument('mailing_event_subscribe', 'create', $params, __FUNCTION__, __FILE__);
-    $this->assertEquals($result['values']['contact_id'], $contactID);
+    $this->assertEquals($result['values'][$result['id']]['contact_id'], $contactID);
 
     $this->contactDelete($contactID);
   }
@@ -109,7 +113,8 @@ class api_v3_MailingGroupTest extends CiviUnitTestCase {
     $params = array(
       'job_id' => 'Wrong ID',
       'event_queue_id' => 'Wrong ID',
-      'hash' => 'Wrong Hash',      'time_stamp' => '20101212121212',
+      'hash' => 'Wrong Hash',
+      'time_stamp' => '20101212121212',
     );
 
     $result = $this->callAPIFailure('mailing_event_unsubscribe', 'create', $params);
@@ -126,14 +131,14 @@ class api_v3_MailingGroupTest extends CiviUnitTestCase {
       'job_id' => 'Wrong ID',
       'event_queue_id' => 'Wrong ID',
       'hash' => 'Wrong Hash',
-      'org_unsubscribe' => 1,      'time_stamp' => '20101212121212',
+      'org_unsubscribe' => 1,
+      'time_stamp' => '20101212121212',
     );
 
     $result = $this->callAPIFailure('mailing_event_unsubscribe', 'create', $params);
     $this->assertEquals($result['error_message'], 'Domain Queue event could not be found', 'In line ' . __LINE__);
   }
 
-
   //----------- civicrm_mailing_group_event_resubscribe methods--------
 
   /**
@@ -148,7 +153,8 @@ class api_v3_MailingGroupTest extends CiviUnitTestCase {
       'job_id' => 'Wrong ID',
       'event_queue_id' => 'Wrong ID',
       'hash' => 'Wrong Hash',
-      'org_unsubscribe' => 'test',      'time_stamp' => '20101212121212',
+      'org_unsubscribe' => 'test',
+      'time_stamp' => '20101212121212',
     );
     $result = $this->callAPIFailure('mailing_event_resubscribe', 'create', $params);
     $this->assertEquals($result['error_message'], 'Queue event could not be found', 'In line ' . __LINE__);
@@ -164,31 +170,30 @@ class api_v3_MailingGroupTest extends CiviUnitTestCase {
       'first_name' => 'Test',
       'last_name' => 'Test',
       'email' => $this->_email,
-      'contact_type' => 'Individual',    );
+      'contact_type' => 'Individual',
+    );
     $contactID = $this->individualCreate($params);
 
     $params = array(
       'email' => $this->_email,
       'group_id' => $this->_groupID,
-      'contact_id' => $contactID,      'hash' => 'b15de8b64e2cec34',
+      'contact_id' => $contactID,
+      'hash' => 'b15de8b64e2cec34',
       'time_stamp' => '20101212121212',
     );
     $result = $this->callAPISuccess('mailing_event_subscribe', 'create', $params);
 
-    $this->assertAPISuccess($result, 'in line ' . __LINE__);
-    $this->assertEquals($result['values']['contact_id'], $contactID);
+    $this->assertEquals($result['values'][$result['id']]['contact_id'], $contactID);
 
     $params = array(
-      'contact_id' => $result['values']['contact_id'],
-      'subscribe_id' => $result['values']['subscribe_id'],
-      'hash' => $result['values']['hash'],      'time_stamp' => '20101212121212',
-      'event_subscribe_id' => $result['values']['subscribe_id'],
+      'contact_id' => $result['values'][$result['id']]['contact_id'],
+      'subscribe_id' => $result['values'][$result['id']]['subscribe_id'],
+      'hash' => $result['values'][$result['id']]['hash'],
+      'time_stamp' => '20101212121212',
+      'event_subscribe_id' => $result['values'][$result['id']]['subscribe_id'],
     );
 
-
     $result = $this->callAPISuccess('mailing_event_confirm', 'create', $params);
-
-    $this->assertAPISuccess($result, 'in line ' . __LINE__);
     $this->contactDelete($contactID);
   }
 }