Merge remote-tracking branch 'origin/MC-33069-CE-7' into MC-33069

Author: zakdma

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Workaround/Cleanup/TestCasePropertiesTest.php

@@ -15,17 +15,16 @@ class TestCasePropertiesTest extends \PHPUnit\Framework\TestCase
      * @var array
      */
     protected $_fixtureProperties = [
-        ['name' => 'testPublic', 'is_static' => false],
-        ['name' => '_testPrivate', 'is_static' => false],
-        ['name' => '_testPropertyBoolean', 'is_static' => false],
-        ['name' => '_testPropertyInteger', 'is_static' => false],
-        ['name' => '_testPropertyFloat', 'is_static' => false],
-        ['name' => '_testPropertyString', 'is_static' => false],
-        ['name' => '_testPropertyArray', 'is_static' => false],
-        ['name' => '_testPropertyObject', 'is_static' => false],
-        ['name' => 'testPublicStatic', 'is_static' => true],
-        ['name' => '_testProtectedStatic', 'is_static' => true],
-        ['name' => '_testPrivateStatic', 'is_static' => true],
+        'testPublic' => ['name' => 'testPublic', 'is_static' => false],
+        '_testPrivate' => ['name' => '_testPrivate', 'is_static' => false],
+        '_testPropertyBoolean' => ['name' => '_testPropertyBoolean', 'is_static' => false],
+        '_testPropertyInteger' => ['name' => '_testPropertyInteger', 'is_static' => false],
+        '_testPropertyFloat' => ['name' => '_testPropertyFloat', 'is_static' => false],
+        '_testPropertyString' => ['name' => '_testPropertyString', 'is_static' => false],
+        '_testPropertyArray' => ['name' => '_testPropertyArray', 'is_static' => false],
+        'testPublicStatic' => ['name' => 'testPublicStatic', 'is_static' => true],
+        '_testProtectedStatic' => ['name' => '_testProtectedStatic', 'is_static' => true],
+        '_testPrivateStatic' => ['name' => '_testPrivateStatic', 'is_static' => true],
     ];
 
     public function testEndTestSuiteDestruct()
@@ -39,26 +38,25 @@ public function testEndTestSuiteDestruct()
         /** @var $testClass \Magento\Test\Workaround\Cleanup\TestCasePropertiesTest\DummyTestCase */
         $testClass = $testSuite->testAt(0);
 
-        $propertyObjectMock = $this->createPartialMock(\stdClass::class, ['__destruct']);
-        $propertyObjectMock->expects($this->atLeastOnce())->method('__destruct');
-        $testClass->setPropertyObject($propertyObjectMock);
-
-        foreach ($this->_fixtureProperties as $property) {
-            if ($property['is_static']) {
-                $this->assertAttributeNotEmpty($property['name'], get_class($testClass));
-            } else {
-                $this->assertAttributeNotEmpty($property['name'], $testClass);
+        $reflectionClass = new \ReflectionClass($testClass);
+        $classProperties = $reflectionClass->getProperties();
+        $fixturePropertiesNames = array_keys($this->_fixtureProperties);
+        foreach ($classProperties as $property) {
+            if (in_array($property->getName(), $fixturePropertiesNames)) {
+                $property->setAccessible(true);
+                $value = $property->getValue($testClass);
+                $this->assertNotNull($value);
             }
         }
 
         $clearProperties = new \Magento\TestFramework\Workaround\Cleanup\TestCaseProperties();
         $clearProperties->endTestSuite($testSuite);
 
-        foreach ($this->_fixtureProperties as $property) {
-            if ($property['is_static']) {
-                $this->assertAttributeEmpty($property['name'], get_class($testClass));
-            } else {
-                $this->assertAttributeEmpty($property['name'], $testClass);
+        foreach ($classProperties as $property) {
+            if (in_array($property->getName(), $fixturePropertiesNames)) {
+                $property->setAccessible(true);
+                $value = $property->getValue($testClass);
+                $this->assertNull($value);
             }
         }
     }