Skip to content

Commit 734beed

Browse files
simonschaufisimonschaufi
committed
[TASK] Use fixture files
1 parent f923073 commit 734beed

File tree

86 files changed

+136
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+136
-79
lines changed

‎packages/fractor-composer-json/rules-tests/AddPackageToRequireComposerJsonFractor/AddPackageToRequireComposerJsonFractorTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ final class AddPackageToRequireComposerJsonFractorTest extends AbstractFractorTe
1515
public function test(string $filePath): void
1616
{
1717
$this->doTestFile($filePath);
18-
$this->assertThatRuleIsApplied($filePath, AddPackageToRequireComposerJsonFractor::class);
18+
$this->assertThatRuleIsApplied(AddPackageToRequireComposerJsonFractor::class);
1919
}
2020

2121
public static function provideData(): Iterator
2222
{
23-
return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.json');
23+
return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.json.fixture');
2424
}
2525

2626
public function provideConfigFilePath(): ?string

‎packages/fractor-composer-json/rules-tests/AddPackageToRequireComposerJsonFractor/Fixtures/composer.json ‎packages/fractor-composer-json/rules-tests/AddPackageToRequireComposerJsonFractor/Fixtures/composer.json.fixture

File renamed without changes.

‎packages/fractor-composer-json/rules-tests/AddPackageToRequireDevComposerJsonFractor/AddPackageToRequireDevComposerJsonFractorTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ final class AddPackageToRequireDevComposerJsonFractorTest extends AbstractFracto
1515
public function test(string $filePath): void
1616
{
1717
$this->doTestFile($filePath);
18-
$this->assertThatRuleIsApplied($filePath, AddPackageToRequireDevComposerJsonFractor::class);
18+
$this->assertThatRuleIsApplied(AddPackageToRequireDevComposerJsonFractor::class);
1919
}
2020

2121
public static function provideData(): Iterator
2222
{
23-
return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.json');
23+
return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.json.fixture');
2424
}
2525

2626
public function provideConfigFilePath(): ?string

‎packages/fractor-composer-json/rules-tests/AddPackageToRequireDevComposerJsonFractor/Fixtures/composer.json ‎packages/fractor-composer-json/rules-tests/AddPackageToRequireDevComposerJsonFractor/Fixtures/composer.json.fixture

File renamed without changes.

‎packages/fractor-composer-json/rules-tests/ChangePackageVersionComposerJsonFractor/ChangePackageVersionComposerJsonFractorTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ final class ChangePackageVersionComposerJsonFractorTest extends AbstractFractorT
1515
public function test(string $filePath): void
1616
{
1717
$this->doTestFile($filePath);
18-
$this->assertThatRuleIsApplied($filePath, ChangePackageVersionComposerJsonFractor::class);
18+
$this->assertThatRuleIsApplied(ChangePackageVersionComposerJsonFractor::class);
1919
}
2020

2121
public static function provideData(): Iterator
2222
{
23-
return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.json');
23+
return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.json.fixture');
2424
}
2525

2626
public function provideConfigFilePath(): ?string

‎packages/fractor-composer-json/rules-tests/ChangePackageVersionComposerJsonFractor/Fixtures/composer.json ‎packages/fractor-composer-json/rules-tests/ChangePackageVersionComposerJsonFractor/Fixtures/composer.json.fixture

File renamed without changes.

‎packages/fractor-composer-json/rules-tests/RemovePackageComposerJsonFractor/Fixtures/composer.json ‎packages/fractor-composer-json/rules-tests/RemovePackageComposerJsonFractor/Fixtures/composer.json.fixture

File renamed without changes.

‎packages/fractor-composer-json/rules-tests/RemovePackageComposerJsonFractor/RemovePackageComposerJsonFractorTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ final class RemovePackageComposerJsonFractorTest extends AbstractFractorTestCase
1515
public function test(string $filePath): void
1616
{
1717
$this->doTestFile($filePath);
18-
$this->assertThatRuleIsApplied($filePath, RemovePackageComposerJsonFractor::class);
18+
$this->assertThatRuleIsApplied(RemovePackageComposerJsonFractor::class);
1919
}
2020

2121
public static function provideData(): Iterator
2222
{
23-
return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.json');
23+
return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.json.fixture');
2424
}
2525

2626
public function provideConfigFilePath(): ?string

