Merge branch 'master' into master-civimail-abtest

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

diff --git a/tests/phpunit/api/v3/GroupOrganizationTest.php b/tests/phpunit/api/v3/GroupOrganizationTest.php
index 2efe9a9a89cd0434334ef39a3c21f6b5716ccfd8..349ddd86d02a5d6094b66d56ee54382a7b8d56f4 100644 (file)
--- a/tests/phpunit/api/v3/GroupOrganizationTest.php
+++ b/tests/phpunit/api/v3/GroupOrganizationTest.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -36,6 +36,9 @@ require_once 'CiviTest/CiviUnitTestCase.php';
 class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
   protected $_apiversion;
 
+  /**
+   * @return array
+   */
   function get_info() {
     return array(
       'name' => 'Group Organization',
@@ -99,17 +102,18 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
    * Test civicrm_group_organization_get with group_id.
    */
   public function testGroupOrganizationGetWithGroupId() {
-
-    $params = array(
+    $createParams = array(
       'organization_id' => $this->_orgID,
-      'group_id' => $this->_groupID,      'sequential' => 1,
+      'group_id' => $this->_groupID,
     );
-    $result = $this->callAPISuccess('group_organization', 'create', $params);
+    $createResult = $this->callAPISuccess('group_organization', 'create', $createParams);
 
-    $paramsGet = array('organization_id' => $result['values'][0]['organization_id']);
-
-    $result = $this->callAPISuccess('group_organization', 'get', $params);
-    $this->assertAPISuccess($result);
+    $getParams = array(
+      'group_id' => $this->_groupID,
+      'sequential' => 1,
+    );
+    $getResult = $this->callAPISuccess('group_organization', 'get', $getParams);
+    $this->assertEquals($createResult['values'], $getResult['values'][0]);
   }
 
   /**
@@ -145,7 +149,7 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
   ///////////////// civicrm_group_organization_create methods
 
   /**
-   * check with valid params
+   * Check with valid params
    */
   public function testGroupOrganizationCreate() {
     $params = array(
@@ -166,7 +170,7 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
     $this->assertEquals($result['values'], $result2['values']);
   }
   /**
-   * check with empty params array
+   * Check with empty params array
    */
   public function testGroupOrganizationCreateWithEmptyParams() {
     $params = array(    );
@@ -175,7 +179,7 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
   }
 
   /**
-   * check with invalid params
+   * Check with invalid params
    */
   public function testGroupOrganizationCreateParamsNotArray() {
     $params = 'group_org';
@@ -184,7 +188,7 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
   }
 
   /**
-   * check with invalid params keys
+   * Check with invalid params keys
    */
   public function testGroupOrganizationCreateWithInvalidKeys() {
     $params = array(