From c6b559dafc62dc184e131e7065b639b4e31865fd Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 8 Jun 2018 13:57:17 +1200
Subject: [PATCH] Add unit test for CRM_Core_BAO_CustomField::getCustomFieldID

---
 .../phpunit/CRM/Core/BAO/CustomFieldTest.php  | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php b/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php
index b796d27352cd..49dc922318e2 100644
--- a/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php
+++ b/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php
@@ -6,19 +6,14 @@
  */
 class CRM_Core_BAO_CustomFieldTest extends CiviUnitTestCase {
 
+  protected $customFieldID;
+
   public function setUp() {
     parent::setUp();
   }
 
   public function testCreateCustomField() {
-    $customGroup = $this->customGroupCreate(array('extends' => 'Individual'));
-    $fields = array(
-      'label' => 'testFld',
-      'data_type' => 'String',
-      'html_type' => 'Text',
-      'custom_group_id' => $customGroup['id'],
-    );
-    CRM_Core_BAO_CustomField::create($fields);
+    $customGroup = $this->createCustomField();
     $customFieldID = $this->assertDBNotNull('CRM_Core_DAO_CustomField', $customGroup['id'], 'id', 'custom_group_id',
       'Database check for created CustomField.'
     );
@@ -336,4 +331,32 @@ public function testMoveField() {
     $this->customGroupDelete($groupB['id']);
   }
 
+  /**
+   * Test get custom field id function.
+   */
+  public function testGetCustomFieldID() {
+    $this->createCustomField();
+    $fieldID = CRM_Core_BAO_CustomField::getCustomFieldID('testFld');
+    $this->assertEquals($this->customFieldID, $fieldID);
+
+    $fieldID = CRM_Core_BAO_CustomField::getCustomFieldID('testFld', 'new custom group');
+    $this->assertEquals($this->customFieldID, $fieldID);
+  }
+
+  /**
+   * @return array
+   */
+  protected function createCustomField() {
+    $customGroup = $this->customGroupCreate(array('extends' => 'Individual'));
+    $fields = array(
+      'label' => 'testFld',
+      'data_type' => 'String',
+      'html_type' => 'Text',
+      'custom_group_id' => $customGroup['id'],
+    );
+    $field = CRM_Core_BAO_CustomField::create($fields);
+    $this->customFieldID = $field->id;
+    return $customGroup;
+  }
+
 }