‎packages/fractor-composer-json/rules-tests/RenamePackageComposerJsonFractor/Fixtures/composer.json ‎packages/fractor-composer-json/rules-tests/RenamePackageComposerJsonFractor/Fixtures/composer.json.fixture

File renamed without changes.

‎packages/fractor-composer-json/rules-tests/RenamePackageComposerJsonFractor/RenamePackageComposerJsonFractorTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ final class RenamePackageComposerJsonFractorTest extends AbstractFractorTestCase
1515
public function test(string $filePath): void
1616
{
1717
$this->doTestFile($filePath);
18-
$this->assertThatRuleIsApplied($filePath, RenamePackageComposerJsonFractor::class);
18+
$this->assertThatRuleIsApplied(RenamePackageComposerJsonFractor::class);
1919
}
2020

2121
public static function provideData(): Iterator
2222
{
23-
return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.json');
23+
return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.json.fixture');
2424
}
2525

2626
public function provideConfigFilePath(): ?string

‎packages/fractor-composer-json/rules-tests/ReplacePackageAndVersionComposerJsonFractor/Fixtures/composer.json ‎packages/fractor-composer-json/rules-tests/ReplacePackageAndVersionComposerJsonFractor/Fixtures/composer.json.fixture

File renamed without changes.

‎packages/fractor-composer-json/rules-tests/ReplacePackageAndVersionComposerJsonFractor/ReplacePackageAndVersionComposerJsonFractorTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ final class ReplacePackageAndVersionComposerJsonFractorTest extends AbstractFrac
1515
public function test(string $filePath): void
1616
{
1717
$this->doTestFile($filePath);
18-
$this->assertThatRuleIsApplied($filePath, ReplacePackageAndVersionComposerJsonFractor::class);
18+
$this->assertThatRuleIsApplied(ReplacePackageAndVersionComposerJsonFractor::class);
1919
}
2020

2121
public static function provideData(): Iterator
2222
{
23-
return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.json');
23+
return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.json.fixture');
2424
}
2525

2626
public function provideConfigFilePath(): ?string

‎packages/fractor-fluid/tests/FluidFileProcessor/Fixtures/fluid.html ‎packages/fractor-fluid/tests/FluidFileProcessor/Fixtures/fluid.html.fixture

File renamed without changes.

‎packages/fractor-fluid/tests/FluidFileProcessor/FluidFileProcessorTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ final class FluidFileProcessorTest extends AbstractFractorTestCase
1515
public function test(string $filePath): void
1616
{
1717
$this->doTestFile($filePath);
18-
$this->assertThatRuleIsApplied($filePath, DummyFluidFractorRule::class);
18+
$this->assertThatRuleIsApplied(DummyFluidFractorRule::class);
1919
}
2020

2121
public static function provideData(): Iterator
2222
{
23-
return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.html');
23+
return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.html.fixture');
2424
}
2525

2626
public function provideConfigFilePath(): ?string

‎packages/fractor-rule-generator/src/Finder/TemplateFinder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private function addRuleAndTestCase(string $fixtureFileExtension): array
4242
return [
4343
__DIR__ . '/../../templates/rules/TYPO3__MajorPrefixed__/__Type__/__Name__.php',
4444
__DIR__ . '/../../templates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/__Name__Test.php.inc',
45-
__DIR__ . '/../../templates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/Fixtures/fixture.' . $fixtureFileExtension,
45+
__DIR__ . '/../../templates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/Fixtures/fixture.' . $fixtureFileExtension . '.fixture',
4646
__DIR__ . '/../../templates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/config/fractor.php.inc',
4747
];
4848
}

‎packages/fractor-rule-generator/templates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/Fixtures/fixture.html ‎packages/fractor-rule-generator/templates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/Fixtures/fixture.html.fixture

File renamed without changes.

‎packages/fractor-rule-generator/templates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/Fixtures/fixture.json ‎packages/fractor-rule-generator/templates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/Fixtures/fixture.json.fixture

File renamed without changes.

‎packages/fractor-rule-generator/templates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/Fixtures/fixture.typoscript ‎packages/fractor-rule-generator/templates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/Fixtures/fixture.typoscript.fixture

File renamed without changes.

‎packages/fractor-rule-generator/templates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/Fixtures/fixture.xml ‎packages/fractor-rule-generator/templates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/Fixtures/fixture.xml.fixture

File renamed without changes.

‎packages/fractor-rule-generator/templates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/Fixtures/fixture.yaml ‎packages/fractor-rule-generator/templates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/Fixtures/fixture.yaml.fixture

