From 05da268ad5ae61ffbadd328a3337e304b5462a94 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 17 Aug 2022 00:08:45 -0700
Subject: [PATCH] SchemaTest - Update multilingual helper calls

---
 tests/phpunit/CRM/Core/I18n/SchemaTest.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/phpunit/CRM/Core/I18n/SchemaTest.php b/tests/phpunit/CRM/Core/I18n/SchemaTest.php
index 4949047ac9..daaa49a937 100644
--- a/tests/phpunit/CRM/Core/I18n/SchemaTest.php
+++ b/tests/phpunit/CRM/Core/I18n/SchemaTest.php
@@ -32,7 +32,7 @@ class CRM_Core_I18n_SchemaTest extends CiviUnitTestCase {
   }
 
   public function tearDown(): void {
-    CRM_Core_I18n_Schema::makeSinglelingual('en_US');
+    $this->disableMultilingual();
     parent::tearDown();
   }
 
@@ -44,7 +44,7 @@ class CRM_Core_I18n_SchemaTest extends CiviUnitTestCase {
    * @throws \CRM_Core_Exception
    */
   public function testI18nSchemaRewrite($table, $expectedRewrite) {
-    CRM_Core_I18n_Schema::makeMultilingual('en_US');
+    $this->enableMultilingual();
     $domains = $this->callAPISuccess('Domain', 'get')['values'];
     $this->assertGreaterThan(1, count($domains));
     foreach ($domains as $domain) {
@@ -106,7 +106,7 @@ class CRM_Core_I18n_SchemaTest extends CiviUnitTestCase {
   }
 
   public function testSchemaBuild() {
-    CRM_Core_I18n_Schema::makeMultilingual('en_US');
+    $this->enableMultilingual();
     $inUseCollation = CRM_Core_BAO_SchemaHandler::getInUseCollation();
     $testCreateTable = CRM_Core_DAO::executeQuery("show create table civicrm_price_set", [], TRUE, NULL, FALSE, FALSE);
     while ($testCreateTable->fetch()) {
@@ -116,8 +116,7 @@ class CRM_Core_I18n_SchemaTest extends CiviUnitTestCase {
   }
 
   public function testMultilingualCustomFieldCreation() {
-    $this->enableMultilingual();
-    CRM_Core_I18n_Schema::addLocale('fr_CA', 'en_US');
+    $this->enableMultilingual(['en_US' => 'fr_CA']);
     $id = $this->customGroupCreate()['id'];
     $this->customFieldCreate(['custom_group_id' => $id]);
   }
-- 
2.25.1