Skip to content

Commit 3ca2f86

Browse files
dvdougsebastianbergmann
dvdoug
authored and
sebastianbergmann
committed
sebastianbergmann#864 Uncovered files should be ignored unless requested
1 parent 7cecb7b commit 3ca2f86

File tree

6 files changed

+182
-0
lines changed

6 files changed

+182
-0
lines changed

‎src/CodeCoverage.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,8 @@ public function getData(bool $raw = false): ProcessedCodeCoverageData
167167
$this->processUncoveredFilesFromFilter();
168168
} elseif ($this->includeUncoveredFiles) {
169169
$this->addUncoveredFilesFromFilter();
170+
} else {
171+
$this->data->removeFilesWithNoCoverage();
170172
}
171173
}
172174

‎src/ProcessedCodeCoverageData.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,18 @@ public function renameFile(string $oldFile, string $newFile): void
132132
unset($this->lineCoverage[$oldFile], $this->functionCoverage[$oldFile]);
133133
}
134134

135+
public function removeFilesWithNoCoverage(): void
136+
{
137+
foreach ($this->lineCoverage as $file => $lines) {
138+
foreach ($lines as $line) {
139+
if (is_array($line) && !empty($line)) {
140+
continue 2;
141+
}
142+
}
143+
unset($file);
144+
}
145+
}
146+
135147
public function merge(self $newData): void
136148
{
137149
foreach ($newData->lineCoverage as $file => $lines) {

‎tests/TestCase.php‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1812,4 +1812,128 @@ protected function removeTemporaryFiles(): void
18121812
$fileInfo->isDir() ? rmdir($pathname) : unlink($pathname);
18131813
}
18141814
}
1815+
1816+
protected function getCoverageForFilesWithUncoveredIncluded(): CodeCoverage
1817+
{
1818+
$data = $this->getLineCoverageXdebugDataForBankAccount();
1819+
1820+
$stub = $this->createStub(Driver::class);
1821+
1822+
$stub->method('stop')
1823+
->will($this->onConsecutiveCalls(...$data));
1824+
1825+
$filter = new Filter;
1826+
$filter->includeFile(TEST_FILES_PATH . 'BankAccount.php');
1827+
$filter->includeFile(TEST_FILES_PATH . 'NamespacedBankAccount.php');
1828+
1829+
$coverage = new CodeCoverage($stub, $filter);
1830+
$coverage->includeUncoveredFiles();
1831+
1832+
$coverage->start(
1833+
new BankAccountTest('testBalanceIsInitiallyZero'),
1834+
true
1835+
);
1836+
1837+
$coverage->stop(
1838+
true,
1839+
[TEST_FILES_PATH . 'BankAccount.php' => range(6, 9)]
1840+
);
1841+
1842+
$coverage->start(
1843+
new BankAccountTest('testBalanceCannotBecomeNegative')
1844+
);
1845+
1846+
$coverage->stop(
1847+
true,
1848+
[TEST_FILES_PATH . 'BankAccount.php' => range(27, 32)]
1849+
);
1850+
1851+
$coverage->start(
1852+
new BankAccountTest('testBalanceCannotBecomeNegative2')
1853+
);
1854+
1855+
$coverage->stop(
1856+
true,
1857+
[TEST_FILES_PATH . 'BankAccount.php' => range(20, 25)]
1858+
);
1859+
1860+
$coverage->start(
1861+
new BankAccountTest('testDepositWithdrawMoney')
1862+
);
1863+
1864+
$coverage->stop(
1865+
true,
1866+
[
1867+
TEST_FILES_PATH . 'BankAccount.php' => array_merge(
1868+
range(6, 9),
1869+
range(20, 25),
1870+
range(27, 32)
1871+
),
1872+
]
1873+
);
1874+
1875+
return $coverage;
1876+
}
1877+
1878+
protected function getCoverageForFilesWithUncoveredExcluded(): CodeCoverage
1879+
{
1880+
$data = $this->getLineCoverageXdebugDataForBankAccount();
1881+
1882+
$stub = $this->createStub(Driver::class);
1883+
1884+
$stub->method('stop')
1885+
->will($this->onConsecutiveCalls(...$data));
1886+
1887+
$filter = new Filter;
1888+
$filter->includeFile(TEST_FILES_PATH . 'BankAccount.php');
1889+
$filter->includeFile(TEST_FILES_PATH . 'NamespacedBankAccount.php');
1890+
1891+
$coverage = new CodeCoverage($stub, $filter);
1892+
$coverage->excludeUncoveredFiles();
1893+
1894+
$coverage->start(
1895+
new BankAccountTest('testBalanceIsInitiallyZero'),
1896+
true
1897+
);
1898+
1899+
$coverage->stop(
1900+
true,
1901+
[TEST_FILES_PATH . 'BankAccount.php' => range(6, 9)]
1902+
);
1903+
1904+
$coverage->start(
1905+
new BankAccountTest('testBalanceCannotBecomeNegative')
1906+
);
1907+
1908+
$coverage->stop(
1909+
true,
1910+
[TEST_FILES_PATH . 'BankAccount.php' => range(27, 32)]
1911+
);
1912+
1913+
$coverage->start(
1914+
new BankAccountTest('testBalanceCannotBecomeNegative2')
1915+
);
1916+
1917+
$coverage->stop(
1918+
true,
1919+
[TEST_FILES_PATH . 'BankAccount.php' => range(20, 25)]
1920+
);
1921+
1922+
$coverage->start(
1923+
new BankAccountTest('testDepositWithdrawMoney')
1924+
);
1925+
1926+
$coverage->stop(
1927+
true,
1928+
[
1929+
TEST_FILES_PATH . 'BankAccount.php' => array_merge(
1930+
range(6, 9),
1931+
range(20, 25),
1932+
range(27, 32)
1933+
),
1934+
]
1935+
);
1936+
1937+
return $coverage;
1938+
}
18151939
}

