Use new checkPermissions shorthand in api calls

[civicrm-core.git] / tests / phpunit / api / v4 / Action / CustomValueTest.php

diff --git a/tests/phpunit/api/v4/Action/CustomValueTest.php b/tests/phpunit/api/v4/Action/CustomValueTest.php
index 9713ee1cf8736cc15c8745219bddfbcf48d5443e..8247f59794803cae1c8dcbc282f72da7ea507751 100644 (file)
--- a/tests/phpunit/api/v4/Action/CustomValueTest.php
+++ b/tests/phpunit/api/v4/Action/CustomValueTest.php
@@ -44,42 +44,37 @@ class CustomValueTest extends BaseCustomValueTest {
     $multiField = uniqid('chkbx');
     $textField = uniqid('txt');
 
-    $customGroup = CustomGroup::create()
-      ->setCheckPermissions(FALSE)
+    $customGroup = CustomGroup::create(FALSE)
       ->addValue('name', $group)
       ->addValue('extends', 'Contact')
       ->addValue('is_multiple', TRUE)
       ->execute()
       ->first();
 
-    CustomField::create()
-      ->setCheckPermissions(FALSE)
+    CustomField::create(FALSE)
       ->addValue('label', $colorField)
-      ->addValue('options', $optionValues)
+      ->addValue('option_values', $optionValues)
       ->addValue('custom_group_id', $customGroup['id'])
       ->addValue('html_type', 'Select')
       ->addValue('data_type', 'String')
       ->execute();
 
-    CustomField::create()
-      ->setCheckPermissions(FALSE)
+    CustomField::create(FALSE)
       ->addValue('label', $multiField)
-      ->addValue('options', $optionValues)
+      ->addValue('option_values', $optionValues)
       ->addValue('custom_group_id', $customGroup['id'])
       ->addValue('html_type', 'CheckBox')
       ->addValue('data_type', 'String')
       ->execute();
 
-    CustomField::create()
-      ->setCheckPermissions(FALSE)
+    CustomField::create(FALSE)
       ->addValue('label', $textField)
       ->addValue('custom_group_id', $customGroup['id'])
       ->addValue('html_type', 'Text')
       ->addValue('data_type', 'String')
       ->execute();
 
-    $this->contactID = Contact::create()
-      ->setCheckPermissions(FALSE)
+    $this->contactID = Contact::create(FALSE)
       ->addValue('first_name', 'Johann')
       ->addValue('last_name', 'Tester')
       ->addValue('contact_type', 'Individual')
@@ -87,7 +82,7 @@ class CustomValueTest extends BaseCustomValueTest {
       ->first()['id'];
 
     // Retrieve and check the fields of CustomValue = Custom_$group
-    $fields = CustomValue::getFields($group)->execute();
+    $fields = CustomValue::getFields($group)->setLoadOptions(TRUE)->setCheckPermissions(FALSE)->execute();
     $expectedResult = [
       [
         'custom_group' => $group,
@@ -97,6 +92,7 @@ class CustomValueTest extends BaseCustomValueTest {
         'data_type' => 'String',
         'fk_entity' => NULL,
         'serialize' => NULL,
+        'options' => $optionValues,
       ],
       [
         'custom_group' => $group,
@@ -106,6 +102,7 @@ class CustomValueTest extends BaseCustomValueTest {
         'data_type' => 'String',
         'fk_entity' => NULL,
         'serialize' => 1,
+        'options' => $optionValues,
       ],
       [
         'custom_group' => $group,
@@ -149,19 +146,24 @@ class CustomValueTest extends BaseCustomValueTest {
       ->addValue("entity_id", $this->contactID)
       ->execute();
     // fetch custom values using API4 CustomValue::get
-    $result = CustomValue::get($group)->execute();
+    $result = CustomValue::get($group)
+      ->addSelect('id', 'entity_id', $colorField, $colorField . ':label')
+      ->addOrderBy($colorField, 'DESC')
+      ->execute();
 
     // check if two custom values are created
     $this->assertEquals(2, count($result));
     $expectedResult = [
       [
-        'id' => 1,
-        $colorField => 'g',
+        'id' => 2,
+        $colorField => 'r',
+        $colorField . ':label' => 'Red',
         'entity_id' => $this->contactID,
       ],
       [
-        'id' => 2,
-        $colorField => 'r',
+        'id' => 1,
+        $colorField => 'g',
+        $colorField . ':label' => 'Green',
         'entity_id' => $this->contactID,
       ],
     ];
@@ -176,7 +178,7 @@ class CustomValueTest extends BaseCustomValueTest {
     // Update a records whose id is 1 and change the custom field (name = Color) value to 'Blue' from 'Green'
     CustomValue::update($group)
       ->addWhere("id", "=", 1)
-      ->addValue($colorField, 'b')
+      ->addValue($colorField . ':label', 'Blue')
       ->execute();
 
     // ensure that the value is changed for id = 1
@@ -188,8 +190,7 @@ class CustomValueTest extends BaseCustomValueTest {
 
     // CASE 3: Test CustomValue::replace
     // create a second contact which will be used to replace the custom values, created earlier
-    $secondContactID = Contact::create()
-      ->setCheckPermissions(FALSE)
+    $secondContactID = Contact::create(FALSE)
       ->addValue('first_name', 'Adam')
       ->addValue('last_name', 'Tester')
       ->addValue('contact_type', 'Individual')
@@ -198,19 +199,23 @@ class CustomValueTest extends BaseCustomValueTest {
     // Replace all the records which was created earlier with entity_id = first contact
     //  with custom record [$colorField => 'g', 'entity_id' => $secondContactID]
     CustomValue::replace($group)
-      ->setRecords([[$colorField => 'g', $multiField => ['r', 'g'], 'entity_id' => $secondContactID]])
+      ->setRecords([[$colorField => 'g', $multiField . ':label' => ['Red', 'Green'], 'entity_id' => $secondContactID]])
       ->addWhere('entity_id', '=', $this->contactID)
       ->execute();
 
     // Check the two records created earlier is replaced by new contact
-    $result = CustomValue::get($group)->execute();
+    $result = CustomValue::get($group)
+      ->addSelect('id', 'entity_id', $colorField, $colorField . ':label', $multiField, $multiField . ':label')
+      ->execute();
     $this->assertEquals(1, count($result));
 
     $expectedResult = [
       [
         'id' => 3,
         $colorField => 'g',
+        $colorField . ':label' => 'Green',
         $multiField => ['r', 'g'],
+        $multiField . ':label' => ['Red', 'Green'],
         'entity_id' => $secondContactID,
       ],
     ];