Skip to content

Commit 7e8630a

Browse files
ACQE-9025: Unit test setAccessible deprecation fix
1 parent 52fa06a commit 7e8630a

20 files changed

+0
-61
lines changed

dev/tests/unit/Magento/FunctionalTestFramework/Console/BaseGenerateCommandTest.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,14 @@ protected function tearDown(): void
2828
{
2929
$handler = TestObjectHandler::getInstance();
3030
$testsProperty = new ReflectionProperty(TestObjectHandler::class, 'tests');
31-
$testsProperty->setAccessible(true);
3231
$testsProperty->setValue($handler, []);
3332
$testObjectHandlerProperty = new ReflectionProperty(TestObjectHandler::class, 'testObjectHandler');
34-
$testObjectHandlerProperty->setAccessible(true);
3533
$testObjectHandlerProperty->setValue(null, $handler);
3634

3735
$handler = SuiteObjectHandler::getInstance();
3836
$suiteObjectsProperty = new ReflectionProperty(SuiteObjectHandler::class, 'suiteObjects');
39-
$suiteObjectsProperty->setAccessible(true);
4037
$suiteObjectsProperty->setValue($handler, []);
4138
$suiteObjectHandlerProperty = new ReflectionProperty(SuiteObjectHandler::class, 'instance');
42-
$suiteObjectHandlerProperty->setAccessible(true);
4339
$suiteObjectHandlerProperty->setValue(null, $handler);
4440
}
4541

@@ -213,33 +209,27 @@ public function mockHandlers(array $testArray, array $suiteArray): void
213209
// bypass the initTestData method
214210
$testObjectHandlerClass = new ReflectionClass(TestObjectHandler::class);
215211
$constructor = $testObjectHandlerClass->getConstructor();
216-
$constructor->setAccessible(true);
217212
$testObjectHandlerObject = $testObjectHandlerClass->newInstanceWithoutConstructor();
218213
$constructor->invoke($testObjectHandlerObject);
219214

220215
$testObjectHandlerProperty = new ReflectionProperty(TestObjectHandler::class, 'testObjectHandler');
221-
$testObjectHandlerProperty->setAccessible(true);
222216
$testObjectHandlerProperty->setValue(null, $testObjectHandlerObject);
223217

224218
$handler = TestObjectHandler::getInstance();
225219
$property = new ReflectionProperty(TestObjectHandler::class, 'tests');
226-
$property->setAccessible(true);
227220
$property->setValue($handler, $testArray);
228221

229222
// bypass the initTestData method
230223
$suiteObjectHandlerClass = new ReflectionClass(SuiteObjectHandler::class);
231224
$constructor = $suiteObjectHandlerClass->getConstructor();
232-
$constructor->setAccessible(true);
233225
$suiteObjectHandlerObject = $suiteObjectHandlerClass->newInstanceWithoutConstructor();
234226
$constructor->invoke($suiteObjectHandlerObject);
235227

236228
$suiteObjectHandlerProperty = new ReflectionProperty(SuiteObjectHandler::class, 'instance');
237-
$suiteObjectHandlerProperty->setAccessible(true);
238229
$suiteObjectHandlerProperty->setValue(null, $suiteObjectHandlerObject);
239230

240231
$handler = SuiteObjectHandler::getInstance();
241232
$property = new ReflectionProperty(SuiteObjectHandler::class, 'suiteObjects');
242-
$property->setAccessible(true);
243233
$property->setValue($handler, $suiteArray);
244234
}
245235

@@ -256,7 +246,6 @@ public function callTestConfig(array $testArray): string
256246
$command = new BaseGenerateCommand();
257247
$class = new ReflectionClass($command);
258248
$method = $class->getMethod('getTestAndSuiteConfiguration');
259-
$method->setAccessible(true);
260249

261250
return $method->invokeArgs($command, [$testArray]);
262251
}
@@ -274,7 +263,6 @@ public function callGroupConfig(array $groupArray): string
274263
$command = new BaseGenerateCommand();
275264
$class = new ReflectionClass($command);
276265
$method = $class->getMethod('getGroupAndSuiteConfiguration');
277-
$method->setAccessible(true);
278266

279267
return $method->invokeArgs($command, [$groupArray]);
280268
}

