interdiff impossible; taking evasive action reverted: --- b/core/modules/migrate_drupal/tests/fixtures/drupal7.php +++ a/core/modules/migrate_drupal/tests/fixtures/drupal7.php @@ -4288,33 +4288,6 @@ 'mysql_character_set' => 'utf8', )); -$connection->insert('field_data_field_file') -->fields(array( - 'entity_type', - 'bundle', - 'deleted', - 'entity_id', - 'revision_id', - 'language', - 'delta', - 'field_file_fid', - 'field_file_display', - 'field_file_description', -)) -->values(array( - 'entity_type' => 'node', - 'bundle' => 'test_content_type', - 'deleted' => '0', - 'entity_id' => '1', - 'revision_id' => '1', - 'language' => 'und', - 'delta' => '0', - 'field_file_fid' => '1', - 'field_file_display' => '1', - 'field_file_description' => 'Some description', -)) -->execute(); - $connection->schema()->createTable('field_data_field_float', array( 'fields' => array( 'entity_type' => array( @@ -6050,33 +6023,6 @@ 'mysql_character_set' => 'utf8', )); -$connection->insert('field_revision_field_file') -->fields(array( - 'entity_type', - 'bundle', - 'deleted', - 'entity_id', - 'revision_id', - 'language', - 'delta', - 'field_file_fid', - 'field_file_display', - 'field_file_description', -)) -->values(array( - 'entity_type' => 'node', - 'bundle' => 'test_content_type', - 'deleted' => '0', - 'entity_id' => '1', - 'revision_id' => '1', - 'language' => 'und', - 'delta' => '0', - 'field_file_fid' => '1', - 'field_file_display' => '1', - 'field_file_description' => 'More about regular hexahedrons.', -)) -->execute(); - $connection->schema()->createTable('field_revision_field_float', array( 'fields' => array( 'entity_type' => array( unchanged: --- a/core/modules/migrate_drupal/tests/fixtures/drupal7.php +++ b/core/modules/migrate_drupal/tests/fixtures/drupal7.php @@ -4330,6 +4330,33 @@ 'mysql_character_set' => 'utf8', )); +$connection->insert('field_data_field_file') +->fields(array( + 'entity_type', + 'bundle', + 'deleted', + 'entity_id', + 'revision_id', + 'language', + 'delta', + 'field_file_fid', + 'field_file_display', + 'field_file_description', +)) +->values(array( + 'entity_type' => 'node', + 'bundle' => 'test_content_type', + 'deleted' => '0', + 'entity_id' => '1', + 'revision_id' => '1', + 'language' => 'und', + 'delta' => '0', + 'field_file_fid' => '2', + 'field_file_display' => '1', + 'field_file_description' => 'file desc', +)) +->execute(); + $connection->schema()->createTable('field_data_field_float', array( 'fields' => array( 'entity_type' => array( @@ -6065,6 +6092,33 @@ 'mysql_character_set' => 'utf8', )); +$connection->insert('field_revision_field_file') +->fields(array( + 'entity_type', + 'bundle', + 'deleted', + 'entity_id', + 'revision_id', + 'language', + 'delta', + 'field_file_fid', + 'field_file_display', + 'field_file_description', +)) +->values(array( + 'entity_type' => 'node', + 'bundle' => 'test_content_type', + 'deleted' => '0', + 'entity_id' => '1', + 'revision_id' => '1', + 'language' => 'und', + 'delta' => '0', + 'field_file_fid' => '2', + 'field_file_display' => '1', + 'field_file_description' => 'file desc', +)) +->execute(); + $connection->schema()->createTable('field_revision_field_float', array( 'fields' => array( 'entity_type' => array( @@ -7337,6 +7391,13 @@ 'module' => 'file', 'type' => 'node', 'id' => '1', + 'count' => '2', +)) +->values(array( + 'fid' => '2', + 'module' => 'file', + 'type' => 'node', + 'id' => '1', 'count' => '1', )) ->execute(); diff -u b/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php b/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php --- b/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php +++ b/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php @@ -113,7 +113,7 @@ protected function assertRevision($id, $title, $uid, $log, $timestamp) { $revision = \Drupal::entityManager()->getStorage('node')->loadRevision($id); $this->assertTrue($revision instanceof NodeInterface); - $this->assertIdentical($title, $revision->getTitle()); + $this->assertIdentical($title, $revision->getTitle()); $this->assertIdentical($uid, $revision->getRevisionAuthor()->id()); $this->assertIdentical($log, $revision->revision_log->value); $this->assertIdentical($timestamp, $revision->getRevisionCreationTime()); @@ -135,8 +135,8 @@ $this->assertIdentical('Some more text', $node->field_text_list[0]->value); $this->assertIdentical('7', $node->field_integer_list[0]->value); $this->assertIdentical('qwerty', $node->field_text->value); - $this->assertIdentical('1', $node->field_file->target_id); - $this->assertIdentical('More about regular hexahedrons.', $node->field_file->description); + $this->assertIdentical('2', $node->field_file->target_id); + $this->assertIdentical('file desc', $node->field_file->description); $this->assertTrue($node->field_file->display); $this->assertIdentical('1', $node->field_images->target_id); $this->assertIdentical('alt text', $node->field_images->alt);