Skip to content

Commit 38f1ea7

Browse files
sandesh-shivakumarsandesh-shivakumar
committed
Unit test setAccessible deprecation fix
1 parent e4a7ebc commit 38f1ea7

24 files changed

Lines changed: 76 additions & 64 deletions

‎dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Handlers/DataObjectHandlerTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ public function testGetObjectWithDataExtendsItself(): void
324324
private function mockDataObjectHandlerWithData(array $mockData): void
325325
{
326326
$dataObjectHandlerProperty = new ReflectionProperty(DataObjectHandler::class, "INSTANCE");
327-
$dataObjectHandlerProperty->setAccessible(true);
327+
// $dataObjectHandlerProperty->setAccessible(true);
328328
$dataObjectHandlerProperty->setValue(null, null);
329329

330330
$mockDataProfileSchemaParser = $this->createMock(DataProfileSchemaParser::class);
@@ -355,7 +355,7 @@ function (
355355
);
356356

357357
$property = new ReflectionProperty(ObjectManager::class, 'instance');
358-
$property->setAccessible(true);
358+
// $property->setAccessible(true);
359359
$property->setValue(null, $mockObjectManagerInstance);
360360
}
361361

@@ -367,11 +367,11 @@ public static function tearDownAfterClass(): void
367367
parent::tearDownAfterClass();
368368

369369
$dataObjectHandlerProperty = new ReflectionProperty(DataObjectHandler::class, "INSTANCE");
370-
$dataObjectHandlerProperty->setAccessible(true);
370+
// $dataObjectHandlerProperty->setAccessible(true);
371371
$dataObjectHandlerProperty->setValue(null, null);
372372

373373
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
374-
$objectManagerProperty->setAccessible(true);
374+
// $objectManagerProperty->setAccessible(true);
375375
$objectManagerProperty->setValue(null, null);
376376

377377
TestLoggingUtil::getInstance()->clearMockLoggingUtil();

‎dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Handlers/OperationDefinitionObjectHandlerTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ private function mockOperationHandlerWithData(array $mockData): void
506506
OperationDefinitionObjectHandler::class,
507507
'INSTANCE'
508508
);
509-
$operationDefinitionObjectHandlerProperty->setAccessible(true);
509+
// $operationDefinitionObjectHandlerProperty->setAccessible(true);
510510
$operationDefinitionObjectHandlerProperty->setValue(null, null);
511511

512512
$mockOperationParser = $this->createMock(OperationDefinitionParser::class);
@@ -537,7 +537,7 @@ function (
537537
);
538538

539539
$property = new ReflectionProperty(ObjectManager::class, 'instance');
540-
$property->setAccessible(true);
540+
// $property->setAccessible(true);
541541
$property->setValue(null, $mockObjectManagerInstance);
542542
}
543543

@@ -552,11 +552,11 @@ public static function tearDownAfterClass(): void
552552
OperationDefinitionObjectHandler::class,
553553
'INSTANCE'
554554
);
555-
$operationDefinitionObjectHandlerProperty->setAccessible(true);
555+
// $operationDefinitionObjectHandlerProperty->setAccessible(true);
556556
$operationDefinitionObjectHandlerProperty->setValue(null, null);
557557

558558
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
559-
$objectManagerProperty->setAccessible(true);
559+
// $objectManagerProperty->setAccessible(true);
560560
$objectManagerProperty->setValue(null, null);
561561

562562
TestLoggingUtil::getInstance()->clearMockLoggingUtil();

‎dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Handlers/PersistedObjectHandlerTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ public static function entityDataProvider(): array
534534
public function mockCurlHandler(string $response, array $parserOutput): void
535535
{
536536
$dataObjectHandler = new ReflectionProperty(DataObjectHandler::class, 'INSTANCE');
537-
$dataObjectHandler->setAccessible(true);
537+
// $dataObjectHandler->setAccessible(true);
538538
$dataObjectHandler->setValue(null, null);
539539

540540
$dataProfileSchemaParser = $this->createMock(DataProfileSchemaParser::class);
@@ -574,7 +574,7 @@ function ($class, $arguments = []) use ($curlHandler, $objectManager, $dataProfi
574574
);
575575

576576
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
577-
$objectManagerProperty->setAccessible(true);
577+
// $objectManagerProperty->setAccessible(true);
578578
$objectManagerProperty->setValue(null, $objectManagerMockInstance);
579579
}
580580

