udpate tests

Author: TomasVotruba

tests/Skipper/Skipper/Fixture/Element/FifthElement.php

@@ -4,6 +4,23 @@
 
 namespace Rector\Tests\Skipper\Skipper\Fixture\Element;
 
-final class FifthElement
+use PhpParser\Node;
+use Rector\RuleDoc\RuleDefinition;
+
+final class FifthElement implements \Rector\Contract\Rector\RectorInterface
 {
+    public function getRuleDefinition(): RuleDefinition
+    {
+        // TODO: Implement getRuleDefinition() method.
+    }
+
+    public function getNodeTypes(): array
+    {
+        // TODO: Implement getNodeTypes() method.
+    }
+
+    public function refactor(Node $node)
+    {
+        // TODO: Implement refactor() method.
+    }
 }

tests/Skipper/Skipper/SkipperTest.php

@@ -8,12 +8,11 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Configuration\Option;
 use Rector\Configuration\Parameter\SimpleParameterProvider;
+use Rector\Contract\Rector\RectorInterface;
 use Rector\Skipper\Skipper\Skipper;
 use Rector\Testing\PHPUnit\AbstractLazyTestCase;
 use Rector\Tests\Skipper\Skipper\Fixture\Element\FifthElement;
-use Rector\Tests\Skipper\Skipper\Fixture\Element\ThreeMan;
 use Rector\Tests\Skipper\Skipper\Source\AnotherClassToSkip;
-use Rector\Tests\Skipper\Skipper\Source\NotSkippedClass;
 
 final class SkipperTest extends AbstractLazyTestCase
 {
@@ -69,44 +68,18 @@ public static function provideDataShouldSkipFilePath(): Iterator
         yield [__DIR__ . '/Fixture/PathSkippedWithMask/another_file.txt', true];
     }
 
-    /**
-     * @param object|class-string $element
-     */
-    #[DataProvider('provideDataShouldSkipElement')]
-    public function testSkipElement(string|object $element, bool $expectedSkip): void
+    #[DataProvider('provideRectorAndFile')]
+    public function testSkipElementAndFilePath(RectorInterface $rector, string $filePath, bool $expectedSkip): void
     {
-        $resultSkip = $this->skipper->shouldSkipElement($element);
-        $this->assertSame($expectedSkip, $resultSkip);
-    }
-
-    #[DataProvider('provideCheckerAndFile')]
-    public function testSkipElementAndFilePath(string $element, string $filePath, bool $expectedSkip): void
-    {
-        $resolvedSkip = $this->skipper->shouldSkipRectorAndFile($element, $filePath);
+        $resolvedSkip = $this->skipper->shouldSkipRectorAndFile($rector, $filePath);
         $this->assertSame($expectedSkip, $resolvedSkip);
     }
 
-    /**
-     * @return Iterator<array<array<int, mixed>, mixed>>
-     */
-    public static function provideCheckerAndFile(): Iterator
+    public static function provideRectorAndFile(): Iterator
     {
-        yield [FifthElement::class, __DIR__ . '/Fixture', true];
+        yield [new FifthElement(), __DIR__ . '/Fixture', true];
 
-        yield [AnotherClassToSkip::class, __DIR__ . '/Fixture/someFile', true];
-        yield [AnotherClassToSkip::class, __DIR__ . '/Fixture/someDirectory/anotherFile.php', true];
-
-        yield [NotSkippedClass::class, __DIR__ . '/Fixture/someFile', false];
-        yield [NotSkippedClass::class, __DIR__ . '/Fixture/someOtherFile', false];
-    }
-
-    /**
-     * @return Iterator<array<array<int, mixed>, mixed>>
-     */
-    public static function provideDataShouldSkipElement(): Iterator
-    {
-        yield [ThreeMan::class, false];
-        yield [FifthElement::class, true];
-        yield [new FifthElement(), true];
+        yield [new AnotherClassToSkip(), __DIR__ . '/Fixture/someFile', true];
+        yield [new AnotherClassToSkip(), __DIR__ . '/Fixture/someDirectory/anotherFile.php', true];
     }
 }

tests/Skipper/Skipper/Source/AnotherClassToSkip.php

@@ -4,6 +4,24 @@
 
 namespace Rector\Tests\Skipper\Skipper\Source;
 
-final class AnotherClassToSkip
+use PhpParser\Node;
+use Rector\Contract\Rector\RectorInterface;
+use Rector\RuleDoc\RuleDefinition;
+
+final class AnotherClassToSkip implements RectorInterface
 {
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition('Skip this class', []);
+    }
+
+    public function getNodeTypes(): array
+    {
+        return [];
+    }
+
+    public function refactor(Node $node)
+    {
+        return null;
+    }
 }

tests/Skipper/Skipper/Source/NotSkippedClass.php

@@ -50,7 +50,6 @@ protected function tearDown(): void
     public function testCollectsOnlyMatchedSkips(): void
     {
         $this->skipper->shouldSkipFilePath('tests/Skipper/Skipper/Fixture/SomeSkippedPath/any.txt');
-        $this->skipper->shouldSkipElement(FifthElement::class);
 
         $usedSkips = $this->usedSkipCollector->provide();
 
@@ -77,7 +76,7 @@ public function testCollectsMatchedPathNotRuleClassForRuleScopedSkip(): void
         ]);
 
         $this->skipper->shouldSkipRectorAndFile(
-            AnotherClassToSkip::class,
+            new AnotherClassToSkip(),
             __DIR__ . '/Fixture/someDirectory/anotherFile.php'
         );