dev/tests/unit/Magento/FunctionalTestFramework/Console/GenerateTestsCommandTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public function testParseConfigParallelOptions($time, $groups, $expected): void
2525
$command = new GenerateTestsCommand();
2626
$class = new \ReflectionClass($command);
2727
$method = $class->getMethod('parseConfigParallelOptions');
28-
$method->setAccessible(true);
2928

3029
if (is_array($expected)) {
3130
$actual = $method->invokeArgs($command, [$time, $groups]);

dev/tests/unit/Magento/FunctionalTestFramework/Console/RunTestFailedCommandTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ private function invokePrivateMethod(&$object, $methodName, array $parameters =
4747
{
4848
$reflection = new \ReflectionClass(get_class($object));
4949
$method = $reflection->getMethod($methodName);
50-
$method->setAccessible(true);
5150
return $method->invokeArgs($object, $parameters);
5251
}
5352

dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Handlers/SecretStorage/AwsSecretsManagerStorageTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public function testEncryptAndDecrypt()
4747
$credentialStorage = new AwsSecretsManagerStorage($testRegion, $testProfile);
4848
$reflection = new ReflectionClass($credentialStorage);
4949
$reflection_property = $reflection->getProperty('client');
50-
$reflection_property->setAccessible(true);
5150
$reflection_property->setValue($credentialStorage, $mockClient);
5251

5352
// Test getEncryptedValue()

dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Handlers/SecretStorage/FileStorageTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@ public function testBasicEncryptDecrypt(): void
3131

3232
// Emulate initialize() function result with the test credentials
3333
$reflectionMethod = $reflection->getMethod('encryptCredFileContents');
34-
$reflectionMethod->setAccessible(true);
3534
$secretData = $reflectionMethod->invokeArgs($fileStorage, [$cred]);
3635

3736
// Set encrypted test credentials to the private 'secretData' property
3837
$reflectionProperty = $reflection->getProperty('secretData');
39-
$reflectionProperty->setAccessible(true);
4038
$reflectionProperty->setValue($fileStorage, $secretData);
4139

4240
$encryptedCred = $fileStorage->getEncryptedValue($testKey);
@@ -67,12 +65,10 @@ public function testEmptyValueEncryptDecrypt(): void
6765

6866
// Emulate initialize() function result with the test credentials
6967
$reflectionMethod = $reflection->getMethod('encryptCredFileContents');
70-
$reflectionMethod->setAccessible(true);
7168
$secretData = $reflectionMethod->invokeArgs($fileStorage, [$cred]);
7269

7370
// Set encrypted test credentials to the private 'secretData' property
7471
$reflectionProperty = $reflection->getProperty('secretData');
75-
$reflectionProperty->setAccessible(true);
7672
$reflectionProperty->setValue($fileStorage, $secretData);
7773

7874
$fileStorage->getEncryptedValue($testKey);

dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Persist/OperationDataArrayResolverTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,6 @@ private function mockDataObjectHandler($childDataObject): void
553553
}
554554

555555
$property = new ReflectionProperty(DataObjectHandler::class, 'INSTANCE');
556-
$property->setAccessible(true);
557556
$property->setValue(null, $instance);
558557
}
559558

@@ -578,7 +577,6 @@ private function mockOperationDefinitionObjectHandler($childOperationDefinition)
578577
}
579578

580579
$property = new ReflectionProperty(OperationDefinitionObjectHandler::class, 'INSTANCE');
581-
$property->setAccessible(true);
582580
$property->setValue(null, $instance);
583581
}
584582
}

dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Util/DataExtensionUtilTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ public function testGetLinkedEntities(): void
136136
private function setMockEntities($mockEntityData): void
137137
{
138138
$property = new ReflectionProperty(DataObjectHandler::class, 'INSTANCE');
139-
$property->setAccessible(true);
140139
$property->setValue(null, null);
141140

142141
$mockDataProfileSchemaParser = $this->createMock(DataProfileSchemaParser::class);
@@ -150,7 +149,6 @@ private function setMockEntities($mockEntityData): void
150149
->willReturn($mockDataProfileSchemaParser);
151150

152151
$property = new ReflectionProperty(ObjectManager::class, 'instance');
153-
$property->setAccessible(true);
154152
$property->setValue(null, $mockObjectManager);
155153
}
156154
}