@@ -589,11 +589,11 @@ public static function tearDownAfterClass(): void
589589

590590
// Clear out Singleton between tests
591591
$persistedObjectHandlerProperty = new ReflectionProperty(PersistedObjectHandler::class, "INSTANCE");
592-
$persistedObjectHandlerProperty->setAccessible(true);
592+
// $persistedObjectHandlerProperty->setAccessible(true);
593593
$persistedObjectHandlerProperty->setValue(null, null);
594594

595595
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
596-
$objectManagerProperty->setAccessible(true);
596+
// $objectManagerProperty->setAccessible(true);
597597
$objectManagerProperty->setValue(null, null);
598598

599599
TestLoggingUtil::getInstance()->clearMockLoggingUtil();

‎dev/tests/unit/Magento/FunctionalTestFramework/Page/Handlers/PageObjectHandlerTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public function testDeprecatedPage(): void
134134
private function mockPageObjectHandlerWithData(array $mockData): void
135135
{
136136
$pageObjectHandlerProperty = new ReflectionProperty(PageObjectHandler::class, 'INSTANCE');
137-
$pageObjectHandlerProperty->setAccessible(true);
137+
// $pageObjectHandlerProperty->setAccessible(true);
138138
$pageObjectHandlerProperty->setValue(null, null);
139139

140140
$mockSectionParser = $this->createMock(PageParser::class);
@@ -165,7 +165,7 @@ function (
165165
);
166166

167167
$property = new ReflectionProperty(ObjectManager::class, 'instance');
168-
$property->setAccessible(true);
168+
// $property->setAccessible(true);
169169
$property->setValue(null, $mockObjectManagerInstance);
170170
}
171171

@@ -177,11 +177,11 @@ public static function tearDownAfterClass(): void
177177
parent::tearDownAfterClass();
178178

179179
$pageObjectHandlerProperty = new ReflectionProperty(PageObjectHandler::class, 'INSTANCE');
180-
$pageObjectHandlerProperty->setAccessible(true);
180+
// $pageObjectHandlerProperty->setAccessible(true);
181181
$pageObjectHandlerProperty->setValue(null, null);
182182

183183
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
184-
$objectManagerProperty->setAccessible(true);
184+
// $objectManagerProperty->setAccessible(true);
185185
$objectManagerProperty->setValue(null, null);
186186

187187
TestLoggingUtil::getInstance()->clearMockLoggingUtil();

‎dev/tests/unit/Magento/FunctionalTestFramework/Page/Handlers/SectionObjectHandlerTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public function testDeprecatedSection(): void
119119
private function mockSectionObjectHandlerWithData(array $mockData): void
120120
{
121121
$sectionObjectHandlerProperty = new ReflectionProperty(SectionObjectHandler::class, "INSTANCE");
122-
$sectionObjectHandlerProperty->setAccessible(true);
122+
// $sectionObjectHandlerProperty->setAccessible(true);
123123
$sectionObjectHandlerProperty->setValue(null, null);
124124

125125
$mockSectionParser = $this->createMock(SectionParser::class);
@@ -150,7 +150,7 @@ function (
150150
);
151151

152152
$property = new ReflectionProperty(ObjectManager::class, 'instance');
153-
$property->setAccessible(true);
153+
// $property->setAccessible(true);
154154
$property->setValue(null, $mockObjectManagerInstance);
155155
}
156156

@@ -162,11 +162,11 @@ public static function tearDownAfterClass(): void
162162
parent::tearDownAfterClass();
163163

