From e4144e6b36eb874d73dd6d2282a0ac0f0ee1bd63 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 23 Jul 2020 13:36:49 +0200
Subject: [PATCH] Remove deprecated test of internal attributes via
assertAttributeEquals
See https://github.com/sebastianbergmann/phpunit/issues/3339#issuecomment-428843322
It is seen as bad practice to test internal stuff of objects instead of the actual input and output of mathod calls.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
tests/lib/ConfigTest.php | 22 ++++++++--------------
tests/lib/DB/DBSchemaTest.php | 4 ++--
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/tests/lib/ConfigTest.php b/tests/lib/ConfigTest.php
index aa6c50528cc..d360d115824 100644
--- a/tests/lib/ConfigTest.php
+++ b/tests/lib/ConfigTest.php
@@ -71,9 +71,7 @@ class ConfigTest extends TestCase {
public function testSetValue() {
$this->config->setValue('foo', 'moo');
- $expectedConfig = $this->initialConfig;
- $expectedConfig['foo'] = 'moo';
- $this->assertAttributeEquals($expectedConfig, 'cache', $this->config);
+ $this->assertSame('moo', $this->config->getValue('foo'));
$content = file_get_contents($this->configFile);
$expected = "<?php\n\$CONFIG = array (\n 'foo' => 'moo',\n 'beers' => \n array (\n 0 => 'Appenzeller',\n " .
@@ -82,9 +80,8 @@ class ConfigTest extends TestCase {
$this->config->setValue('bar', 'red');
$this->config->setValue('apps', ['files', 'gallery']);
- $expectedConfig['bar'] = 'red';
- $expectedConfig['apps'] = ['files', 'gallery'];
- $this->assertAttributeEquals($expectedConfig, 'cache', $this->config);
+ $this->assertSame('red', $this->config->getValue('bar'));
+ $this->assertSame(['files', 'gallery'], $this->config->getValue('apps'));
$content = file_get_contents($this->configFile);
@@ -105,7 +102,8 @@ class ConfigTest extends TestCase {
'not_exists' => null,
]);
- $this->assertAttributeEquals($this->initialConfig, 'cache', $this->config);
+ $this->assertSame('bar', $this->config->getValue('foo'));
+ $this->assertSame(null, $this->config->getValue('not_exists'));
$content = file_get_contents($this->configFile);
$this->assertEquals(self::TESTCONTENT, $content);
@@ -113,10 +111,8 @@ class ConfigTest extends TestCase {
'foo' => 'moo',
'alcohol_free' => null,
]);
- $expectedConfig = $this->initialConfig;
- $expectedConfig['foo'] = 'moo';
- unset($expectedConfig['alcohol_free']);
- $this->assertAttributeEquals($expectedConfig, 'cache', $this->config);
+ $this->assertSame('moo', $this->config->getValue('foo'));
+ $this->assertSame(null, $this->config->getValue('not_exists'));
$content = file_get_contents($this->configFile);
$expected = "<?php\n\$CONFIG = array (\n 'foo' => 'moo',\n 'beers' => \n array (\n 0 => 'Appenzeller',\n " .
@@ -126,9 +122,7 @@ class ConfigTest extends TestCase {
public function testDeleteKey() {
$this->config->deleteKey('foo');
- $expectedConfig = $this->initialConfig;
- unset($expectedConfig['foo']);
- $this->assertAttributeEquals($expectedConfig, 'cache', $this->config);
+ $this->assertSame('this_was_clearly_not_set_before', $this->config->getValue('foo', 'this_was_clearly_not_set_before'));
$content = file_get_contents($this->configFile);
$expected = "<?php\n\$CONFIG = array (\n 'beers' => \n array (\n 0 => 'Appenzeller',\n " .
diff --git a/tests/lib/DB/DBSchemaTest.php b/tests/lib/DB/DBSchemaTest.php
index 4b249d07c45..9f575a75da6 100644
--- a/tests/lib/DB/DBSchemaTest.php
+++ b/tests/lib/DB/DBSchemaTest.php
@@ -83,8 +83,8 @@ class DBSchemaTest extends TestCase {
$outfile = $this->tempManager->getTemporaryFile();
OC_DB::getDbStructure($outfile);
$content = file_get_contents($outfile);
- $this->assertContains($this->table1, $content);
- $this->assertContains($this->table2, $content);
+ $this->assertStringContainsString($this->table1, $content);
+ $this->assertStringContainsString($this->table2, $content);
}
public function doTestSchemaRemoving() {
--
GitLab