Skip to content

Commit 0422590

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '8.5' into 9.5
2 parents 4b2fd29 + 6fec4ae commit 0422590

File tree

1 file changed

+77
-70
lines changed

1 file changed

+77
-70
lines changed

‎tests/unit/Util/TestClassTest.php

Lines changed: 77 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,54 +1227,8 @@ public function methodForTestParseAnnotationThatIsOnlyOneLine(): void
12271227
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
12281228
* @throws CodeCoverageException
12291229
*/
1230-
public function testGetLinesToBeCovered($test, $lines): void
1230+
public function testGetLinesToBeCovered($test, $expected): void
12311231
{
1232-
switch ($test) {
1233-
case CoverageMethodNothingCoversMethod::class:
1234-
case CoverageClassNothingTest::class:
1235-
case CoverageMethodNothingTest::class:
1236-
$expected = false;
1237-
1238-
break;
1239-
1240-
case CoverageCoversOverridesCoversNothingTest::class:
1241-
$expected = [TEST_FILES_PATH . 'CoveredClass.php' => $lines];
1242-
1243-
break;
1244-
1245-
case CoverageNoneTest::class:
1246-
$expected = [];
1247-
1248-
break;
1249-
1250-
case CoverageFunctionTest::class:
1251-
$expected = [
1252-
TEST_FILES_PATH . 'CoveredFunction.php' => $lines,
1253-
];
1254-
1255-
break;
1256-
1257-
case NamespaceCoverageClassExtendedTest::class:
1258-
case NamespaceCoverageClassTest::class:
1259-
case NamespaceCoverageMethodTest::class:
1260-
case NamespaceCoverageNotPrivateTest::class:
1261-
case NamespaceCoverageNotProtectedTest::class:
1262-
case NamespaceCoverageNotPublicTest::class:
1263-
case NamespaceCoveragePrivateTest::class:
1264-
case NamespaceCoverageProtectedTest::class:
1265-
case NamespaceCoveragePublicTest::class:
1266-
case NamespaceCoverageCoversClassTest::class:
1267-
case NamespaceCoverageCoversClassPublicTest::class:
1268-
$expected = [
1269-
TEST_FILES_PATH . 'NamespaceCoveredClass.php' => $lines,
1270-
];
1271-
1272-
break;
1273-
1274-
default:
1275-
$expected = [TEST_FILES_PATH . 'CoveredClass.php' => $lines];
1276-
}
1277-
12781232
$this->assertEqualsCanonicalizing(
12791233
$expected,
12801234
Test::getLinesToBeCovered(
@@ -1401,91 +1355,142 @@ public function getLinesToBeCoveredProvider(): array
14011355
],
14021356
[
14031357
CoverageClassExtendedTest::class,
1404-
array_merge(range(29, 46), range(12, 27)),
1358+
[
1359+
TEST_FILES_PATH . 'CoveredClass.php' => array_merge(range(29, 46), range(12, 27)),
1360+
],
14051361
],
14061362
[
14071363
CoverageClassTest::class,
1408-
range(29, 46),
1364+
[
1365+
TEST_FILES_PATH . 'CoveredClass.php' => range(29, 46),
1366+
],
14091367
],
14101368
[
14111369
CoverageMethodTest::class,
1412-
range(31, 35),
1370+
[
1371+
TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35),
1372+
],
14131373
],
14141374
[
14151375
CoverageMethodOneLineAnnotationTest::class,
1416-
range(31, 35),
1376+
[
1377+
TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35),
1378+
],
1379+
14171380
],
14181381
[
14191382
CoverageNotPrivateTest::class,
1420-
array_merge(range(31, 35), range(37, 41)),
1383+
[
1384+
TEST_FILES_PATH . 'CoveredClass.php' => array_merge(range(31, 35), range(37, 41)),
1385+
],
1386+
14211387
],
14221388
[
14231389
CoverageNotProtectedTest::class,
1424-
array_merge(range(31, 35), range(43, 45)),
1390+
[
1391+
TEST_FILES_PATH . 'CoveredClass.php' => array_merge(range(31, 35), range(43, 45)),
1392+
],
1393+
14251394
],
14261395
[
14271396
CoverageNotPublicTest::class,
1428-
array_merge(range(37, 41), range(43, 45)),
1397+
[
1398+
TEST_FILES_PATH . 'CoveredClass.php' => array_merge(range(37, 41), range(43, 45)),
1399+
],
1400+
14291401
],
14301402
[
14311403
CoveragePrivateTest::class,
1432-
range(43, 45),
1404+
[
1405+
TEST_FILES_PATH . 'CoveredClass.php' => range(43, 45),
1406+
],
1407+
14331408
],
14341409
[
14351410
CoverageProtectedTest::class,
1436-
range(37, 41),
1411+
[
1412+
TEST_FILES_PATH . 'CoveredClass.php' => range(37, 41),
1413+
],
1414+
14371415
],
14381416
[
14391417
CoveragePublicTest::class,
1440-
range(31, 35),
1418+
[
1419+
TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35),
1420+
],
1421+
14411422
],
14421423
[
14431424
CoverageFunctionTest::class,
1444-
range(10, 12),
1425+
[
1426+
TEST_FILES_PATH . 'CoveredFunction.php' => range(10, 12),
1427+
],
14451428
],
14461429
[
14471430
NamespaceCoverageClassExtendedTest::class,
1448-
array_merge(range(29, 46), range(12, 27)),
1431+
[
1432+
TEST_FILES_PATH . 'NamespaceCoveredClass.php' => array_merge(range(29, 46), range(12, 27)),
1433+
],
14491434
],
14501435
[
14511436
NamespaceCoverageClassTest::class,
1452-
range(29, 46),
1437+
[
1438+
TEST_FILES_PATH . 'NamespaceCoveredClass.php' => range(29, 46),
1439+
],
14531440
],
14541441
[
14551442
NamespaceCoverageMethodTest::class,
1456-
range(31, 35),
1443+
[
1444+
TEST_FILES_PATH . 'NamespaceCoveredClass.php' => range(31, 35),
1445+
],
14571446
],
14581447
[
14591448
NamespaceCoverageNotPrivateTest::class,
1460-
array_merge(range(31, 35), range(37, 41)),
1449+
[
1450+
TEST_FILES_PATH . 'NamespaceCoveredClass.php' => array_merge(range(31, 35), range(37, 41)),
1451+
],
14611452
],
14621453
[
14631454
NamespaceCoverageNotProtectedTest::class,
1464-
array_merge(range(31, 35), range(43, 45)),
1455+
[
1456+
TEST_FILES_PATH . 'NamespaceCoveredClass.php' => array_merge(range(31, 35), range(43, 45)),
1457+
],
14651458
],
14661459
[
14671460
NamespaceCoverageNotPublicTest::class,
1468-
array_merge(range(37, 41), range(43, 45)),
1461+
[
1462+
TEST_FILES_PATH . 'NamespaceCoveredClass.php' => array_merge(range(37, 41), range(43, 45)),
1463+
],
14691464
],
14701465
[
14711466
NamespaceCoveragePrivateTest::class,
1472-
range(43, 45),
1467+
[
1468+
TEST_FILES_PATH . 'NamespaceCoveredClass.php' => range(43, 45),
1469+
],
14731470
],
14741471
[
14751472
NamespaceCoverageProtectedTest::class,
1476-
range(37, 41),
1473+
[
1474+
TEST_FILES_PATH . 'NamespaceCoveredClass.php' => range(37, 41),
1475+
],
14771476
],
14781477
[
14791478
NamespaceCoveragePublicTest::class,
1480-
range(31, 35),
1479+
[
1480+
TEST_FILES_PATH . 'NamespaceCoveredClass.php' => range(31, 35),
1481+
],
14811482
],
14821483
[
14831484
NamespaceCoverageCoversClassTest::class,
1484-
array_merge(range(43, 45), range(37, 41), range(31, 35), range(24, 26), range(19, 22), range(14, 17)),
1485+
[
1486+
TEST_FILES_PATH . 'NamespaceCoveredClass.php' => array_merge(range(43, 45), range(37, 41), range(31, 35), range(24, 26), range(19, 22), range(14, 17)),
1487+
],
14851488
],
14861489
[
14871490
NamespaceCoverageCoversClassPublicTest::class,
1488-
range(31, 35),
1491+
[
1492+
TEST_FILES_PATH . 'NamespaceCoveredClass.php' => range(31, 35),
1493+
],
14891494
],
14901495
[
14911496
CoverageClassNothingTest::class,
@@ -1497,7 +1502,9 @@ public function getLinesToBeCoveredProvider(): array
14971502
],
14981503
[
14991504
CoverageCoversOverridesCoversNothingTest::class,
1500-
range(31, 35),
1505+
[
1506+
TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35),
1507+
],
15011508
],
15021509
[
15031510
CoverageMethodNothingCoversMethod::class,

0 commit comments

Comments
 (0)