Skip to content

Commit 6a2d0ac

Browse files
committed
Refactor test structure by organizing Validation rules
Moved unit tests for validation rules into a dedicated "Rules" subdirectory, updating namespaces accordingly. This improves organization and readability of test files, making it clearer which rules are being tested.
1 parent 8da677c commit 6a2d0ac

File tree

8 files changed

+29
-32
lines changed

8 files changed

+29
-32
lines changed

tests/Unit/Validation/BackedEnumRuleTest.php renamed to tests/Unit/Validation/Rules/BackedEnumRuleTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?php
22

3-
namespace Nuxtifyts\PhpDto\Tests\Unit\Validation;
3+
namespace Nuxtifyts\PhpDto\Tests\Unit\Validation\Rules;
44

5-
use Nuxtifyts\PhpDto\Validation\Rules\BackedEnumRule;
65
use Nuxtifyts\PhpDto\Exceptions\ValidationRuleException;
7-
use Nuxtifyts\PhpDto\Validation\Rules\ValidationRule;
86
use Nuxtifyts\PhpDto\Tests\Dummies\Enums\YesNoBackedEnum;
97
use Nuxtifyts\PhpDto\Tests\Dummies\Enums\YesNoEnum;
8+
use Nuxtifyts\PhpDto\Validation\Rules\BackedEnumRule;
9+
use Nuxtifyts\PhpDto\Validation\Rules\ValidationRule;
1010
use PHPUnit\Framework\Attributes\CoversClass;
1111
use PHPUnit\Framework\Attributes\Test;
1212
use PHPUnit\Framework\Attributes\UsesClass;

tests/Unit/Validation/DateRuleTest.php renamed to tests/Unit/Validation/Rules/DateRuleTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
22

3-
namespace Nuxtifyts\PhpDto\Tests\Unit\Validation;
3+
namespace Nuxtifyts\PhpDto\Tests\Unit\Validation\Rules;
44

5-
use Throwable;
6-
use PHPUnit\Framework\Attributes\Test;
7-
use PHPUnit\Framework\Attributes\CoversClass;
8-
use Nuxtifyts\PhpDto\Validation\Rules\DateRule;
95
use Nuxtifyts\PhpDto\Exceptions\ValidationRuleException;
6+
use Nuxtifyts\PhpDto\Validation\Rules\DateRule;
107
use Nuxtifyts\PhpDto\Validation\Rules\ValidationRule;
8+
use PHPUnit\Framework\Attributes\CoversClass;
9+
use PHPUnit\Framework\Attributes\Test;
10+
use Throwable;
1111

1212
#[CoversClass(DateRule::class)]
1313
#[CoversClass(ValidationRuleException::class)]

tests/Unit/Validation/NullableRuleTest.php renamed to tests/Unit/Validation/Rules/NullableRuleTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

3-
namespace Nuxtifyts\PhpDto\Tests\Unit\Validation;
3+
namespace Nuxtifyts\PhpDto\Tests\Unit\Validation\Rules;
44

5-
use Nuxtifyts\PhpDto\Validation\Rules\NullableRule;
65
use Nuxtifyts\PhpDto\Exceptions\ValidationRuleException;
6+
use Nuxtifyts\PhpDto\Validation\Rules\NullableRule;
77
use Nuxtifyts\PhpDto\Validation\Rules\ValidationRule;
88
use PHPUnit\Framework\Attributes\CoversClass;
99
use PHPUnit\Framework\Attributes\Test;

tests/Unit/Validation/NumericRuleTest.php renamed to tests/Unit/Validation/Rules/NumericRuleTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?php
22

3-
namespace Nuxtifyts\PhpDto\Tests\Unit\Validation;
3+
namespace Nuxtifyts\PhpDto\Tests\Unit\Validation\Rules;
44

55
use Nuxtifyts\PhpDto\Enums\Property\Type;
6-
use PHPUnit\Framework\Attributes\Test;
7-
use PHPUnit\Framework\Attributes\CoversClass;
8-
use Nuxtifyts\PhpDto\Validation\Rules\NumericRule;
96
use Nuxtifyts\PhpDto\Exceptions\ValidationRuleException;
7+
use Nuxtifyts\PhpDto\Validation\Rules\NumericRule;
8+
use PHPUnit\Framework\Attributes\CoversClass;
9+
use PHPUnit\Framework\Attributes\Test;
1010
use PHPUnit\Framework\Attributes\UsesClass;
1111
use Throwable;
1212

