Match setup() functionality of MigrateFileTest with MigratePrivateFileTest

No longer blocked.

index 01fc464..501d9bb 100644
--- a/core/modules/file/tests/src/Kernel/Migrate/d7/FileMigrationSetupTrait.php

--- a/core/modules/file/tests/src/Kernel/Migrate/d7/FileMigrationSetupTrait.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d7/FileMigrationTrait.php

Contrib uses this trait. Moving it will break them. We need to add a BC layer, or don't rename.

All feedback addressed.

+++ b/core/modules/file/tests/src/Kernel/Migrate/d7/FileMigrationSetupTrait.php
@@ -11,27 +11,88 @@
   /**
+   * The path of the file to be migrated.
+   *
+   * @var string
+   */
+  protected $path = 'public://sites/default/files/cube.jpeg';
+
+  /**
+   * The size of the file to be migrated.
+   *
+   * @var string
+   */
+  protected $size = '3620';
+
+  /**
+   * The base path of the file to be migrated.
+   *
+   * @var string
+   */
+  protected $base_path = 'public://';
+
+  /**
+   * The plugin ID of the migration to use.
+   *
+   * @var string
+   */
+  protected $plugin_id = 'd7_file';

I've stared at this for a while and what confuses me is why these default settings for the public are on the common trait. It doesn't really make sense. The trait could have abstract methods to get these things so that tests know they need to set them in order to use it.

I thought about it for a second, but we could easily do something else during implementation to make the file paths, etc different if we have more than a single file in a test. That's an implementation detail. So, back to RTBC.

+++ b/core/modules/file/tests/src/Kernel/Migrate/d7/FileMigrationSetupTrait.php
@@ -11,27 +11,92 @@
+  abstract protected function getPath();
...
+  abstract protected function getFileSize();
...
+  abstract protected function getBasePath();
...
+  abstract protected function getPluginId();

+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
@@ -72,6 +73,34 @@ protected function setUp() {
+  protected function getPath() {
...
+  protected function getBasePath() {
...
+  protected function getPluginId() {

Looking at how this has worked out. I think we need to add File to these names. I'm also tempted to suggest coalescing these methods into a getFileMigrationInfo() method that returns a keyed array of 'path', 'size', 'base_path', and 'plugin_id'. That way the trait is a little bit less "add-all-the-methods" and it is easier to grok that this is all related.

+++ b/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileTest.php
@@ -22,51 +23,27 @@ class MigrateFileTest extends MigrateDrupal7TestBase {
-    $this->assertEntity(1, 'cube.jpeg', 'public://cube.jpeg', 'image/jpeg', '3620', '1421727515', '1421727515', '1');
+    $info = $this->getFileMigrationInfo();
+    $this->assertEntity(1, basename($info['path']), $info['base_path'] . basename($info['path']), 'image/jpeg', $info['size'], '1421727515', '1421727515', '1');

+++ b/core/modules/file/tests/src/Kernel/Migrate/d7/MigratePrivateFileTest.php
@@ -53,46 +50,11 @@ public function register(ContainerBuilder $container) {
-    $this->assertEntity(3, 'Babylon5.txt', 'private://Babylon5.txt', 'text/plain', '3', '1486104045', '1486104045', '1');
+    $info = $this->getFileMigrationInfo();
+    $this->assertEntity(3, basename($info['path']), $info['base_path'] . basename($info['path']), 'text/plain', $info['size'], '1486104045', '1486104045', '1');

I think the old assertions are better. Being explicit makes it more readable and obvious what is being tested.

Looking good again.

Assigning to self for review

Read through the issue, everything has been addressed. The most recent change was to correct a test failure that happened after the latest RTBC. So, retesting now to be sure it still passes tests.

All good to go back to RTBC.

Committed and pushed 4784ac3d0f to 8.6.x and 19100d948a to 8.5.x. Thanks!