File renamed without changes.

‎packages/fractor-rule-generator/tests/Functional/Console/Command/GenerateRuleCommandTest.php

+22-10
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@ public function testCreateRuleForFlexFormWithoutChangelog(): void
9898
self::assertFileExists($basePathConfig . '/typo3-9999.php');
9999
self::assertFileExists($basePathRules . '/TYPO3v9999/FlexForm/MigrateFlexFormFractor.php');
100100
self::assertFileExists($basePathRuleTests . '/TYPO3v9999/FlexForm/MigrateFlexFormFractor/config/fractor.php');
101-
self::assertFileExists($basePathRuleTests . '/TYPO3v9999/FlexForm/MigrateFlexFormFractor/Fixtures/fixture.xml');
101+
self::assertFileExists(
102+
$basePathRuleTests . '/TYPO3v9999/FlexForm/MigrateFlexFormFractor/Fixtures/fixture.xml.fixture'
103+
);
102104
self::assertFileExists(
103105
$basePathRuleTests . '/TYPO3v9999/FlexForm/MigrateFlexFormFractor/MigrateFlexFormFractorTest.php.inc'
104106
);
@@ -141,7 +143,9 @@ public function testCreateRuleForFlexFormWithChangelog(): void
141143
self::assertFileExists($basePathConfig . '/typo3-9999.php');
142144
self::assertFileExists($basePathRules . '/TYPO3v9999/FlexForm/MigrateFlexFormFractor.php');
143145
self::assertFileExists($basePathRuleTests . '/TYPO3v9999/FlexForm/MigrateFlexFormFractor/config/fractor.php');
144-
self::assertFileExists($basePathRuleTests . '/TYPO3v9999/FlexForm/MigrateFlexFormFractor/Fixtures/fixture.xml');
146+
self::assertFileExists(
147+
$basePathRuleTests . '/TYPO3v9999/FlexForm/MigrateFlexFormFractor/Fixtures/fixture.xml.fixture'
148+
);
145149
self::assertFileExists(
146150
$basePathRuleTests . '/TYPO3v9999/FlexForm/MigrateFlexFormFractor/MigrateFlexFormFractorTest.php.inc'
147151
);
@@ -176,7 +180,9 @@ public function testCreateRuleForFluidWithoutChangelog(): void
176180
self::assertFileExists($basePathConfig . '/typo3-9999.php');
177181
self::assertFileExists($basePathRules . '/TYPO3v9999/Fluid/MigrateFluidFractor.php');
178182
self::assertFileExists($basePathRuleTests . '/TYPO3v9999/Fluid/MigrateFluidFractor/config/fractor.php');
179-
self::assertFileExists($basePathRuleTests . '/TYPO3v9999/Fluid/MigrateFluidFractor/Fixtures/fixture.html');
183+
self::assertFileExists(
184+
$basePathRuleTests . '/TYPO3v9999/Fluid/MigrateFluidFractor/Fixtures/fixture.html.fixture'
185+
);
180186
self::assertFileExists(
181187
$basePathRuleTests . '/TYPO3v9999/Fluid/MigrateFluidFractor/MigrateFluidFractorTest.php.inc'
182188
);
@@ -216,7 +222,9 @@ public function testCreateRuleForFluidWithChangelog(): void
216222
self::assertFileExists($basePathConfig . '/typo3-9999.php');
217223
self::assertFileExists($basePathRules . '/TYPO3v9999/Fluid/MigrateFluidFractor.php');
218224
self::assertFileExists($basePathRuleTests . '/TYPO3v9999/Fluid/MigrateFluidFractor/config/fractor.php');
219-
self::assertFileExists($basePathRuleTests . '/TYPO3v9999/Fluid/MigrateFluidFractor/Fixtures/fixture.html');
225+
self::assertFileExists(
226+
$basePathRuleTests . '/TYPO3v9999/Fluid/MigrateFluidFractor/Fixtures/fixture.html.fixture'
227+
);
220228
self::assertFileExists(
221229
$basePathRuleTests . '/TYPO3v9999/Fluid/MigrateFluidFractor/MigrateFluidFractorTest.php.inc'
222230
);
@@ -253,7 +261,7 @@ public function testCreateRuleForTypoScriptWithoutChangelog(): void
253261
$basePathRuleTests . '/TYPO3v9999/TypoScript/MigrateTypoScriptFractor/config/fractor.php'
254262
);
255263
self::assertFileExists(
256-
$basePathRuleTests . '/TYPO3v9999/TypoScript/MigrateTypoScriptFractor/Fixtures/fixture.typoscript'
264+
$basePathRuleTests . '/TYPO3v9999/TypoScript/MigrateTypoScriptFractor/Fixtures/fixture.typoscript.fixture'
257265
);
258266
self::assertFileExists(
259267
$basePathRuleTests . '/TYPO3v9999/TypoScript/MigrateTypoScriptFractor/MigrateTypoScriptFractorTest.php.inc'
@@ -300,7 +308,7 @@ public function testCreateRuleForTypoScriptWithChangelog(): void
300308
$basePathRuleTests . '/TYPO3v9999/TypoScript/MigrateTypoScriptFractor/config/fractor.php'
301309
);
302310
self::assertFileExists(
303-
$basePathRuleTests . '/TYPO3v9999/TypoScript/MigrateTypoScriptFractor/Fixtures/fixture.typoscript'
311+
$basePathRuleTests . '/TYPO3v9999/TypoScript/MigrateTypoScriptFractor/Fixtures/fixture.typoscript.fixture'
304312
);
305313
self::assertFileExists(
306314
$basePathRuleTests . '/TYPO3v9999/TypoScript/MigrateTypoScriptFractor/MigrateTypoScriptFractorTest.php.inc'
@@ -335,7 +343,9 @@ public function testCreateRuleForYamlWithoutChangelog(): void
335343
self::assertFileExists($basePathConfig . '/typo3-9999.php');
336344
self::assertFileExists($basePathRules . '/TYPO3v9999/Yaml/MigrateYamlFractor.php');
337345
self::assertFileExists($basePathRuleTests . '/TYPO3v9999/Yaml/MigrateYamlFractor/config/fractor.php');
338-
self::assertFileExists($basePathRuleTests . '/TYPO3v9999/Yaml/MigrateYamlFractor/Fixtures/fixture.yaml');
346+
self::assertFileExists(
347+
$basePathRuleTests . '/TYPO3v9999/Yaml/MigrateYamlFractor/Fixtures/fixture.yaml.fixture'
348+
);
339349
self::assertFileExists(
340350
$basePathRuleTests . '/TYPO3v9999/Yaml/MigrateYamlFractor/MigrateYamlFractorTest.php.inc'
341351
);
@@ -375,7 +385,9 @@ public function testCreateRuleForYamlWithChangelog(): void
375385
self::assertFileExists($basePathConfig . '/typo3-9999.php');
376386
self::assertFileExists($basePathRules . '/TYPO3v9999/Yaml/MigrateYamlFractor.php');
377387
self::assertFileExists($basePathRuleTests . '/TYPO3v9999/Yaml/MigrateYamlFractor/config/fractor.php');
378-
self::assertFileExists($basePathRuleTests . '/TYPO3v9999/Yaml/MigrateYamlFractor/Fixtures/fixture.yaml');
388+
self::assertFileExists(
389+
$basePathRuleTests . '/TYPO3v9999/Yaml/MigrateYamlFractor/Fixtures/fixture.yaml.fixture'
390+
);
379391
self::assertFileExists(
380392
$basePathRuleTests . '/TYPO3v9999/Yaml/MigrateYamlFractor/MigrateYamlFractorTest.php.inc'
381393
);
@@ -410,7 +422,7 @@ public function testCreateRuleForComposerWithoutChangelog(): void
410422
self::assertFileExists($basePathRules . '/TYPO3v9999/Composer/MigrateComposerFractor.php');
411423
self::assertFileExists($basePathRuleTests . '/TYPO3v9999/Composer/MigrateComposerFractor/config/fractor.php');
412424
self::assertFileExists(
413-
$basePathRuleTests . '/TYPO3v9999/Composer/MigrateComposerFractor/Fixtures/fixture.json'
425+
$basePathRuleTests . '/TYPO3v9999/Composer/MigrateComposerFractor/Fixtures/fixture.json.fixture'
414426
);
415427
self::assertFileExists(
416428
$basePathRuleTests . '/TYPO3v9999/Composer/MigrateComposerFractor/MigrateComposerFractorTest.php.inc'
@@ -455,7 +467,7 @@ public function testCreateRuleForComposerWithChangelog(): void
455467
self::assertFileExists($basePathRules . '/TYPO3v9999/Composer/MigrateComposerFractor.php');
456468
self::assertFileExists($basePathRuleTests . '/TYPO3v9999/Composer/MigrateComposerFractor/config/fractor.php');
457469
self::assertFileExists(
458-
$basePathRuleTests . '/TYPO3v9999/Composer/MigrateComposerFractor/Fixtures/fixture.json'
470+
$basePathRuleTests . '/TYPO3v9999/Composer/MigrateComposerFractor/Fixtures/fixture.json.fixture'
459471
);
460472
self::assertFileExists(
461473
$basePathRuleTests . '/TYPO3v9999/Composer/MigrateComposerFractor/MigrateComposerFractorTest.php.inc'

‎packages/fractor-typoscript/tests/TypoScriptFileProcessor/Fixtures/fixture.typoscript ‎packages/fractor-typoscript/tests/TypoScriptFileProcessor/Fixtures/fixture.typoscript.fixture

File renamed without changes.

‎packages/fractor-typoscript/tests/TypoScriptFileProcessor/TypoScriptFileProcessorTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ class TypoScriptFileProcessorTest extends AbstractFractorTestCase
1414
public function test(string $filePath): void
1515
{
1616
$this->doTestFile($filePath);
17-
$this->assertThatRuleIsApplied($filePath, DummyTypoScriptFractorRule::class);
17+
$this->assertThatRuleIsApplied(DummyTypoScriptFractorRule::class);
1818
}
1919

2020
public static function provideData(): \Iterator
2121
{
22-
return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.typoscript');
22+
return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.typoscript.fixture');
2323
}
2424

2525
public function provideConfigFilePath(): ?string

‎packages/fractor-yaml/tests/YamlFileProcessor/Fixtures/fixture.yaml ‎packages/fractor-yaml/tests/YamlFileProcessor/Fixtures/fixture.yaml.fixture

File renamed without changes.

‎packages/fractor-yaml/tests/YamlFileProcessor/YamlFileProcessorTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ final class YamlFileProcessorTest extends AbstractFractorTestCase
1515
public function test(string $filePath): void
1616
{
1717
$this->doTestFile($filePath);
18-
$this->assertThatRuleIsApplied($filePath, DummyYamlFractorRule::class);
18+
$this->assertThatRuleIsApplied(DummyYamlFractorRule::class);
1919
}
2020

2121
public static function provideData(): Iterator
2222
{
23-
return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.yaml');
23+
return self::yieldFilesFromDirectory(__DIR__ . '/Fixtures', '*.yaml.fixture');
2424
}
2525

2626
public function provideConfigFilePath(): ?string

‎packages/fractor/src/Testing/PHPUnit/AbstractFractorTestCase.php

+33-22
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
use a9f\Fractor\Testing\Contract\FractorTestInterface;
1717
use a9f\Fractor\Testing\Fixture\FixtureFileFinder;
1818
use a9f\Fractor\Testing\Fixture\FixtureSplitter;
19+
use a9f\Fractor\Testing\PHPUnit\ValueObject\FractorTestResult;
1920
use Nette\Utils\FileSystem;
21+
use Nette\Utils\Strings;
2022
use PHPUnit\Framework\TestCase;
2123
use Psr\Container\ContainerInterface;
2224

@@ -30,8 +32,6 @@ abstract class AbstractFractorTestCase extends TestCase implements FractorTestIn
3032

3133
private FractorRunner $fractorRunner;
3234

33-
private ?string $copiedFile = null;
34-
3535
protected function setUp(): void
3636
{
3737
$this->bootContainer();
@@ -42,10 +42,8 @@ protected function setUp(): void
4242
protected function tearDown(): void
4343
{
4444
// clear temporary file
45-
if (is_string($this->inputFilePath) && is_string($this->copiedFile)) {
45+
if (\is_string($this->inputFilePath)) {
4646
FileSystem::delete($this->inputFilePath);
47-
// restore copied file
48-
FileSystem::rename($this->copiedFile, $this->inputFilePath);
4947
}
5048

5149
unset($this->currentContainer);
@@ -93,9 +91,6 @@ protected static function yieldFilesFromDirectory(string $directory, string $suf
9391

9492
protected function doTestFile(string $fixtureFilePath): void
9593
{
96-
$this->copiedFile = $fixtureFilePath . '.tmp';
97-
98-
FileSystem::copy($fixtureFilePath, $this->copiedFile);
9994
// prepare input file contents and expected file output contents
10095
$fixtureFileContents = FileSystem::read($fixtureFilePath);
10196

@@ -113,9 +108,8 @@ protected function doTestFile(string $fixtureFilePath): void
113108
$inputFilePath = $this->createInputFilePath($fixtureFilePath);
114109
// to remove later in tearDown()
115110
$this->inputFilePath = $inputFilePath;
116-
117-
if ($fixtureFilePath === $this->copiedFile) {
118-
throw new ShouldNotHappenException('Fixture file and copied file cannot be the same: ' . $fixtureFilePath);
111+
if ($fixtureFilePath === $inputFilePath) {
112+
throw new ShouldNotHappenException('Fixture file and input file cannot be the same: ' . $fixtureFilePath);
119113
}
120114

121115
// write temp file
@@ -127,9 +121,12 @@ protected function doTestFile(string $fixtureFilePath): void
127121
/**
128122
* @param class-string<FractorRule> $rule
129123
*/
130-
protected function assertThatRuleIsApplied(string $filePath, string $rule): void
124+
protected function assertThatRuleIsApplied(string $rule): void
131125
{
132-
$file = $this->fileCollector->getFileByPath($filePath);
126+
if (! \is_string($this->inputFilePath)) {
127+
self::fail('inputFilePath is not a string');
128+
}
129+
$file = $this->fileCollector->getFileByPath($this->inputFilePath);
133130
self::assertInstanceOf(File::class, $file);
134131
self::assertEquals([AppliedRule::fromClassString($rule)], $file->getAppliedRules());
135132
}
@@ -148,32 +145,46 @@ private function doTestFileMatchesExpectedContent(
148145
string $fixtureFilePath
149146
): void {
150147
// the file is now changed (if any rule matches)
151-
$changedContents = $this->processFilePath($originalFilePath);
148+
$fractorTestResult = $this->processFilePath($originalFilePath);
149+
$changedContents = $fractorTestResult->getChangedContents();
152150

153151
$fixtureFilename = basename($fixtureFilePath);
154152
$failureMessage = sprintf('Failed on fixture file "%s"', $fixtureFilename);
153+
// give more context about used rules in case of set testing
154+
if (\count($fractorTestResult->getAppliedFractorRules()) > 1) {
155+
$failureMessage .= \PHP_EOL . \PHP_EOL;
156+
$failureMessage .= 'Applied Rector rules:' . \PHP_EOL;
157+
foreach ($fractorTestResult->getAppliedFractorRules() as $appliedFractorRule) {
158+
$failureMessage .= ' * ' . $appliedFractorRule . \PHP_EOL;
159+
}
160+
}
155161

156162
self::assertSame(trim($expectedFileContents), trim($changedContents), $failureMessage);
157163
}
158164

159-
private function processFilePath(string $filePath): string
165+
private function processFilePath(string $filePath): FractorTestResult
160166
{
161167
$configurationFactory = $this->getService(ConfigurationFactory::class);
162168
$configuration = $configurationFactory->createForTests([$filePath]);
163169

164-
$this->fractorRunner->run(new NullOutput(), $configuration);
170+
$processResult = $this->fractorRunner->run(new NullOutput(), $configuration);
165171

166172
// return changed file contents
167-
return FileSystem::read($filePath);
173+
$changedFileContents = FileSystem::read($filePath);
174+
175+
return new FractorTestResult($changedFileContents, $processResult);
168176
}
169177

170178
private function createInputFilePath(string $fixtureFilePath): string
171179
{
172-
$inputFileDirectory = dirname($fixtureFilePath);
173-
174-
$trimmedFixtureFilePath = $fixtureFilePath;
175-
176-
$fixtureBasename = pathinfo($trimmedFixtureFilePath, PATHINFO_BASENAME);
180+
$inputFileDirectory = \dirname($fixtureFilePath);
181+
// remove ".fixture" suffix
182+
if (str_ends_with($fixtureFilePath, '.fixture')) {
183+
$trimmedFixtureFilePath = Strings::substring($fixtureFilePath, 0, -8);
184+
} else {
185+
$trimmedFixtureFilePath = $fixtureFilePath;
186+
}
187+
$fixtureBasename = \pathinfo($trimmedFixtureFilePath, \PATHINFO_BASENAME);
177188
return $inputFileDirectory . '/' . $fixtureBasename;
178189
}
179190
}

0 commit comments

Comments
 (0)