tests/Unit/Validation/RegexRuleTest.php renamed to tests/Unit/Validation/Rules/RegexRuleTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
22

3-
namespace Nuxtifyts\PhpDto\Tests\Unit\Validation;
3+
namespace Nuxtifyts\PhpDto\Tests\Unit\Validation\Rules;
44

5-
use Throwable;
6-
use PHPUnit\Framework\Attributes\Test;
7-
use PHPUnit\Framework\Attributes\CoversClass;
5+
use Nuxtifyts\PhpDto\Exceptions\ValidationRuleException;
86
use Nuxtifyts\PhpDto\Validation\Rules\RegexRule;
97
use Nuxtifyts\PhpDto\Validation\Rules\ValidationRule;
10-
use Nuxtifyts\PhpDto\Exceptions\ValidationRuleException;
8+
use PHPUnit\Framework\Attributes\CoversClass;
9+
use PHPUnit\Framework\Attributes\Test;
10+
use Throwable;
1111

1212
#[CoversClass(RegexRule::class)]
1313
#[CoversClass(ValidationRuleException::class)]

tests/Unit/Validation/RequiredRuleTest.php renamed to tests/Unit/Validation/Rules/RequiredRuleTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

3-
namespace Nuxtifyts\PhpDto\Tests\Unit\Validation;
3+
namespace Nuxtifyts\PhpDto\Tests\Unit\Validation\Rules;
44

5-
use Nuxtifyts\PhpDto\Validation\Rules\RequiredRule;
65
use Nuxtifyts\PhpDto\Exceptions\ValidationRuleException;
6+
use Nuxtifyts\PhpDto\Validation\Rules\RequiredRule;
77
use Nuxtifyts\PhpDto\Validation\Rules\ValidationRule;
88
use PHPUnit\Framework\Attributes\CoversClass;
99
use PHPUnit\Framework\Attributes\Test;

tests/Unit/Validation/StringRuleTest.php renamed to tests/Unit/Validation/Rules/StringRuleTest.php

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<?php
22

3-
namespace Nuxtifyts\PhpDto\Tests\Unit\Validation;
3+
namespace Nuxtifyts\PhpDto\Tests\Unit\Validation\Rules;
44

5-
use Throwable;
6-
use PHPUnit\Framework\Attributes\Test;
7-
use PHPUnit\Framework\Attributes\CoversClass;
8-
use Nuxtifyts\PhpDto\Validation\Rules\StringRule;
95
use Nuxtifyts\PhpDto\Exceptions\ValidationRuleException;
10-
use Nuxtifyts\PhpDto\Tests\Unit\Validation\ValidationRuleTestCase;
6+
use Nuxtifyts\PhpDto\Validation\Rules\StringRule;
7+
use PHPUnit\Framework\Attributes\CoversClass;
8+
use PHPUnit\Framework\Attributes\Test;
9+
use Throwable;
1110

1211
#[CoversClass(StringRule::class)]
1312
#[CoversClass(ValidationRuleException::class)]
@@ -19,11 +18,9 @@ final class StringRuleTest extends ValidationRuleTestCase
1918
#[Test]
2019
public function validate_validation_message(): void
2120
{
22-
$rule = StringRule::make();
23-
2421
self::assertEquals(
2522
'The :attribute field must be a valid string.',
26-
$rule->validationMessage()
23+
StringRule::make()->validationMessage()
2724
);
2825
}
2926

tests/Unit/Validation/ValidationRuleTestCase.php renamed to tests/Unit/Validation/Rules/ValidationRuleTestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

3-
namespace Nuxtifyts\PhpDto\Tests\Unit\Validation;
3+
namespace Nuxtifyts\PhpDto\Tests\Unit\Validation\Rules;
44

5+
use Nuxtifyts\PhpDto\Exceptions\ValidationRuleException;
56
use Nuxtifyts\PhpDto\Tests\Unit\UnitCase;
67
use Nuxtifyts\PhpDto\Validation\Rules\ValidationRule;
7-
use Nuxtifyts\PhpDto\Exceptions\ValidationRuleException;
88
use PHPUnit\Framework\Attributes\DataProvider;
99
use PHPUnit\Framework\Attributes\Test;
1010
use Throwable;

0 commit comments

Comments
 (0)