Skip to content

Commit b25041c

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

24 files changed

Lines changed: 0 additions & 76 deletions

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

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

330329
$mockDataProfileSchemaParser = $this->createMock(DataProfileSchemaParser::class);
@@ -355,7 +354,6 @@ function (
355354
);
356355

357356
$property = new ReflectionProperty(ObjectManager::class, 'instance');
358-
// $property->setAccessible(true);
359357
$property->setValue(null, $mockObjectManagerInstance);
360358
}
361359

@@ -367,11 +365,9 @@ public static function tearDownAfterClass(): void
367365
parent::tearDownAfterClass();
368366

369367
$dataObjectHandlerProperty = new ReflectionProperty(DataObjectHandler::class, "INSTANCE");
370-
// $dataObjectHandlerProperty->setAccessible(true);
371368
$dataObjectHandlerProperty->setValue(null, null);
372369

373370
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
374-
// $objectManagerProperty->setAccessible(true);
375371
$objectManagerProperty->setValue(null, null);
376372

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

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

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

512511
$mockOperationParser = $this->createMock(OperationDefinitionParser::class);
@@ -537,7 +536,6 @@ function (
537536
);
538537

539538
$property = new ReflectionProperty(ObjectManager::class, 'instance');
540-
// $property->setAccessible(true);
541539
$property->setValue(null, $mockObjectManagerInstance);
542540
}
543541

@@ -552,11 +550,9 @@ public static function tearDownAfterClass(): void
552550
OperationDefinitionObjectHandler::class,
553551
'INSTANCE'
554552
);
555-
// $operationDefinitionObjectHandlerProperty->setAccessible(true);
556553
$operationDefinitionObjectHandlerProperty->setValue(null, null);
557554

558555
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
559-
// $objectManagerProperty->setAccessible(true);
560556
$objectManagerProperty->setValue(null, null);
561557

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

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,6 @@ 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);
538537
$dataObjectHandler->setValue(null, null);
539538

540539
$dataProfileSchemaParser = $this->createMock(DataProfileSchemaParser::class);
@@ -574,7 +573,6 @@ function ($class, $arguments = []) use ($curlHandler, $objectManager, $dataProfi
574573
);
575574

576575
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
577-
// $objectManagerProperty->setAccessible(true);
578576
$objectManagerProperty->setValue(null, $objectManagerMockInstance);
579577
}
580578

@@ -589,11 +587,9 @@ public static function tearDownAfterClass(): void
589587

590588
// Clear out Singleton between tests
591589
$persistedObjectHandlerProperty = new ReflectionProperty(PersistedObjectHandler::class, "INSTANCE");
592-
// $persistedObjectHandlerProperty->setAccessible(true);
593590
$persistedObjectHandlerProperty->setValue(null, null);
594591

595592
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
596-
// $objectManagerProperty->setAccessible(true);
597593
$objectManagerProperty->setValue(null, null);
598594

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

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

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

140139
$mockSectionParser = $this->createMock(PageParser::class);
@@ -165,7 +164,6 @@ function (
165164
);
166165

167166
$property = new ReflectionProperty(ObjectManager::class, 'instance');
168-
// $property->setAccessible(true);
169167
$property->setValue(null, $mockObjectManagerInstance);
170168
}
171169

@@ -177,11 +175,9 @@ public static function tearDownAfterClass(): void
177175
parent::tearDownAfterClass();
178176

179177
$pageObjectHandlerProperty = new ReflectionProperty(PageObjectHandler::class, 'INSTANCE');
180-
// $pageObjectHandlerProperty->setAccessible(true);
181178
$pageObjectHandlerProperty->setValue(null, null);
182179

183180
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
184-
// $objectManagerProperty->setAccessible(true);
185181
$objectManagerProperty->setValue(null, null);
186182

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

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

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

125124
$mockSectionParser = $this->createMock(SectionParser::class);
@@ -150,7 +149,6 @@ function (
150149
);
151150

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

@@ -162,11 +160,9 @@ public static function tearDownAfterClass(): void
162160
parent::tearDownAfterClass();
163161

