Skip to content
Snippets Groups Projects
Commit fe1542c1 authored by Yas Naoi's avatar Yas Naoi Committed by Yas Naoi
Browse files

Issue #3219225 by yas: Use $this->assertEquals() instead of AssertLegacyTrait::assertEqual()

parent 32c23471
No related branches found
No related tags found
No related merge requests found
......@@ -45,8 +45,8 @@ class CloudCostStorageTest extends CloudBudgetTestBase {
->getStorage('cloud_cost_storage')
->loadByProperties([]);
foreach ($entities as $entity) {
$this->assertEqual($entity->getPayer(), $add[$count]['payer']);
$this->assertEqual($entity->getCost(), $add[$count]['cost']);
$this->assertEquals($entity->getPayer(), $add[$count]['payer']);
$this->assertEquals($entity->getCost(), $add[$count]['cost']);
$count += 1;
}
......@@ -57,7 +57,7 @@ class CloudCostStorageTest extends CloudBudgetTestBase {
$entities = \Drupal::entityTypeManager()
->getStorage('cloud_cost_storage')
->loadByProperties([]);
$this->assertEqual(empty($entities), TRUE);
$this->assertEquals(empty($entities), TRUE);
}
}
......@@ -308,7 +308,7 @@ class K8sCloudStoreTest extends K8sTestBase {
]);
// Assertion.
$this->assertEqual(count($cost_entities), 0);
$this->assertEquals(count($cost_entities), 0);
// To access to check.
$this->drupalGet('/clouds/design/store/k8s_namespace_resource_store');
......@@ -337,7 +337,7 @@ class K8sCloudStoreTest extends K8sTestBase {
]);
// Assertion.
$this->assertEqual(count($resource_entities), 1);
$this->assertEquals(count($resource_entities), 1);
// To access to check.
$this->drupalGet('/clouds/design/store/k8s_namespace_resource_store');
......@@ -373,7 +373,7 @@ class K8sCloudStoreTest extends K8sTestBase {
]);
// Assertion.
$this->assertEqual(count($cost_entities), 1);
$this->assertEquals(count($cost_entities), 1);
// To access to check.
$this->drupalGet('/clouds/design/store/k8s_cost_store');
......@@ -435,10 +435,10 @@ class K8sCloudStoreTest extends K8sTestBase {
$this->assertSession()->pageTextContains($this->namespace);
// Assertion.
$this->assertEqual(count($cost_entities), 2);
$this->assertEquals(count($cost_entities), 2);
$cost_entity = array_pop($cost_entities);
$cost = $cost_entity->get('field_cost')->value;
$this->assertEqual(round($cost, 3), round($result['cost'], 3));
$this->assertEquals(round($cost, 3), round($result['cost'], 3));
}
/**
......
......@@ -103,10 +103,10 @@ class K8sCloudCostStorageTest extends K8sTestBase {
$result_pod = $k8s_service->getNamespaceResourceUsage($cloud_context, $this->namespace);
$result = $k8s_service->calculateCostPerNamespace($cloud_context, $this->namespace);
$this->assertEqual($result['resources']['cpu_usage'], $result_pod['cpu_usage']);
$this->assertEqual($result['resources']['memory_usage'], $result_pod['memory_usage']);
$this->assertEqual($result['resources']['cpu_capacity'], $result_node['cpu_capacity']);
$this->assertEqual($result['resources']['memory_capacity'], $result_node['memory_capacity']);
$this->assertEquals($result['resources']['cpu_usage'], $result_pod['cpu_usage']);
$this->assertEquals($result['resources']['memory_usage'], $result_pod['memory_usage']);
$this->assertEquals($result['resources']['cpu_capacity'], $result_node['cpu_capacity']);
$this->assertEquals($result['resources']['memory_capacity'], $result_node['memory_capacity']);
// Process item in queue.
$queue_name = 'k8s_update_resources_queue';
......@@ -153,9 +153,9 @@ class K8sCloudCostStorageTest extends K8sTestBase {
$resources = Yaml::decode($entity->get('resources')->value);
}
$this->assertEqual(round($cost, 3), round($result['cost'], 3));
$this->assertEqual(round($resources['cpu_usage'], 3), round($result_pod['cpu_usage'], 3));
$this->assertEqual(round($resources['memory_usage'], 3), round($result_pod['memory_usage'], 3));
$this->assertEquals(round($cost, 3), round($result['cost'], 3));
$this->assertEquals(round($resources['cpu_usage'], 3), round($result_pod['cpu_usage'], 3));
$this->assertEquals(round($resources['memory_usage'], 3), round($result_pod['memory_usage'], 3));
}
/**
......@@ -201,7 +201,7 @@ class K8sCloudCostStorageTest extends K8sTestBase {
->loadByProperties([]);
// Assertion.
$this->assertEqual(count($cost_entities), 0);
$this->assertEquals(count($cost_entities), 0);
// Scenario No.2: If project entity exists and no resource entity,
// it will expect updating resource storage entity.
......@@ -225,7 +225,7 @@ class K8sCloudCostStorageTest extends K8sTestBase {
->loadByProperties([]);
// Assertion.
$this->assertEqual(count($resource_entities), 6);
$this->assertEquals(count($resource_entities), 6);
// Scenario No.3:
// If latest cost storage entity updated within 1 hour exists,
......@@ -254,7 +254,7 @@ class K8sCloudCostStorageTest extends K8sTestBase {
->loadByProperties([]);
// Assertion.
$this->assertEqual(count($cost_entities), 1);
$this->assertEquals(count($cost_entities), 1);
// Scenario No.4:
// If latest cost storage entity updated within 1 hour does not exist,
......@@ -297,10 +297,10 @@ class K8sCloudCostStorageTest extends K8sTestBase {
->loadByProperties([]);
// Assertion.
$this->assertEqual(count($cost_entities), 2);
$this->assertEquals(count($cost_entities), 2);
$cost_entity = array_pop($cost_entities);
$cost = $cost_entity->get('cost')->value;
$this->assertEqual(round($cost, 3), round($result['cost'], 3));
$this->assertEquals(round($cost, 3), round($result['cost'], 3));
}
}
......@@ -153,7 +153,7 @@ class CloudContentEntityTraitTest extends ModuleTestBase {
'@passive_operation' => $passive_operation,
];
$expected = $this->t('The @type %label has been @passive_operation.', $t_args);
$this->assertEqual($this->traitObject->getOperationMessage($entity, $passive_operation), $expected);
$this->assertEquals($this->traitObject->getOperationMessage($entity, $passive_operation), $expected);
// Assert the log message.
$this->traitObject->logOperationMessage($entity, $passive_operation);
......@@ -175,7 +175,7 @@ class CloudContentEntityTraitTest extends ModuleTestBase {
'@passive_operation' => $passive_operation,
];
$expected = $this->t('The @type %label has been @passive_operation.', $t_args);
$this->assertEqual($this->traitObject->getOperationMessage($entity, $passive_operation), $expected);
$this->assertEquals($this->traitObject->getOperationMessage($entity, $passive_operation), $expected);
// Assert the log message.
$this->traitObject->logOperationMessage($entity, $passive_operation);
......@@ -208,7 +208,7 @@ class CloudContentEntityTraitTest extends ModuleTestBase {
];
$expected = $this->t('The @type @label could not be @passive_operation.', $t_args);
$this->assertEqual($this->traitObject->getOperationErrorMessage($entity, $passive_operation), $expected);
$this->assertEquals($this->traitObject->getOperationErrorMessage($entity, $passive_operation), $expected);
// Assert the log message.
$this->traitObject->logOperationErrorMessage($entity, $passive_operation);
......@@ -230,7 +230,7 @@ class CloudContentEntityTraitTest extends ModuleTestBase {
];
$expected = $this->t('The @type %label could not be @passive_operation.', $t_args);
$this->assertEqual($this->traitObject->getOperationErrorMessage($entity, $passive_operation), $expected);
$this->assertEquals($this->traitObject->getOperationErrorMessage($entity, $passive_operation), $expected);
// Assert the log message.
$this->traitObject->logOperationErrorMessage($entity, $passive_operation);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment