From 57735992cfcbb74da4490c1ce925edd972ae71ea Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 15 Jun 2020 13:03:37 +0100
Subject: [PATCH] Issue #3139402 by mondrake, sja112, xjm: Replace usages of
AssertLegacyTrait::assertIdenticalObject(), which is deprecated
---
.../tests/src/Kernel/TempStoreDatabaseTest.php | 14 +++++++-------
.../DatabaseStorageExpirableTest.php | 18 +++++++++---------
.../Core/KeyValueStore/StorageTestBase.php | 18 +++++++++---------
.../Core/TempStore/TempStoreDatabaseTest.php | 14 +++++++-------
4 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/core/modules/user/tests/src/Kernel/TempStoreDatabaseTest.php b/core/modules/user/tests/src/Kernel/TempStoreDatabaseTest.php
index 5a41180276dc..318bbe098cb1 100644
--- a/core/modules/user/tests/src/Kernel/TempStoreDatabaseTest.php
+++ b/core/modules/user/tests/src/Kernel/TempStoreDatabaseTest.php
@@ -96,24 +96,24 @@ public function testUserTempStore() {
$this->assertEqual(!$i, $stores[0]->setIfNotExists($key, $this->objects[$i]));
$metadata = $stores[0]->getMetadata($key);
$this->assertEqual($users[0], $metadata->owner);
- $this->assertIdenticalObject($this->objects[0], $stores[0]->get($key));
+ $this->assertEquals($this->objects[0], $stores[0]->get($key));
// Another user should get the same result.
$metadata = $stores[1]->getMetadata($key);
$this->assertEqual($users[0], $metadata->owner);
- $this->assertIdenticalObject($this->objects[0], $stores[1]->get($key));
+ $this->assertEquals($this->objects[0], $stores[1]->get($key));
}
// Remove the item and try to set it again.
$stores[0]->delete($key);
$stores[0]->setIfNotExists($key, $this->objects[1]);
// This time it should succeed.
- $this->assertIdenticalObject($this->objects[1], $stores[0]->get($key));
+ $this->assertEquals($this->objects[1], $stores[0]->get($key));
// This user can update the object.
$stores[0]->set($key, $this->objects[2]);
- $this->assertIdenticalObject($this->objects[2], $stores[0]->get($key));
+ $this->assertEquals($this->objects[2], $stores[0]->get($key));
// The object is the same when another user loads it.
- $this->assertIdenticalObject($this->objects[2], $stores[1]->get($key));
+ $this->assertEquals($this->objects[2], $stores[1]->get($key));
// This user should be allowed to get, update, delete.
$this->assertTrue($stores[0]->getIfOwner($key) instanceof \stdClass);
@@ -122,8 +122,8 @@ public function testUserTempStore() {
// Another user can update the object and become the owner.
$stores[1]->set($key, $this->objects[3]);
- $this->assertIdenticalObject($this->objects[3], $stores[0]->get($key));
- $this->assertIdenticalObject($this->objects[3], $stores[1]->get($key));
+ $this->assertEquals($this->objects[3], $stores[0]->get($key));
+ $this->assertEquals($this->objects[3], $stores[1]->get($key));
$metadata = $stores[1]->getMetadata($key);
$this->assertEqual($users[1], $metadata->owner);
diff --git a/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php b/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php
index e87abcb84608..23d1f00afe66 100644
--- a/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php
+++ b/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php
@@ -44,20 +44,20 @@ public function testCRUDWithExpiration() {
// Verify that an item can be stored with setWithExpire().
// Use a random expiration in each test.
$stores[0]->setWithExpire('foo', $this->objects[0], rand(500, 100000));
- $this->assertIdenticalObject($this->objects[0], $stores[0]->get('foo'));
+ $this->assertEquals($this->objects[0], $stores[0]->get('foo'));
// Verify that the other collection is not affected.
$this->assertNull($stores[1]->get('foo'));
// Verify that an item can be updated with setWithExpire().
$stores[0]->setWithExpire('foo', $this->objects[1], rand(500, 100000));
- $this->assertIdenticalObject($this->objects[1], $stores[0]->get('foo'));
+ $this->assertEquals($this->objects[1], $stores[0]->get('foo'));
// Verify that the other collection is still not affected.
$this->assertNull($stores[1]->get('foo'));
// Verify that the expirable data key is unique.
$stores[1]->setWithExpire('foo', $this->objects[2], rand(500, 100000));
- $this->assertIdenticalObject($this->objects[1], $stores[0]->get('foo'));
- $this->assertIdenticalObject($this->objects[2], $stores[1]->get('foo'));
+ $this->assertEquals($this->objects[1], $stores[0]->get('foo'));
+ $this->assertEquals($this->objects[2], $stores[1]->get('foo'));
// Verify that multiple items can be stored with setMultipleWithExpire().
$values = [
@@ -67,11 +67,11 @@ public function testCRUDWithExpiration() {
$stores[0]->setMultipleWithExpire($values, rand(500, 100000));
$result = $stores[0]->getMultiple(['foo', 'bar']);
foreach ($values as $j => $value) {
- $this->assertIdenticalObject($value, $result[$j]);
+ $this->assertEquals($value, $result[$j]);
}
// Verify that the other collection was not affected.
- $this->assertIdenticalObject($stores[1]->get('foo'), $this->objects[2]);
+ $this->assertEquals($this->objects[2], $stores[1]->get('foo'));
$this->assertNull($stores[1]->get('bar'));
// Verify that all items in a collection can be retrieved.
@@ -93,7 +93,7 @@ public function testCRUDWithExpiration() {
$this->assertNull($stores[0]->get('bar'));
$this->assertEmpty($stores[0]->getMultiple(['foo', 'bar']));
// Verify that the item in the other collection still exists.
- $this->assertIdenticalObject($this->objects[5], $stores[1]->get('foo'));
+ $this->assertEquals($this->objects[5], $stores[1]->get('foo'));
// Test that setWithExpireIfNotExists() succeeds only the first time.
$key = $this->randomMachineName();
@@ -101,7 +101,7 @@ public function testCRUDWithExpiration() {
// setWithExpireIfNotExists() should be TRUE the first time (when $i is
// 0) and FALSE the second time (when $i is 1).
$this->assertEqual(!$i, $stores[0]->setWithExpireIfNotExists($key, $this->objects[$i], rand(500, 100000)));
- $this->assertIdenticalObject($this->objects[0], $stores[0]->get($key));
+ $this->assertEquals($this->objects[0], $stores[0]->get($key));
// Verify that the other collection is not affected.
$this->assertNull($stores[1]->get($key));
}
@@ -110,7 +110,7 @@ public function testCRUDWithExpiration() {
$stores[0]->delete($key);
$stores[0]->setWithExpireIfNotExists($key, $this->objects[1], rand(500, 100000));
// This time it should succeed.
- $this->assertIdenticalObject($this->objects[1], $stores[0]->get($key));
+ $this->assertEquals($this->objects[1], $stores[0]->get($key));
// Verify that the other collection is still not affected.
$this->assertNull($stores[1]->get($key));
diff --git a/core/tests/Drupal/KernelTests/Core/KeyValueStore/StorageTestBase.php b/core/tests/Drupal/KernelTests/Core/KeyValueStore/StorageTestBase.php
index c7ba82478e7d..78e6ca83f30d 100644
--- a/core/tests/Drupal/KernelTests/Core/KeyValueStore/StorageTestBase.php
+++ b/core/tests/Drupal/KernelTests/Core/KeyValueStore/StorageTestBase.php
@@ -54,21 +54,21 @@ public function testCRUD() {
// Verify that an item can be stored.
$stores[0]->set('foo', $this->objects[0]);
$this->assertTrue($stores[0]->has('foo'));
- $this->assertIdenticalObject($this->objects[0], $stores[0]->get('foo'));
+ $this->assertEquals($this->objects[0], $stores[0]->get('foo'));
// Verify that the other collection is not affected.
$this->assertFalse($stores[1]->has('foo'));
$this->assertNull($stores[1]->get('foo'));
// Verify that an item can be updated.
$stores[0]->set('foo', $this->objects[1]);
- $this->assertIdenticalObject($this->objects[1], $stores[0]->get('foo'));
+ $this->assertEquals($this->objects[1], $stores[0]->get('foo'));
// Verify that the other collection is still not affected.
$this->assertNull($stores[1]->get('foo'));
// Verify that a collection/name pair is unique.
$stores[1]->set('foo', $this->objects[2]);
- $this->assertIdenticalObject($this->objects[1], $stores[0]->get('foo'));
- $this->assertIdenticalObject($this->objects[2], $stores[1]->get('foo'));
+ $this->assertEquals($this->objects[1], $stores[0]->get('foo'));
+ $this->assertEquals($this->objects[2], $stores[1]->get('foo'));
// Verify that an item can be deleted.
$stores[0]->delete('foo');
@@ -77,7 +77,7 @@ public function testCRUD() {
// Verify that the other collection is not affected.
$this->assertTrue($stores[1]->has('foo'));
- $this->assertIdenticalObject($this->objects[2], $stores[1]->get('foo'));
+ $this->assertEquals($this->objects[2], $stores[1]->get('foo'));
$stores[1]->delete('foo');
$this->assertNull($stores[1]->get('foo'));
@@ -91,7 +91,7 @@ public function testCRUD() {
// Verify that multiple items can be retrieved.
$result = $stores[0]->getMultiple(['foo', 'bar']);
foreach ($values as $j => $value) {
- $this->assertIdenticalObject($value, $result[$j]);
+ $this->assertEquals($value, $result[$j]);
}
// Verify that the other collection was not affected.
@@ -119,7 +119,7 @@ public function testCRUD() {
// Verify that deleting no items does not cause an error.
$stores[0]->deleteMultiple([]);
// Verify that the item in the other collection still exists.
- $this->assertIdenticalObject($this->objects[5], $stores[1]->get('foo'));
+ $this->assertEquals($this->objects[5], $stores[1]->get('foo'));
}
@@ -163,7 +163,7 @@ public function testSetIfNotExists() {
// setIfNotExists() should be TRUE the first time (when $i is 0) and
// FALSE the second time (when $i is 1).
$this->assertEqual(!$i, $stores[0]->setIfNotExists($key, $this->objects[$i]));
- $this->assertIdenticalObject($this->objects[0], $stores[0]->get($key));
+ $this->assertEquals($this->objects[0], $stores[0]->get($key));
// Verify that the other collection is not affected.
$this->assertNull($stores[1]->get($key));
}
@@ -172,7 +172,7 @@ public function testSetIfNotExists() {
$stores[0]->delete($key);
$stores[0]->setIfNotExists($key, $this->objects[1]);
// This time it should succeed.
- $this->assertIdenticalObject($this->objects[1], $stores[0]->get($key));
+ $this->assertEquals($this->objects[1], $stores[0]->get($key));
// Verify that the other collection is still not affected.
$this->assertNull($stores[1]->get($key));
}
diff --git a/core/tests/Drupal/KernelTests/Core/TempStore/TempStoreDatabaseTest.php b/core/tests/Drupal/KernelTests/Core/TempStore/TempStoreDatabaseTest.php
index b4c8a4000ef1..da24101dcee2 100644
--- a/core/tests/Drupal/KernelTests/Core/TempStore/TempStoreDatabaseTest.php
+++ b/core/tests/Drupal/KernelTests/Core/TempStore/TempStoreDatabaseTest.php
@@ -87,24 +87,24 @@ public function testSharedTempStore() {
$this->assertEqual(!$i, $stores[0]->setIfNotExists($key, $this->objects[$i]));
$metadata = $stores[0]->getMetadata($key);
$this->assertEqual($users[0], $metadata->getOwnerId());
- $this->assertIdenticalObject($this->objects[0], $stores[0]->get($key));
+ $this->assertEquals($this->objects[0], $stores[0]->get($key));
// Another user should get the same result.
$metadata = $stores[1]->getMetadata($key);
$this->assertEqual($users[0], $metadata->getOwnerId());
- $this->assertIdenticalObject($this->objects[0], $stores[1]->get($key));
+ $this->assertEquals($this->objects[0], $stores[1]->get($key));
}
// Remove the item and try to set it again.
$stores[0]->delete($key);
$stores[0]->setIfNotExists($key, $this->objects[1]);
// This time it should succeed.
- $this->assertIdenticalObject($this->objects[1], $stores[0]->get($key));
+ $this->assertEquals($this->objects[1], $stores[0]->get($key));
// This user can update the object.
$stores[0]->set($key, $this->objects[2]);
- $this->assertIdenticalObject($this->objects[2], $stores[0]->get($key));
+ $this->assertEquals($this->objects[2], $stores[0]->get($key));
// The object is the same when another user loads it.
- $this->assertIdenticalObject($this->objects[2], $stores[1]->get($key));
+ $this->assertEquals($this->objects[2], $stores[1]->get($key));
// This user should be allowed to get, update, delete.
$this->assertInstanceOf(\stdClass::class, $stores[0]->getIfOwner($key));
@@ -113,8 +113,8 @@ public function testSharedTempStore() {
// Another user can update the object and become the owner.
$stores[1]->set($key, $this->objects[3]);
- $this->assertIdenticalObject($this->objects[3], $stores[0]->get($key));
- $this->assertIdenticalObject($this->objects[3], $stores[1]->get($key));
+ $this->assertEquals($this->objects[3], $stores[0]->get($key));
+ $this->assertEquals($this->objects[3], $stores[1]->get($key));
$metadata = $stores[1]->getMetadata($key);
$this->assertEqual($users[1], $metadata->getOwnerId());
--
GitLab