diff --git a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6NodeRevision.php b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6NodeRevision.php index 3ce530e..544f648 100644 --- a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6NodeRevision.php +++ b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6NodeRevision.php @@ -33,7 +33,7 @@ public function load() { 'title' => 'Test title rev 2', 'body' => 'body test rev 2', 'teaser' => 'teaser test rev 2', - 'log' => '', + 'log' => 'modified rev 2', 'timestamp' => 1390095702, 'format' => 1, )) diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php index 3c54080..ddcdce6 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php @@ -43,22 +43,23 @@ protected function setUp() { */ public function testNodeRevision() { $node = \Drupal::entityManager()->getStorage('node')->loadRevision(2); + /** @var \Drupal\node\NodeInterface $node */ $this->assertEqual($node->id(), 1); $this->assertEqual($node->getRevisionId(), 2); $this->assertEqual($node->langcode->value, 'und'); - $this->assertEqual($node->title->value, 'Test title rev 2'); + $this->assertEqual($node->getTitle(), 'Test title rev 2'); $this->assertEqual($node->body->value, 'body test rev 2'); $this->assertEqual($node->body->summary, 'teaser test rev 2'); - $this->assertEqual($node->revision_uid->target_id, 1); - $this->assertEqual($node->revision_log->value, ''); - $this->assertEqual($node->revision_timestamp->value, '1390095702'); + $this->assertEqual($node->getRevisionAuthor()->id(), 1); + $this->assertEqual($node->revision_log->value, 'modified rev 2'); + $this->assertEqual($node->getRevisionCreationTime(), '1390095702'); $node = \Drupal::entityManager()->getStorage('node')->loadRevision(4); $this->assertEqual($node->id(), 1); $this->assertEqual($node->body->value, 'body test rev 3'); - $this->assertEqual($node->revision_uid->target_id, 1); + $this->assertEqual($node->getRevisionAuthor()->id(), 1); $this->assertEqual($node->revision_log->value, 'modified rev 3'); - $this->assertEqual($node->revision_timestamp->value, '1390095703'); + $this->assertEqual($node->getRevisionCreationTime(), '1390095703'); } } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php index c5e9e2c..5bd93c3 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php @@ -48,9 +48,12 @@ public function testNode() { $this->assertEqual($node->getOwnerId(), 1); $this->assertEqual($node->getRevisionCreationTime(), 1390095701, 'Node has the correct revision timestamp.'); + /** @var \Drupal\node\NodeInterface $node_revision */ $node_revision = \Drupal::entityManager()->getStorage('node')->loadRevision(1); - $this->assertEqual($node_revision->revision_uid->target_id, 1, 'Node revision has the correct user'); - $this->assertEqual($node_revision->revision_log->value, '', 'Node revision has the correct log message'); + $this->assertEqual($node_revision->getTitle(), 'Test title'); + $this->assertEqual($node_revision->getRevisionAuthor()->id(), 1, 'Node revision has the correct user'); + // This is empty on the first revision. + $this->assertEqual($node_revision->revision_log->value, ''); // It is pointless to run the second half from MigrateDrupal6Test. if (empty($this->standalone)) { diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTest.php index fab0179..20715ca 100644 --- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTest.php +++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTest.php @@ -40,7 +40,6 @@ class NodeTest extends MigrateSqlSourceTestCase { 'title' => 'node title 1', 'uid' => 1, 'status' => 1, - 'timestamp' => 1279051598, 'created' => 1279051598, 'changed' => 1279051598, 'comment' => 2, @@ -65,7 +64,6 @@ class NodeTest extends MigrateSqlSourceTestCase { 'title' => 'node title 2', 'uid' => 1, 'status' => 1, - 'timestamp' => 1279290908, 'created' => 1279290908, 'changed' => 1279308993, 'comment' => 0, @@ -90,7 +88,6 @@ class NodeTest extends MigrateSqlSourceTestCase { 'title' => 'node title 5', 'uid' => 1, 'status' => 1, - 'timestamp' => 1279290908, 'created' => 1279290908, 'changed' => 1279308993, 'comment' => 0,