164164
$sectionObjectHandlerProperty = new ReflectionProperty(SectionObjectHandler::class, "INSTANCE");
165-
$sectionObjectHandlerProperty->setAccessible(true);
165+
// $sectionObjectHandlerProperty->setAccessible(true);
166166
$sectionObjectHandlerProperty->setValue(null, null);
167167

168168
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
169-
$objectManagerProperty->setAccessible(true);
169+
// $objectManagerProperty->setAccessible(true);
170170
$objectManagerProperty->setValue(null, null);
171171

172172
TestLoggingUtil::getInstance()->clearMockLoggingUtil();

‎dev/tests/unit/Magento/FunctionalTestFramework/StaticCheck/DeprecatedEntityUsageCheckTest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function testInvalidPathOption(): void
6262
->willReturn('/invalidPath');
6363

6464
$loadAllXmlFiles = $this->staticCheckClass->getMethod('loadAllXMLFiles');
65-
$loadAllXmlFiles->setAccessible(true);
65+
// $loadAllXmlFiles->setAccessible(true);
6666

6767
$this->expectException(InvalidArgumentException::class);
6868
$loadAllXmlFiles->invoke($this->staticCheck, $input);
@@ -256,7 +256,7 @@ public function testViolatingMetaDataReferences(): void
256256
]
257257
];
258258
$property = $this->staticCheckClass->getMethod('findViolatingMetadataReferences');
259-
$property->setAccessible(true);
259+
// $property->setAccessible(true);
260260
$actual = $property->invoke($this->staticCheck, $references);
261261
$this->assertEquals($actual, $expected);
262262
}
@@ -279,7 +279,7 @@ public function testIsDeprecated(): void
279279
';
280280

281281
$property = $this->staticCheckClass->getMethod('isDeprecated');
282-
$property->setAccessible(true);
282+
// $property->setAccessible(true);
283283
$output = $property->invoke($this->staticCheck, $contents);
284284
$this->assertTrue($output);
285285
}
@@ -297,7 +297,7 @@ private function mockOperationHandlerWithData(array $mockData): void
297297
OperationDefinitionObjectHandler::class,
298298
'INSTANCE'
299299
);
300-
$operationDefinitionObjectHandlerProperty->setAccessible(true);
300+
// $operationDefinitionObjectHandlerProperty->setAccessible(true);
301301
$operationDefinitionObjectHandlerProperty->setValue(null, null);
302302

303303
$mockOperationParser = $this->createMock(OperationDefinitionParser::class);
@@ -328,7 +328,7 @@ function (
328328
);
329329

330330
$property = new ReflectionProperty(ObjectManager::class, 'instance');
331-
$property->setAccessible(true);
331+
// $property->setAccessible(true);
332332
$property->setValue(null, $mockObjectManagerInstance);
333333
}
334334

@@ -343,11 +343,11 @@ public static function tearDownAfterClass(): void
343343
OperationDefinitionObjectHandler::class,
344344
'INSTANCE'
345345
);
346-
$operationDefinitionObjectHandlerProperty->setAccessible(true);
346+
// $operationDefinitionObjectHandlerProperty->setAccessible(true);
347347
$operationDefinitionObjectHandlerProperty->setValue(null, null);
348348

349349
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
350-
$objectManagerProperty->setAccessible(true);
350+
// $objectManagerProperty->setAccessible(true);
351351
$objectManagerProperty->setValue(null, null);
352352
}
353353

@@ -362,7 +362,7 @@ public static function tearDownAfterClass(): void
362362
public function callViolatingReferences(array $references)
363363
{
364364
$property = $this->staticCheckClass->getMethod('findViolatingReferences');
365-
$property->setAccessible(true);
365+
// $property->setAccessible(true);
366366

367367
return $property->invoke($this->staticCheck, $references);
368368
}