164162
$sectionObjectHandlerProperty = new ReflectionProperty(SectionObjectHandler::class, "INSTANCE");
165-
// $sectionObjectHandlerProperty->setAccessible(true);
166163
$sectionObjectHandlerProperty->setValue(null, null);
167164

168165
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
169-
// $objectManagerProperty->setAccessible(true);
170166
$objectManagerProperty->setValue(null, null);
171167

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

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

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

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

6766
$this->expectException(InvalidArgumentException::class);
6867
$loadAllXmlFiles->invoke($this->staticCheck, $input);
@@ -256,7 +255,6 @@ public function testViolatingMetaDataReferences(): void
256255
]
257256
];
258257
$property = $this->staticCheckClass->getMethod('findViolatingMetadataReferences');
259-
// $property->setAccessible(true);
260258
$actual = $property->invoke($this->staticCheck, $references);
261259
$this->assertEquals($actual, $expected);
262260
}
@@ -279,7 +277,6 @@ public function testIsDeprecated(): void
279277
';
280278

281279
$property = $this->staticCheckClass->getMethod('isDeprecated');
282-
// $property->setAccessible(true);
283280
$output = $property->invoke($this->staticCheck, $contents);
284281
$this->assertTrue($output);
285282
}
@@ -297,7 +294,6 @@ private function mockOperationHandlerWithData(array $mockData): void
297294
OperationDefinitionObjectHandler::class,
298295
'INSTANCE'
299296
);
300-
// $operationDefinitionObjectHandlerProperty->setAccessible(true);
301297
$operationDefinitionObjectHandlerProperty->setValue(null, null);
302298

303299
$mockOperationParser = $this->createMock(OperationDefinitionParser::class);
@@ -328,7 +324,6 @@ function (
328324
);
329325

330326
$property = new ReflectionProperty(ObjectManager::class, 'instance');
331-
// $property->setAccessible(true);
332327
$property->setValue(null, $mockObjectManagerInstance);
333328
}
334329

@@ -343,11 +338,9 @@ public static function tearDownAfterClass(): void
343338
OperationDefinitionObjectHandler::class,
344339
'INSTANCE'
345340
);
346-
// $operationDefinitionObjectHandlerProperty->setAccessible(true);
347341
$operationDefinitionObjectHandlerProperty->setValue(null, null);
348342

349343
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
350-
// $objectManagerProperty->setAccessible(true);
351344
$objectManagerProperty->setValue(null, null);
352345
}
353346

@@ -362,7 +355,6 @@ public static function tearDownAfterClass(): void
362355
public function callViolatingReferences(array $references)
363356
{
364357
$property = $this->staticCheckClass->getMethod('findViolatingReferences');
365-
// $property->setAccessible(true);
366358

367359
return $property->invoke($this->staticCheck, $references);
368360
}

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

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

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

375374
$mockDataParser = $this->createMock(TestDataParser::class);
@@ -418,7 +417,6 @@ function (
418417
);
419418

420419
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
421-
// $objectManagerProperty->setAccessible(true);
422420
$objectManagerProperty->setValue(null, $objectManagerMockInstance);
423421
}
424422

@@ -430,17 +428,14 @@ function (
430428
private function clearMockResolverProperties(): void
431429
{
432430
$property = new ReflectionProperty(SuiteGenerator::class, 'instance');
433-
// $property->setAccessible(true);
434431
$property->setValue(null, null);
435432

436433
// clear test object handler value to inject parsed content
437434
$property = new ReflectionProperty(TestObjectHandler::class, 'testObjectHandler');
438-
// $property->setAccessible(true);
439435
$property->setValue(null, null);
440436

441437
// clear suite object handler value to inject parsed content
442438
$property = new ReflectionProperty(SuiteObjectHandler::class, 'instance');
443-
// $property->setAccessible(true);
444439
$property->setValue(null, null);
445440
}
446441

@@ -460,11 +455,9 @@ public static function tearDownAfterClass(): void
460455
parent::tearDownAfterClass();
461456

462457
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
463-
// $objectManagerProperty->setAccessible(true);
464458
$objectManagerProperty->setValue(null, null);
465459

466460
$suiteGeneratorServiceProperty = new ReflectionProperty(SuiteGeneratorService::class, 'INSTANCE');
467-
// $suiteGeneratorServiceProperty->setAccessible(true);
468461
$suiteGeneratorServiceProperty->setValue(null, null);
469462

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

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

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

107106
$mockOperationParser = $this->createMock(ActionGroupDataParser::class);
@@ -131,7 +130,6 @@ function (
131130
);
132131

133132
$property = new ReflectionProperty(ObjectManager::class, 'instance');
134-
// $property->setAccessible(true);
135133
$property->setValue(null, $mockObjectManagerInstance);
136134
}
137135

