From 76c5033a39f70b7a6514271851e1fd4599205b7f Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 7 Dec 2019 09:25:34 +1100
Subject: [PATCH] Add in unit test locking in the fix

---
 .../CRM/Upgrade/Incremental/BaseTest.php      | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tests/phpunit/CRM/Upgrade/Incremental/BaseTest.php b/tests/phpunit/CRM/Upgrade/Incremental/BaseTest.php
index 9510e4f77d..238816045d 100644
--- a/tests/phpunit/CRM/Upgrade/Incremental/BaseTest.php
+++ b/tests/phpunit/CRM/Upgrade/Incremental/BaseTest.php
@@ -488,6 +488,35 @@ class CRM_Upgrade_Incremental_BaseTest extends CiviUnitTestCase {
     $postUpgrade = $this->callAPISuccess('OptionGroup', 'getsingle', ['id' => $optionGroup['id']]);
     $this->assertEquals($fixedName, $postUpgrade['name'], 'Ensure that the spaces have been removed from OptionGroup name');
     $this->assertEquals($postUpgrade['name'], $optionGroup['values'][$optionGroup['id']]['name'], 'Ensure that the fixed name matches what the API would produce');
+    $this->callAPISuccess('OptionGroup', 'delete', ['id' => $optionGroup['id']]);
+  }
+
+  /**
+   * Test that if there is an option group name as the same as the proposed fix name that doesn't cause a hard fail in the upgrade
+   */
+  public function testFixOptionGroupNameWithFixedNameInDatabase() {
+    $name = 'This is a test Name';
+    $fixedName = CRM_Utils_String::titleToVar(strtolower($name));
+    $optionGroup = $this->callAPISuccess('OptionGroup', 'create', [
+      'title' => 'Test Option Group',
+      'name' => $name,
+    ]);
+    // API is hardened to strip the spaces to lets re-add in now
+    CRM_Core_DAO::executeQuery("UPDATE civicrm_option_group SET name = %1 WHERE id = %2", [
+      1 => [$name, 'String'],
+      2 => [$optionGroup['id'], 'Positive'],
+    ]);
+    $optionGroup2 = $this->callAPISuccess('OptionGroup', 'create', [
+      'title' => 'Test Option Group 2',
+      'name' => $name,
+    ]);
+    $preUpgrade = $this->callAPISuccess('OptionGroup', 'getsingle', ['id' => $optionGroup['id']]);
+    $this->assertEquals($name, $preUpgrade['name']);
+    $preUpgrade = $this->callAPISuccess('OptionGroup', 'getsingle', ['id' => $optionGroup2['id']]);
+    $this->assertEquals($fixedName, $preUpgrade['name']);
+    CRM_Upgrade_Incremental_php_FiveTwentyOne::fixOptionGroupName();
+    $this->callAPISuccess('OptionGroup', 'delete', ['id' => $optionGroup['id']]);
+    $this->callAPISuccess('OptionGroup', 'delete', ['id' => $optionGroup2['id']]);
   }
 
 }
-- 
2.25.1