--- 3143676-21.patch 2020-09-07 10:48:16.000000000 +0530 +++ 3143676-27.patch 2020-09-07 11:31:53.000000000 +0530 @@ -1,8 +1,8 @@ diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal7.php b/core/modules/migrate_drupal/tests/fixtures/drupal7.php -index ce6569976c..47bc4a4b4c 100644 +index 6203934498..00945e01f0 100644 --- a/core/modules/migrate_drupal/tests/fixtures/drupal7.php +++ b/core/modules/migrate_drupal/tests/fixtures/drupal7.php -@@ -19373,6 +19373,26 @@ +@@ -19707,6 +19707,26 @@ 'objectindex' => '0', 'format' => '', )) @@ -29,7 +29,7 @@ ->execute(); $connection->schema()->createTable('i18n_translation_set', array( 'fields' => array( -@@ -20941,6 +20961,22 @@ +@@ -21315,6 +21335,22 @@ 'plural' => '0', 'i18n_status' => '0', )) @@ -52,7 +52,7 @@ ->execute(); $connection->schema()->createTable('menu_custom', array( 'fields' => array( -@@ -55512,6 +55548,16 @@ +@@ -56789,6 +56825,16 @@ 'language' => 'fr', 'i18n_tsid' => '0', )) @@ -69,7 +69,7 @@ ->execute(); $connection->schema()->createTable('taxonomy_term_hierarchy', array( 'fields' => array( -@@ -55638,6 +55684,10 @@ +@@ -56915,6 +56961,10 @@ 'tid' => '8', 'parent' => '6', )) @@ -80,7 +80,7 @@ ->execute(); $connection->schema()->createTable('taxonomy_vocabulary', array( 'fields' => array( -@@ -55792,6 +55842,17 @@ +@@ -57069,6 +57119,17 @@ 'language' => 'fr', 'i18n_mode' => '2', )) @@ -99,30 +99,21 @@ $connection->schema()->createTable('tracker_node', array( 'fields' => array( diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php -index 373ddd8efb..619c4fe4d7 100644 +index 4c9353c4c4..33496b1308 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php -@@ -92,7 +92,7 @@ protected function getEntityCounts() { - 'file' => 3, - 'filter_format' => 7, - 'image_style' => 6, -- 'language_content_settings' => 20, -+ 'language_content_settings' => 21, - 'node' => 7, - 'node_type' => 7, - 'rdf_mapping' => 8, -@@ -101,8 +101,8 @@ protected function getEntityCounts() { +@@ -100,8 +100,8 @@ protected function getEntityCounts() { 'shortcut_set' => 2, 'action' => 19, - 'menu' => 6, + 'menu' => 7, - 'taxonomy_term' => 24, - 'taxonomy_vocabulary' => 7, + 'taxonomy_term' => 25, + 'taxonomy_vocabulary' => 8, 'path_alias' => 8, - 'tour' => 5, + 'tour' => 6, 'user' => 4, -@@ -128,7 +128,7 @@ protected function getEntityCountsIncremental() { +@@ -127,7 +127,7 @@ protected function getEntityCountsIncremental() { $counts['file'] = 4; $counts['menu_link_content'] = 13; $counts['node'] = 8; @@ -250,7 +241,7 @@ } diff --git a/core/modules/taxonomy/tests/src/Kernel/Plugin/migrate/source/d7/TermLocalizedTranslationTest.php b/core/modules/taxonomy/tests/src/Kernel/Plugin/migrate/source/d7/TermLocalizedTranslationTest.php -index 7d798a202f..f04788b9da 100644 +index 7d798a202f..d85e9d121b 100644 --- a/core/modules/taxonomy/tests/src/Kernel/Plugin/migrate/source/d7/TermLocalizedTranslationTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Plugin/migrate/source/d7/TermLocalizedTranslationTest.php @@ -100,7 +100,7 @@ public function providerSource() { @@ -286,7 +277,7 @@ 'translation' => 'fr - description value 1', + 'name_translated' => 'fr - name value 1', + 'description_translated' => 'fr - description value 1', - ], ++ ], + ]; + + $tests[0]['expected_count'] = NULL; @@ -303,7 +294,7 @@ + 'property' => 'name', + 'objectindex' => '5', + 'format' => 0, -+ ], + ], + [ + 'lid' => 11, + 'objectid' => 5, @@ -325,7 +316,7 @@ + 'lid' => 11, + 'language' => 'fr', + 'translation' => 'fr - description value 5', -+ 'plid' => 0, ++ 'plid' => 0, + 'plural' => 0, + 'i18n_status' => 0, + ]);