‎dev/tests/unit/Magento/FunctionalTestFramework/Suite/SuiteGeneratorTest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ private function setMockTestAndSuiteParserOutput(array $testData, array $suiteDa
369369
->will($this->returnCallback($mockVoidReturnCallback));
370370

371371
$suiteGeneratorServiceProperty = new ReflectionProperty(SuiteGeneratorService::class, 'INSTANCE');
372-
$suiteGeneratorServiceProperty->setAccessible(true);
372+
// $suiteGeneratorServiceProperty->setAccessible(true);
373373
$suiteGeneratorServiceProperty->setValue(null, $mockSuiteGeneratorService);
374374

375375
$mockDataParser = $this->createMock(TestDataParser::class);
@@ -418,7 +418,7 @@ function (
418418
);
419419

420420
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
421-
$objectManagerProperty->setAccessible(true);
421+
// $objectManagerProperty->setAccessible(true);
422422
$objectManagerProperty->setValue(null, $objectManagerMockInstance);
423423
}
424424

@@ -430,17 +430,17 @@ function (
430430
private function clearMockResolverProperties(): void
431431
{
432432
$property = new ReflectionProperty(SuiteGenerator::class, 'instance');
433-
$property->setAccessible(true);
433+
// $property->setAccessible(true);
434434
$property->setValue(null, null);
435435

436436
// clear test object handler value to inject parsed content
437437
$property = new ReflectionProperty(TestObjectHandler::class, 'testObjectHandler');
438-
$property->setAccessible(true);
438+
// $property->setAccessible(true);
439439
$property->setValue(null, null);
440440

441441
// clear suite object handler value to inject parsed content
442442
$property = new ReflectionProperty(SuiteObjectHandler::class, 'instance');
443-
$property->setAccessible(true);
443+
// $property->setAccessible(true);
444444
$property->setValue(null, null);
445445
}
446446

@@ -460,11 +460,11 @@ public static function tearDownAfterClass(): void
460460
parent::tearDownAfterClass();
461461

462462
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
463-
$objectManagerProperty->setAccessible(true);
463+
// $objectManagerProperty->setAccessible(true);
464464
$objectManagerProperty->setValue(null, null);
465465

466466
$suiteGeneratorServiceProperty = new ReflectionProperty(SuiteGeneratorService::class, 'INSTANCE');
467-
$suiteGeneratorServiceProperty->setAccessible(true);
467+
// $suiteGeneratorServiceProperty->setAccessible(true);
468468
$suiteGeneratorServiceProperty->setValue(null, null);
469469

470470
TestLoggingUtil::getInstance()->clearMockLoggingUtil();

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Handlers/ActionGroupObjectHandlerTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public function testGetAllTestObjectsWithInvalidExtends(): void
101101
private function mockActionGroupObjectHandlerWithData(array $mockData): void
102102
{
103103
$actionGroupObjectHandlerProperty = new ReflectionProperty(ActionGroupObjectHandler::class, 'instance');
104-
$actionGroupObjectHandlerProperty->setAccessible(true);
104+
// $actionGroupObjectHandlerProperty->setAccessible(true);
105105
$actionGroupObjectHandlerProperty->setValue(null, null);
106106

107107
$mockOperationParser = $this->createMock(ActionGroupDataParser::class);
@@ -131,7 +131,7 @@ function (
131131
);
132132

133133
$property = new ReflectionProperty(ObjectManager::class, 'instance');
134-
$property->setAccessible(true);
134+
// $property->setAccessible(true);
135135
$property->setValue(null, $mockObjectManagerInstance);
136136
}
137137

@@ -143,11 +143,11 @@ public static function tearDownAfterClass(): void
143143
parent::tearDownAfterClass();
144144

145145
$actionGroupObjectHandlerProperty = new ReflectionProperty(ActionGroupObjectHandler::class, 'instance');
146-
$actionGroupObjectHandlerProperty->setAccessible(true);
146+
// $actionGroupObjectHandlerProperty->setAccessible(true);
147147
$actionGroupObjectHandlerProperty->setValue(null, null);
148148

149149
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
150-
$objectManagerProperty->setAccessible(true);
150+
// $objectManagerProperty->setAccessible(true);
151151
$objectManagerProperty->setValue(null, null);
152152
}
153153
}