dev/tests/unit/Magento/FunctionalTestFramework/StaticCheck/AnnotationsCheckTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ public function testValidateRequiredAnnotationsNoError()
5757
$test->expects($this->once())->method('getAnnotations')->willReturn($annotations);
5858

5959
$validateRequiredAnnotations = $this->staticCheckClass->getMethod('validateRequiredAnnotations');
60-
$validateRequiredAnnotations->setAccessible(true);
6160

6261
$validateRequiredAnnotations->invoke($this->staticCheck, $test);
6362
$this->assertEquals($expected, $this->staticCheck->getErrors());
@@ -99,7 +98,6 @@ public function testValidateRequiredAnnotationsMissing()
9998
$test->expects($this->once())->method('getName')->willReturn('AnnotationsCheckTest');
10099

101100
$validateRequiredAnnotations = $this->staticCheckClass->getMethod('validateRequiredAnnotations');
102-
$validateRequiredAnnotations->setAccessible(true);
103101

104102
$validateRequiredAnnotations->invoke($this->staticCheck, $test);
105103
$this->assertEquals($expected, $this->staticCheck->getErrors());
@@ -136,7 +134,6 @@ public function testValidateRequiredAnnotationsMissingNoTestCaseId()
136134
$test->expects($this->once())->method('getName')->willReturn('AnnotationsCheckTest');
137135

138136
$validateRequiredAnnotations = $this->staticCheckClass->getMethod('validateRequiredAnnotations');
139-
$validateRequiredAnnotations->setAccessible(true);
140137

141138
$validateRequiredAnnotations->invoke($this->staticCheck, $test);
142139
$this->assertEquals($expected, $this->staticCheck->getErrors());
@@ -177,7 +174,6 @@ public function testValidateRequiredAnnotationsEmpty()
177174
$test->expects($this->once())->method('getName')->willReturn('AnnotationsCheckTest');
178175

179176
$validateRequiredAnnotations = $this->staticCheckClass->getMethod('validateRequiredAnnotations');
180-
$validateRequiredAnnotations->setAccessible(true);
181177

182178
$validateRequiredAnnotations->invoke($this->staticCheck, $test);
183179
$this->assertEquals($expected, $this->staticCheck->getErrors());

dev/tests/unit/Magento/FunctionalTestFramework/Suite/Handlers/SuiteObjectHandlerTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,10 @@ private function setMockTestAndSuiteParserOutput(array $testData, array $suiteDa
9090
{
9191
// clear test object handler value to inject parsed content
9292
$property = new ReflectionProperty(TestObjectHandler::class, 'testObjectHandler');
93-
$property->setAccessible(true);
9493
$property->setValue(null, null);
9594

9695
// clear suite object handler value to inject parsed content
9796
$property = new ReflectionProperty(SuiteObjectHandler::class, 'instance');
98-
$property->setAccessible(true);
9997
$property->setValue(null, null);
10098

10199
$mockDataParser = $this->createMock(TestDataParser::class);
@@ -128,7 +126,6 @@ function ($clazz) use ($mockDataParser, $mockSuiteDataParser) {
128126
);
129127

130128
$property = new ReflectionProperty(ObjectManager::class, 'instance');
131-
$property->setAccessible(true);
132129
$property->setValue(null, $instance);
133130
}
134131
}

dev/tests/unit/Magento/FunctionalTestFramework/Test/Handlers/TestObjectHandlerTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,6 @@ private function mockTestObjectHandler(array $data, ?array $paths = null): void
393393
}
394394
// clear test object handler value to inject parsed content
395395
$property = new ReflectionProperty(TestObjectHandler::class, 'testObjectHandler');
396-
$property->setAccessible(true);
397396
$property->setValue(null, null);
398397

399398
$mockDataParser = $this->createMock(TestDataParser::class);
@@ -442,12 +441,10 @@ function (
442441
);
443442

444443
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
445-
$objectManagerProperty->setAccessible(true);
446444
$objectManagerProperty->setValue(null, $objectManagerMockInstance);
447445

448446
$resolver = ModuleResolver::getInstance();
449447
$property = new ReflectionProperty(ModuleResolver::class, 'enabledModuleNameAndPaths');
450-
$property->setAccessible(true);
451448
$property->setValue($resolver, $paths);
452449
}
453450

0 commit comments

Comments
 (0)