‎tests/_files/BankAccountWithUncovered-text-line.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
3+
Code Coverage Report:
4+
%s
5+
6+
Summary:
7+
Classes: 0.00% (0/2)
8+
Methods: 37.50% (3/8)
9+
Lines: 26.32% (5/19)
10+
11+
BankAccount
12+
Methods: 75.00% ( 3/ 4) Lines: 50.00% ( 5/ 10)

‎tests/_files/BankAccountWithoutUncovered-text-line.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
3+
Code Coverage Report:
4+
%s
5+
6+
Summary:
7+
Classes: 0.00% (0/1)
8+
Methods: 75.00% (3/4)
9+
Lines: 50.00% (5/10)
10+
11+
BankAccount
12+
Methods: 75.00% ( 3/ 4) Lines: 50.00% ( 5/ 10)

‎tests/tests/TextTest.php‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,24 @@ public function testTextForClassWithAnonymousFunction(): void
7777
str_replace(PHP_EOL, "\n", $text->process($this->getCoverageForClassWithAnonymousFunction()))
7878
);
7979
}
80+
81+
public function testUncoveredFilesAreIncludedWhenConfiguredTest(): void
82+
{
83+
$text = new Text(50, 90, false, false);
84+
85+
$this->assertStringMatchesFormatFile(
86+
TEST_FILES_PATH . 'BankAccountWithUncovered-text-line.txt',
87+
str_replace(PHP_EOL, "\n", $text->process($this->getCoverageForFilesWithUncoveredIncluded()))
88+
);
89+
}
90+
91+
public function testUncoveredFilesAreExcludedWhenConfiguredTest(): void
92+
{
93+
$text = new Text(50, 90, false, false);
94+
95+
$this->assertStringMatchesFormatFile(
96+
TEST_FILES_PATH . 'BankAccountWithoutUncovered-text-line.txt',
97+
str_replace(PHP_EOL, "\n", $text->process($this->getCoverageForFilesWithUncoveredExcluded()))
98+
);
99+
}
80100
}

0 commit comments

Comments
 (0)