‎dev/tests/unit/Magento/FunctionalTestFramework/Util/ModuleResolverTest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ public static function tearDownAfterClass(): void
3939
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
4040

4141
$moduleResolverServiceInstance = new ReflectionProperty(ModuleResolverService::class, 'INSTANCE');
42-
$moduleResolverServiceInstance->setAccessible(true);
42+
// $moduleResolverServiceInstance->setAccessible(true);
4343
$moduleResolverServiceInstance->setValue(null, null);
4444

4545
$mftfAppConfigInstance = new ReflectionProperty(MftfApplicationConfig::class, 'MFTF_APPLICATION_CONTEXT');
46-
$mftfAppConfigInstance->setAccessible(true);
46+
// $mftfAppConfigInstance->setAccessible(true);
4747
$mftfAppConfigInstance->setValue(null, null);
4848
}
4949

@@ -151,7 +151,7 @@ public function testGetModulePathsLocations(): void
151151
{
152152
// clear test object handler value to inject parsed content
153153
$property = new ReflectionProperty(ModuleResolver::class, 'instance');
154-
$property->setAccessible(true);
154+
// $property->setAccessible(true);
155155
$property->setValue(null, null);
156156

157157
$this->mockForceGenerate(false);
@@ -901,15 +901,15 @@ private function setMockResolverProperties(
901901
$mockBlockList = []
902902
): void {
903903
$property = new ReflectionProperty(ModuleResolver::class, 'enabledModulePaths');
904-
$property->setAccessible(true);
904+
// $property->setAccessible(true);
905905
$property->setValue($instance, $mockPaths);
906906

907907
$property = new ReflectionProperty(ModuleResolver::class, 'enabledModules');
908-
$property->setAccessible(true);
908+
// $property->setAccessible(true);
909909
$property->setValue($instance, $mockModules);
910910

911911
$property = new ReflectionProperty(ModuleResolver::class, 'moduleBlocklist');
912-
$property->setAccessible(true);
912+
// $property->setAccessible(true);
913913
$property->setValue($instance, $mockBlockList);
914914
}
915915

@@ -923,7 +923,7 @@ private function setMockResolverProperties(
923923
private function setMockResolverCreatorProperties(?MockObject $moduleResolverService): void
924924
{
925925
$property = new ReflectionProperty(ModuleResolverService::class, 'INSTANCE');
926-
$property->setAccessible(true);
926+
// $property->setAccessible(true);
927927
$property->setValue(null, $moduleResolverService);
928928
}
929929

@@ -942,7 +942,7 @@ private function mockForceGenerate(bool $forceGenerate): void
942942
->willReturn($forceGenerate);
943943

944944
$property = new ReflectionProperty(MftfApplicationConfig::class, 'MFTF_APPLICATION_CONTEXT');
945-
$property->setAccessible(true);
945+
// $property->setAccessible(true);
946946
$property->setValue(null, $mockConfig);
947947
}
948948

‎dev/tests/unit/Magento/FunctionalTestFramework/Util/Sorter/ParallelGroupSorterTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ public function testTestsAndSuitesSplitByInvalidGroupNumber(): void
496496
public static function tearDownAfterClass(): void
497497
{
498498
$instanceProperty = new ReflectionProperty(TestObjectHandler::class, 'testObjectHandler');
499-
$instanceProperty->setAccessible(true);
499+
// $instanceProperty->setAccessible(true);
500500
$instanceProperty->setValue(null, null);
501501
}
502502

@@ -528,7 +528,7 @@ function () use (&$numberOfCalls, $actionCount) {
528528
->willReturn($mockTest1);
529529

530530
$instanceProperty = new ReflectionProperty(TestObjectHandler::class, 'testObjectHandler');
531-
$instanceProperty->setAccessible(true);
531+
// $instanceProperty->setAccessible(true);
532532
$instanceProperty->setValue($mockHandler, $mockHandler);
533533
}
534534
}

0 commit comments

Comments
 (0)