@@ -143,11 +141,9 @@ public static function tearDownAfterClass(): void
143141
parent::tearDownAfterClass();
144142

145143
$actionGroupObjectHandlerProperty = new ReflectionProperty(ActionGroupObjectHandler::class, 'instance');
146-
// $actionGroupObjectHandlerProperty->setAccessible(true);
147144
$actionGroupObjectHandlerProperty->setValue(null, null);
148145

149146
$objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
150-
// $objectManagerProperty->setAccessible(true);
151147
$objectManagerProperty->setValue(null, null);
152148
}
153149
}

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

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

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

4544
$mftfAppConfigInstance = new ReflectionProperty(MftfApplicationConfig::class, 'MFTF_APPLICATION_CONTEXT');
46-
// $mftfAppConfigInstance->setAccessible(true);
4745
$mftfAppConfigInstance->setValue(null, null);
4846
}
4947

@@ -151,7 +149,6 @@ public function testGetModulePathsLocations(): void
151149
{
152150
// clear test object handler value to inject parsed content
153151
$property = new ReflectionProperty(ModuleResolver::class, 'instance');
154-
// $property->setAccessible(true);
155152
$property->setValue(null, null);
156153

157154
$this->mockForceGenerate(false);
@@ -901,15 +898,12 @@ private function setMockResolverProperties(
901898
$mockBlockList = []
902899
): void {
903900
$property = new ReflectionProperty(ModuleResolver::class, 'enabledModulePaths');
904-
// $property->setAccessible(true);
905901
$property->setValue($instance, $mockPaths);
906902

907903
$property = new ReflectionProperty(ModuleResolver::class, 'enabledModules');
908-
// $property->setAccessible(true);
909904
$property->setValue($instance, $mockModules);
910905

911906
$property = new ReflectionProperty(ModuleResolver::class, 'moduleBlocklist');
912-
// $property->setAccessible(true);
913907
$property->setValue($instance, $mockBlockList);
914908
}
915909

@@ -923,7 +917,6 @@ private function setMockResolverProperties(
923917
private function setMockResolverCreatorProperties(?MockObject $moduleResolverService): void
924918
{
925919
$property = new ReflectionProperty(ModuleResolverService::class, 'INSTANCE');
926-
// $property->setAccessible(true);
927920
$property->setValue(null, $moduleResolverService);
928921
}
929922

@@ -942,7 +935,6 @@ private function mockForceGenerate(bool $forceGenerate): void
942935
->willReturn($forceGenerate);
943936

944937
$property = new ReflectionProperty(MftfApplicationConfig::class, 'MFTF_APPLICATION_CONTEXT');
945-
// $property->setAccessible(true);
946938
$property->setValue(null, $mockConfig);
947939
}
948940

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

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

@@ -528,7 +527,6 @@ function () use (&$numberOfCalls, $actionCount) {
528527
->willReturn($mockTest1);
529528

530529
$instanceProperty = new ReflectionProperty(TestObjectHandler::class, 'testObjectHandler');
531-
// $instanceProperty->setAccessible(true);
532530
$instanceProperty->setValue($mockHandler, $mockHandler);
533531
}
534532
}

0 commit comments

Comments
 (0)