Remove unnecessary test values

t-regx · Dec 4, 2022 · db00bab · db00bab
1 parent f658903
commit db00bab
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 68 deletions.
diff --git a/test/DataProviders.php b/test/DataProviders.php
@@ -2,7 +2,6 @@
 namespace Test;
 
 use Test\Utils\Classes\ClassWithToString;
-use Test\Utils\Values\Definitions;
 use TRegx\CleanRegex\Internal\Definition;
 
 class DataProviders
@@ -63,7 +62,7 @@ private static function typesMap(): array
             'resource'   => [self::getResource(), 'resource'],
             'stdClass'   => [new \stdClass(), 'stdClass'],
             '__toString' => [new ClassWithToString('string'), 'Test\Utils\Classes\ClassWithToString'],
-            'class'      => [Definitions::pcre('//'), Definition::class],
+            'class'      => [new Definition('//'), Definition::class],
             'function'   => [function () {
             }, 'Closure']
         ];

diff --git a/test/Unit/CleanRegex/Internal/Model/Match/LightweightGroupAwareTest.php b/test/Unit/CleanRegex/Internal/Model/Match/LightweightGroupAwareTest.php
@@ -2,7 +2,7 @@
 namespace Test\Unit\CleanRegex\Internal\Model\Match;
 
 use PHPUnit\Framework\TestCase;
-use Test\Utils\Values\Definitions;
+use TRegx\CleanRegex\Internal\Definition;
 use TRegx\CleanRegex\Internal\GroupKey\GroupName;
 use TRegx\CleanRegex\Internal\Model\LightweightGroupAware;
 
@@ -17,7 +17,7 @@ class LightweightGroupAwareTest extends TestCase
     public function shouldGetGroupKeys()
     {
         // given
-        $groupAware = new LightweightGroupAware(Definitions::pcre('/(?<group>)/'));
+        $groupAware = new LightweightGroupAware(new Definition('/(?<group>)/'));
 
         // when
         $keys = $groupAware->getGroupKeys();
@@ -35,7 +35,7 @@ public function shouldGetGroupKeys()
     public function shouldVerify(string $pattern, bool $expected)
     {
         // given
-        $groupAware = new LightweightGroupAware(Definitions::pcre($pattern));
+        $groupAware = new LightweightGroupAware(new Definition($pattern));
 
         // when
         $hasGroup = $groupAware->hasGroup(new GroupName('group'));

diff --git a/test/Unit/CleanRegex/Internal/Prepared/Parser/EntitySequenceTest.php b/test/Unit/CleanRegex/Internal/Prepared/Parser/EntitySequenceTest.php
@@ -2,7 +2,7 @@
 namespace Test\Unit\CleanRegex\Internal\Prepared\Parser;
 
 use PHPUnit\Framework\TestCase;
-use Test\Utils\Values\StandardSubpatternFlags;
+use Test\Utils\Prepared\StandardSubpatternFlags;
 use TRegx\CleanRegex\Internal\Prepared\Parser\Entity\GroupClose;
 use TRegx\CleanRegex\Internal\Prepared\Parser\Entity\GroupOpenFlags;
 use TRegx\CleanRegex\Internal\Prepared\Parser\EntitySequence;

diff --git a/test/Unit/CleanRegex/Internal/Prepared/Parser/FlagStackTest.php b/test/Unit/CleanRegex/Internal/Prepared/Parser/FlagStackTest.php
@@ -2,7 +2,7 @@
 namespace Test\Unit\CleanRegex\Internal\Prepared\Parser;
 
 use PHPUnit\Framework\TestCase;
-use Test\Utils\Values\StandardSubpatternFlags;
+use Test\Utils\Prepared\StandardSubpatternFlags;
 use TRegx\CleanRegex\Internal\Prepared\Parser\FlagStack;
 
 /**

diff --git a/.../Utils/Values/StandardSubpatternFlags.php → ...tils/Prepared/StandardSubpatternFlags.php b/.../Utils/Values/StandardSubpatternFlags.php → ...tils/Prepared/StandardSubpatternFlags.php
@@ -1,5 +1,5 @@
 <?php
-namespace Test\Utils\Values;
+namespace Test\Utils\Prepared;
 
 use TRegx\CleanRegex\Internal\Flags;
 use TRegx\CleanRegex\Internal\Prepared\Parser\SubpatternFlags;

diff --git a/test/Utils/Values/Definitions.php b/test/Utils/Values/Definitions.php
diff --git a/test/Utils/Values/FocusGroupPairs.php b/test/Utils/Values/FocusGroupPairs.php