Skip to content

Commit 341b287

Browse files
Refactor
1 parent 391889d commit 341b287

File tree

1 file changed

+42
-33
lines changed

1 file changed

+42
-33
lines changed

tests/tests/FilterTest.php

+42-33
Original file line numberDiff line numberDiff line change
@@ -19,87 +19,96 @@
1919
#[Small]
2020
final class FilterTest extends TestCase
2121
{
22-
private Filter $filter;
23-
24-
protected function setUp(): void
25-
{
26-
$this->filter = new Filter;
27-
}
28-
2922
public function testIsInitiallyEmpty(): void
3023
{
31-
$this->assertTrue($this->filter->isEmpty());
24+
$filter = new Filter;
25+
26+
$this->assertTrue($filter->isEmpty());
3227
}
3328

3429
public function testSingleFileCanBeAdded(): void
3530
{
31+
$filter = new Filter;
32+
3633
$file = realpath(__DIR__ . '/../_files/filter/a.php');
3734

38-
$this->filter->includeFile($file);
35+
$filter->includeFile($file);
3936

40-
$this->assertFalse($this->filter->isEmpty());
37+
$this->assertFalse($filter->isEmpty());
4138

4239
$this->assertSame(
4340
[
4441
$file,
4542
],
46-
$this->filter->files(),
43+
$filter->files(),
4744
);
4845
}
4946

5047
public function testMultipleFilesCanBeAdded(): void
5148
{
49+
$filter = new Filter;
50+
5251
$files = [
5352
realpath(__DIR__ . '/../_files/filter/a.php'),
5453
realpath(__DIR__ . '/../_files/filter/b.php'),
5554
];
5655

57-
$this->filter->includeFiles($files);
56+
$filter->includeFiles($files);
5857

59-
$this->assertSame($files, $this->filter->files());
58+
$this->assertSame($files, $filter->files());
6059
}
6160

6261
public function testDeterminesWhetherStringContainsNameOfRealFileThatExists(): void
6362
{
64-
$this->assertFalse($this->filter->isFile('vfs://root/a/path'));
65-
$this->assertFalse($this->filter->isFile('xdebug://debug-eval'));
66-
$this->assertFalse($this->filter->isFile('eval()\'d code'));
67-
$this->assertFalse($this->filter->isFile('runtime-created function'));
68-
$this->assertFalse($this->filter->isFile('assert code'));
69-
$this->assertFalse($this->filter->isFile('regexp code'));
70-
$this->assertTrue($this->filter->isFile(__DIR__ . '/../_files/filter/a.php'));
63+
$filter = new Filter;
64+
65+
$this->assertFalse($filter->isFile('vfs://root/a/path'));
66+
$this->assertFalse($filter->isFile('xdebug://debug-eval'));
67+
$this->assertFalse($filter->isFile('eval()\'d code'));
68+
$this->assertFalse($filter->isFile('runtime-created function'));
69+
$this->assertFalse($filter->isFile('assert code'));
70+
$this->assertFalse($filter->isFile('regexp code'));
71+
$this->assertTrue($filter->isFile(__DIR__ . '/../_files/filter/a.php'));
7172
}
7273

7374
public function testIncludedFileIsNotFiltered(): void
7475
{
75-
$this->filter->includeFile(realpath(__DIR__ . '/../_files/filter/a.php'));
76+
$filter = new Filter;
77+
78+
$filter->includeFile(realpath(__DIR__ . '/../_files/filter/a.php'));
7679

77-
$this->assertFalse($this->filter->isExcluded(realpath(__DIR__ . '/../_files/filter/a.php')));
80+
$this->assertFalse($filter->isExcluded(realpath(__DIR__ . '/../_files/filter/a.php')));
7881
}
7982

8083
public function testNotIncludedFileIsFiltered(): void
8184
{
82-
$this->filter->includeFile(realpath(__DIR__ . '/../_files/filter/a.php'));
85+
$filter = new Filter;
8386

84-
$this->assertTrue($this->filter->isExcluded(realpath(__DIR__ . '/../_files/filter/b.php')));
87+
$filter->includeFile(realpath(__DIR__ . '/../_files/filter/a.php'));
88+
89+
$this->assertTrue($filter->isExcluded(realpath(__DIR__ . '/../_files/filter/b.php')));
8590
}
8691

8792
public function testNonFilesAreFiltered(): void
8893
{
89-
$this->assertTrue($this->filter->isExcluded('vfs://root/a/path'));
90-
$this->assertTrue($this->filter->isExcluded('xdebug://debug-eval'));
91-
$this->assertTrue($this->filter->isExcluded('eval()\'d code'));
92-
$this->assertTrue($this->filter->isExcluded('runtime-created function'));
93-
$this->assertTrue($this->filter->isExcluded('assert code'));
94-
$this->assertTrue($this->filter->isExcluded('regexp code'));
94+
$filter = new Filter;
95+
96+
$this->assertTrue($filter->isExcluded('vfs://root/a/path'));
97+
$this->assertTrue($filter->isExcluded('xdebug://debug-eval'));
98+
$this->assertTrue($filter->isExcluded('eval()\'d code'));
99+
$this->assertTrue($filter->isExcluded('runtime-created function'));
100+
$this->assertTrue($filter->isExcluded('assert code'));
101+
$this->assertTrue($filter->isExcluded('regexp code'));
95102
}
96103

97104
#[Ticket('https://github.com/sebastianbergmann/php-code-coverage/issues/664')]
98105
public function testTryingToAddFileThatDoesNotExistDoesNotChangeFilter(): void
99106
{
100-
$this->filter->includeFile('does_not_exist');
107+
$filter = new Filter;
108+
109+
$filter->includeFile('does_not_exist');
101110

102-
$this->assertTrue($this->filter->isEmpty());
103-
$this->assertSame([], $this->filter->files());
111+
$this->assertTrue($filter->isEmpty());
112+
$this->assertSame([], $filter->files());
104113
}
105114
}

0 commit comments

Comments
 (0)