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>

diff --git a/tests/lib/ConfigTest.php b/tests/lib/ConfigTest.php
index 109f7471e9611c36b73bf2b93248b9dcfc69c1c4..1d2440d6635844c831c465de54617790863964ee 100644 (file)
--- 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  " .
@@ -81,10 +79,9 @@ class ConfigTest extends TestCase {
                $this->assertEquals($expected, $content);
 
                $this->config->setValue('bar', 'red');
-               $this->config->setValue('apps', array('files', 'gallery'));
-               $expectedConfig['bar'] = 'red';
-               $expectedConfig['apps'] = array('files', 'gallery');
-               $this->assertAttributeEquals($expectedConfig, 'cache', $this->config);
+               $this->config->setValue('apps', ['files', 'gallery']);
+               $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 5fb68fdf258d644177bf00b8e4c7c6a630ecb7ca..d185f73e62c27ffb6842cc4ab6a0b9bc22789051 100644 (file)
--- 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() {