Pull merge.

[yaffs-website] / web / core / modules / content_translation / tests / src / Kernel / Migrate / d6 / MigrateTaxonomyTermTranslationTest.php

diff --git a/web/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php b/web/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php
index 57d7ccc5cfcbf16bb4b06e933e7fe6f15aad30f5..1baf584efe01333b26aa04cef3780e1dc97430d8 100644 (file)
--- a/web/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php
+++ b/web/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php
@@ -20,6 +20,8 @@ class MigrateTaxonomyTermTranslationTest extends MigrateDrupal6TestBase {
     'content_translation',
     'language',
     'menu_ui',
+    // Required for translation migrations.
+    'migrate_drupal_multilingual',
     'node',
     'taxonomy',
   ];
@@ -78,7 +80,7 @@ class MigrateTaxonomyTermTranslationTest extends MigrateDrupal6TestBase {
     $this->assertInstanceOf(TermInterface::class, $entity);
     $this->assertSame($expected_language, $entity->language()->getId());
     $this->assertSame($expected_label, $entity->label());
-    $this->assertSame($expected_vid, $entity->getVocabularyId());
+    $this->assertSame($expected_vid, $entity->bundle());
     $this->assertSame($expected_description, $entity->getDescription());
     $this->assertSame($expected_format, $entity->getFormat());
     $this->assertSame($expected_weight, $entity->getWeight());
@@ -106,7 +108,12 @@ class MigrateTaxonomyTermTranslationTest extends MigrateDrupal6TestBase {
 
     $this->assertArrayHasKey($tid, $this->treeData[$vid], "Term $tid exists in taxonomy tree");
     $term = $this->treeData[$vid][$tid];
-    $this->assertEquals($parent_ids, array_filter($term->parents), "Term $tid has correct parents in taxonomy tree");
+    // PostgreSQL, MySQL and SQLite may not return the parent terms in the same
+    // order so sort before testing.
+    sort($parent_ids);
+    $actual_terms = array_filter($term->parents);
+    sort($actual_terms);
+    $this->assertEquals($parent_ids, $actual_terms, "Term $tid has correct parents in taxonomy tree");
   }
 
   /**