Skip to content

Commit baf89bc

Browse files
author
Igor Kusmitsch
committed
fix tests
1 parent e847f8d commit baf89bc

24 files changed

+271
-476
lines changed

‎tests/DMS/Filter/FilterTest.php

Lines changed: 16 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
use DMS\Tests\Dummy;
88
use DMS\Filter\Mapping\ClassMetadataFactory;
99
use Generator;
10+
use PHPUnit\Framework\Attributes\DataProvider;
1011

1112
class FilterTest extends FilterTestCase
1213
{
13-
/**
14-
* @dataProvider filterClassDataProvider
15-
*/
14+
#[DataProvider('filterClassDataProvider')]
1615
public function testFilter(Filter $filter, $class): void
1716
{
1817
$class->name = "Sir Isaac<script></script> Newton";
@@ -31,9 +30,7 @@ public function testFilter(Filter $filter, $class): void
3130
$this->assertStringNotContainsString("<p>", $class->description);
3231
}
3332

34-
/**
35-
* @dataProvider filterChildClassDataProvider
36-
*/
33+
#[DataProvider('filterChildClassDataProvider')]
3734
public function testFilterWithParent(Filter $filter, $class): void
3835
{
3936
$class->name = "Sir Isaac<script></script> Newton";
@@ -55,9 +52,7 @@ public function testFilterWithParent(Filter $filter, $class): void
5552
$this->assertStringNotContainsString(" ", $class->surname);
5653
}
5754

58-
/**
59-
* @dataProvider filterClassDataProvider
60-
*/
55+
#[DataProvider('filterClassDataProvider')]
6156
public function testFilterProperty(Filter $filter, $class): void
6257
{
6358
$class->name = "Sir Isaac<script></script> Newton";
@@ -74,9 +69,7 @@ public function testFilterProperty(Filter $filter, $class): void
7469
$this->assertStringNotContainsString("<p>", $class->description);
7570
}
7671

77-
/**
78-
* @dataProvider filterDataProvider
79-
*/
72+
#[DataProvider('filterDataProvider')]
8073
public function testFilterValue(Filter $filter): void
8174
{
8275
$value = "this is <b> a string<p> with<b> tags</p> and malformed";
@@ -89,9 +82,7 @@ public function testFilterValue(Filter $filter): void
8982
$this->assertStringNotContainsString('<p>', $filtered);
9083
}
9184

92-
/**
93-
* @dataProvider filterDataProvider
94-
*/
85+
#[DataProvider('filterDataProvider')]
9586
public function testFilterValueWithArray(Filter $filter): void
9687
{
9788
$value = "this is <b> a string<p> with<b> tags</p> and\n malformed";
@@ -106,57 +97,39 @@ public function testFilterValueWithArray(Filter $filter): void
10697
$this->assertStringNotContainsString('\n', $filtered);
10798
}
10899

109-
/**
110-
* @dataProvider filterDataProvider
111-
*/
100+
#[DataProvider('filterDataProvider')]
112101
public function testNotFailOnNull(Filter $filter): void
113102
{
114103
$this->expectNotToPerformAssertions();
115104
$filter->filterEntity(null);
116105
}
117106

118-
/**
119-
* @dataProvider filterDataProvider
120-
*/
107+
#[DataProvider('filterDataProvider')]
121108
public function testGetMetadataFactory(Filter $filter): void
122109
{
123110
$this->assertInstanceOf(ClassMetadataFactory::class, $filter->getMetadataFactory());
124111
}
125-
126-
public function filterClassDataProvider(): Generator
127-
{
128-
yield 'Annotation' => [
129-
new Filter($this->buildMetadataFactoryWithAnnotationLoader(), new FilterLoader()),
130-
new Dummy\Classes\AnnotatedClass(),
131-
];
132112

113+
public static function filterClassDataProvider(): Generator
114+
{
133115
yield 'Attribute' => [
134-
new Filter($this->buildMetadataFactoryWithAttributeLoader(), new FilterLoader()),
116+
new Filter(self::buildMetadataFactoryWithAttributeLoader(), new FilterLoader()),
135117
new Dummy\Classes\AttributedClass(),
136118
];
137119
}
138120

139-
public function filterChildClassDataProvider(): Generator
121+
public static function filterChildClassDataProvider(): Generator
140122
{
141-
yield 'Annotation' => [
142-
new Filter($this->buildMetadataFactoryWithAnnotationLoader(), new FilterLoader()),
143-
new Dummy\Classes\ChildAnnotatedClass(),
144-
];
145-
146123
yield 'Attribute' => [
147-
new Filter($this->buildMetadataFactoryWithAttributeLoader(), new FilterLoader()),
124+
new Filter(self::buildMetadataFactoryWithAttributeLoader(), new FilterLoader()),
148125
new Dummy\Classes\ChildAttributedClass(),
149126
];
150127
}
151-
152-
public function filterDataProvider(): Generator
153-
{
154-
yield 'Annotation' => [
155-
new Filter($this->buildMetadataFactoryWithAnnotationLoader(), new FilterLoader()),
156-
];
157128

129+
public static function filterDataProvider(): Generator
130+
{
158131
yield 'Attribute' => [
159-
new Filter($this->buildMetadataFactoryWithAttributeLoader(), new FilterLoader()),
132+
new Filter(self::buildMetadataFactoryWithAttributeLoader(), new FilterLoader()),
160133
];
161134
}
162135
}

‎tests/DMS/Filter/Filters/AlnumTest.php

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,18 @@
44

55
use DMS\Tests\FilterTestCase;
66
use DMS\Filter\Rules\Alnum as AlnumRule;
7+
use PHPUnit\Framework\Attributes\DataProvider;
8+
use ReflectionException;
79
use ReflectionProperty;
810

911
class AlnumTest extends FilterTestCase
1012
{
11-
1213
/**
13-
* @dataProvider provideForRule
14-
*
15-
* @param $options
16-
* @param $value
17-
* @param $expectedResult
18-
* @param null $unicodeSetting
19-
*
20-
* @throws \ReflectionException
14+
* @throws ReflectionException
2115
*/
22-
public function testRule($options, $value, $expectedResult, $unicodeSetting = null): void
16+
#[DataProvider('provideForRule')]
17+
public function testRule(AlnumRule $rule, $value, $expectedResult, $unicodeSetting = null): void
2318
{
24-
$rule = new AlnumRule($options);
2519
$filter = new Alnum();
2620

2721
if ($unicodeSetting !== null) {
@@ -35,26 +29,26 @@ public function testRule($options, $value, $expectedResult, $unicodeSetting = nu
3529
$this->assertEquals($expectedResult, $result);
3630
}
3731

38-
public function provideForRule(): array
32+
public static function provideForRule(): array
3933
{
4034
return [
41-
[false, "My Text", "MyText", true],
42-
[false, "My Text", "MyText", false],
43-
[true, "My Text", "My Text", true],
44-
[true, "My Text", "My Text", false],
45-
[true, "My Text!", "My Text", true],
46-
[true, "My Text!", "My Text", false],
47-
[true, "My Text21!", "My Text21", true],
48-
[true, "My Text21!", "My Text21", false],
49-
[true, "João Sorrisão", "João Sorrisão", true],
50-
[true, "João Sorrisão", "Joo Sorriso", false],
51-
[true, "GRΣΣK", "GRΣΣK", true],
52-
[true, "GRΣΣK", "GRK", false],
53-
[true, "Helgi Þormar Þorbjörnsson", "Helgi Þormar Þorbjörnsson", true],
54-
[true, "Helgi Þormar Þorbjörnsson", "Helgi ormar orbjrnsson", false],
55-
[true, "Helgi Þormar!@#$&*( )(*&%$#@Þorbjörnsson", "Helgi Þormar Þorbjörnsson", true],
56-
[true, "Helgi Þormar!@#$&*( )(*&%$#@Þorbjörnsson", "Helgi ormar orbjrnsson", false],
57-
[true, null, null, false],
35+
[new AlnumRule(false), "My Text", "MyText", true],
36+
[new AlnumRule(false), "My Text", "MyText", false],
37+
[new AlnumRule(true), "My Text", "My Text", true],
38+
[new AlnumRule(true), "My Text", "My Text", false],
39+
[new AlnumRule(true), "My Text!", "My Text", true],
40+
[new AlnumRule(true), "My Text!", "My Text", false],
41+
[new AlnumRule(true), "My Text21!", "My Text21", true],
42+
[new AlnumRule(true), "My Text21!", "My Text21", false],
43+
[new AlnumRule(true), "João Sorrisão", "João Sorrisão", true],
44+
[new AlnumRule(true), "João Sorrisão", "Joo Sorriso", false],
45+
[new AlnumRule(true), "GRΣΣK", "GRΣΣK", true],
46+
[new AlnumRule(true), "GRΣΣK", "GRK", false],
47+
[new AlnumRule(true), "Helgi Þormar Þorbjörnsson", "Helgi Þormar Þorbjörnsson", true],
48+
[new AlnumRule(true), "Helgi Þormar Þorbjörnsson", "Helgi ormar orbjrnsson", false],
49+
[new AlnumRule(true), "Helgi Þormar!@#$&*( )(*&%$#@Þorbjörnsson", "Helgi Þormar Þorbjörnsson", true],
50+
[new AlnumRule(true), "Helgi Þormar!@#$&*( )(*&%$#@Þorbjörnsson", "Helgi ormar orbjrnsson", false],
51+
[new AlnumRule(true), null, null, false],
5852
];
5953
}
6054
}

‎tests/DMS/Filter/Filters/AlphaTest.php

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,18 @@
44

55
use DMS\Tests\FilterTestCase;
66
use DMS\Filter\Rules\Alpha as AlphaRule;
7+
use PHPUnit\Framework\Attributes\DataProvider;
8+
use ReflectionException;
79
use ReflectionProperty;
810

911
class AlphaTest extends FilterTestCase
1012
{
11-
1213
/**
13-
* @dataProvider provideForRule
14-
*
15-
* @param $options
16-
* @param $value
17-
* @param $expectedResult
18-
* @param null $unicodeSetting
19-
*
20-
* @throws \ReflectionException
14+
* @throws ReflectionException
2115
*/
22-
public function testRule($options, $value, $expectedResult, $unicodeSetting = null): void
16+
#[DataProvider('provideForRule')]
17+
public function testRule(AlphaRule $rule, $value, $expectedResult, $unicodeSetting = null): void
2318
{
24-
$rule = new AlphaRule($options);
2519
$filter = new Alpha();
2620

2721
if ($unicodeSetting !== null) {
@@ -35,24 +29,24 @@ public function testRule($options, $value, $expectedResult, $unicodeSetting = nu
3529
$this->assertEquals($expectedResult, $result);
3630
}
3731

38-
public function provideForRule(): array
32+
public static function provideForRule(): array
3933
{
4034
return [
41-
[false, "My Text", "MyText", true],
42-
[false, "My Text", "MyText", false],
43-
[true, "My Text", "My Text", true],
44-
[true, "My Text", "My Text", false],
45-
[true, "My Text!", "My Text", true],
46-
[true, "My Text!", "My Text", false],
47-
[true, "My Text21!", "My Text", true],
48-
[true, "My Text21!", "My Text", false],
49-
[true, "João 2Sorrisão", "João Sorrisão", true],
50-
[true, "João 2Sorrisão", "Joo Sorriso", false],
51-
[true, "Helgi Þormar Þorbjörnsson", "Helgi Þormar Þorbjörnsson", true],
52-
[true, "Helgi Þormar Þorbjörnsson", "Helgi ormar orbjrnsson", false],
53-
[true, "Helgi Þormar!@#$&*( )(*&%$#@Þorbjörnsson", "Helgi Þormar Þorbjörnsson", true],
54-
[true, "Helgi Þormar!@#$&*( )(*&%$#@Þorbjörnsson", "Helgi ormar orbjrnsson", false],
55-
[true, null, null, false],
35+
[new AlphaRule(false), "My Text", "MyText", true],
36+
[new AlphaRule(false), "My Text", "MyText", false],
37+
[new AlphaRule(true), "My Text", "My Text", true],
38+
[new AlphaRule(true), "My Text", "My Text", false],
39+
[new AlphaRule(true), "My Text!", "My Text", true],
40+
[new AlphaRule(true), "My Text!", "My Text", false],
41+
[new AlphaRule(true), "My Text21!", "My Text", true],
42+
[new AlphaRule(true), "My Text21!", "My Text", false],
43+
[new AlphaRule(true), "João 2Sorrisão", "João Sorrisão", true],
44+
[new AlphaRule(true), "João 2Sorrisão", "Joo Sorriso", false],
45+
[new AlphaRule(true), "Helgi Þormar Þorbjörnsson", "Helgi Þormar Þorbjörnsson", true],
46+
[new AlphaRule(true), "Helgi Þormar Þorbjörnsson", "Helgi ormar orbjrnsson", false],
47+
[new AlphaRule(true), "Helgi Þormar!@#$&*( )(*&%$#@Þorbjörnsson", "Helgi Þormar Þorbjörnsson", true],
48+
[new AlphaRule(true), "Helgi Þormar!@#$&*( )(*&%$#@Þorbjörnsson", "Helgi ormar orbjrnsson", false],
49+
[new AlphaRule(true), null, null, false],
5650
];
5751
}
5852
}

‎tests/DMS/Filter/Filters/BooleanTest.php

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,29 @@
44

55
use DMS\Tests\FilterTestCase;
66
use DMS\Filter\Rules\BooleanScalar as BooleanRule;
7+
use PHPUnit\Framework\Attributes\DataProvider;
78

89
class BooleanTest extends FilterTestCase
910
{
10-
11-
/**
12-
* @dataProvider provideForRule
13-
*
14-
* @param $options
15-
* @param $value
16-
* @param $expectedResult
17-
*/
18-
public function testRule($options, $value, $expectedResult): void
11+
#[DataProvider('provideForRule')]
12+
public function testRule(BooleanRule $rule, $value, $expectedResult): void
1913
{
20-
$rule = new BooleanRule($options);
2114
$filter = new BooleanScalar();
2215

2316
$result = $filter->apply($rule, $value);
2417

2518
$this->assertEquals($expectedResult, $result);
2619
}
2720

28-
public function provideForRule(): array
21+
public static function provideForRule(): array
2922
{
3023
return [
31-
[null, "My Text", true],
32-
[null, "", false],
33-
[null, null, false],
34-
[null, 21.9, true],
35-
[null, 21, true],
36-
[null, 0, false],
24+
[new BooleanRule(), "My Text", true],
25+
[new BooleanRule(), "", false],
26+
[new BooleanRule(), null, false],
27+
[new BooleanRule(), 21.9, true],
28+
[new BooleanRule(), 21, true],
29+
[new BooleanRule(), 0, false],
3730
];
3831
}
3932
}

0 commit comments

Comments
 (0)