Skip to content

Commit 9a0a5ef

Browse files
martin-georgievmartin-georgiev
authored
chore: unify the tests style (use PHP attributes, descriptive method names, instance-style assertion calls, detailed assertions and custom failure messages) (#431)
1 parent d4f6794 commit 9a0a5ef

File tree

163 files changed

+1873
-931
lines changed

Some content is hidden

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

163 files changed

+1873
-931
lines changed

‎fixtures/MartinGeorgiev/Doctrine/Entity/ContainsJsons.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,15 @@
1010
#[ORM\Entity()]
1111
class ContainsJsons extends Entity
1212
{
13+
#[ORM\Column(type: 'jsonb')]
14+
public array $jsonbObject1;
15+
16+
#[ORM\Column(type: 'jsonb')]
17+
public array $jsonbObject2;
18+
1319
#[ORM\Column(type: Types::JSON)]
14-
public array $object1;
20+
public array $jsonObject1;
1521

1622
#[ORM\Column(type: Types::JSON)]
17-
public array $object2;
23+
public array $jsonObject2;
1824
}

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayAggTest.php‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@
55
namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
66

77
use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayAgg;
8+
use PHPUnit\Framework\Attributes\Test;
89

910
class ArrayAggTest extends ArrayTestCase
1011
{
1112
protected function getStringFunctions(): array
1213
{
13-
return ['ARRAY_AGG' => ArrayAgg::class];
14+
return [
15+
'ARRAY_AGG' => ArrayAgg::class,
16+
];
1417
}
1518

16-
public function test_array_agg_with_text_array(): void
19+
#[Test]
20+
public function can_aggregate_text_arrays(): void
1721
{
1822
$dql = 'SELECT ARRAY_AGG(t.textArray) as result
1923
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
@@ -22,7 +26,8 @@ public function test_array_agg_with_text_array(): void
2226
$this->assertSame('{{apple,banana,orange}}', $result[0]['result']);
2327
}
2428

25-
public function test_array_agg_with_integer_array(): void
29+
#[Test]
30+
public function can_aggregate_integer_arrays(): void
2631
{
2732
$dql = 'SELECT ARRAY_AGG(t.integerArray) as result
2833
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
@@ -31,7 +36,8 @@ public function test_array_agg_with_integer_array(): void
3136
$this->assertSame('{{1,2,3}}', $result[0]['result']);
3237
}
3338

34-
public function test_array_agg_with_boolean_array(): void
39+
#[Test]
40+
public function can_aggregate_boolean_arrays(): void
3541
{
3642
$dql = 'SELECT ARRAY_AGG(t.boolArray) as result
3743
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayAppendTest.php‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@
55
namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
66

77
use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayAppend;
8+
use PHPUnit\Framework\Attributes\Test;
89

910
class ArrayAppendTest extends ArrayTestCase
1011
{
1112
protected function getStringFunctions(): array
1213
{
13-
return ['ARRAY_APPEND' => ArrayAppend::class];
14+
return [
15+
'ARRAY_APPEND' => ArrayAppend::class,
16+
];
1417
}
1518

16-
public function test_array_append_with_text_array(): void
19+
#[Test]
20+
public function can_append_to_text_array(): void
1721
{
1822
$dql = 'SELECT ARRAY_APPEND(t.textArray, \'orange\') as result
1923
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
@@ -25,7 +29,8 @@ public function test_array_append_with_text_array(): void
2529
$this->assertSame(['apple', 'banana', 'orange', 'orange'], $actual);
2630
}
2731

28-
public function test_array_append_with_integer_array(): void
32+
#[Test]
33+
public function can_append_to_integer_array(): void
2934
{
3035
$dql = 'SELECT ARRAY_APPEND(t.integerArray, 3) as result
3136
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
@@ -37,7 +42,8 @@ public function test_array_append_with_integer_array(): void
3742
$this->assertSame([1, 2, 3, 3], $actual);
3843
}
3944

40-
public function test_array_append_with_boolean_array(): void
45+
#[Test]
46+
public function can_append_to_boolean_array(): void
4147
{
4248
$dql = 'SELECT ARRAY_APPEND(t.boolArray, true) as result
4349
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayCardinalityTest.php‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@
55
namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
66

77
use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayCardinality;
8+
use PHPUnit\Framework\Attributes\Test;
89

910
class ArrayCardinalityTest extends ArrayTestCase
1011
{
1112
protected function getStringFunctions(): array
1213
{
13-
return ['ARRAY_CARDINALITY' => ArrayCardinality::class];
14+
return [
15+
'ARRAY_CARDINALITY' => ArrayCardinality::class,
16+
];
1417
}
1518

16-
public function test_array_cardinality_with_text_array(): void
19+
#[Test]
20+
public function can_get_text_array_cardinality(): void
1721
{
1822
$dql = 'SELECT ARRAY_CARDINALITY(t.textArray) as result
1923
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
@@ -23,7 +27,8 @@ public function test_array_cardinality_with_text_array(): void
2327
$this->assertSame(3, $result[0]['result']);
2428
}
2529

26-
public function test_array_cardinality_with_integer_array(): void
30+
#[Test]
31+
public function can_get_integer_array_cardinality(): void
2732
{
2833
$dql = 'SELECT ARRAY_CARDINALITY(t.integerArray) as result
2934
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
@@ -33,7 +38,8 @@ public function test_array_cardinality_with_integer_array(): void
3338
$this->assertSame(3, $result[0]['result']);
3439
}
3540

36-
public function test_array_cardinality_with_boolean_array(): void
41+
#[Test]
42+
public function can_get_boolean_array_cardinality(): void
3743
{
3844
$dql = 'SELECT ARRAY_CARDINALITY(t.boolArray) as result
3945
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayCatTest.php‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@
55
namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
66

77
use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayCat;
8+
use PHPUnit\Framework\Attributes\Test;
89

910
class ArrayCatTest extends ArrayTestCase
1011
{
1112
protected function getStringFunctions(): array
1213
{
13-
return ['ARRAY_CAT' => ArrayCat::class];
14+
return [
15+
'ARRAY_CAT' => ArrayCat::class,
16+
];
1417
}
1518

16-
public function test_array_cat_with_text_arrays(): void
19+
#[Test]
20+
public function can_concatenate_text_arrays(): void
1721
{
1822
$dql = 'SELECT ARRAY_CAT(:array1, :array2) as result
1923
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
@@ -27,7 +31,8 @@ public function test_array_cat_with_text_arrays(): void
2731
$this->assertSame(['apple', 'banana', 'orange', 'kiwi'], $actual);
2832
}
2933

30-
public function test_array_cat_with_integer_arrays(): void
34+
#[Test]
35+
public function can_concatenate_integer_arrays(): void
3136
{
3237
$dql = 'SELECT ARRAY_CAT(:array1, :array2) as result
3338
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
@@ -41,7 +46,8 @@ public function test_array_cat_with_integer_arrays(): void
4146
$this->assertSame([1, 2, 3, 4], $actual);
4247
}
4348

44-
public function test_array_cat_with_boolean_arrays(): void
49+
#[Test]
50+
public function can_concatenate_boolean_arrays(): void
4551
{
4652
$dql = 'SELECT ARRAY_CAT(:array1, :array2) as result
4753
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
@@ -55,7 +61,8 @@ public function test_array_cat_with_boolean_arrays(): void
5561
$this->assertSame([true, false, true, true], $actual);
5662
}
5763

58-
public function test_array_cat_with_array_columns(): void
64+
#[Test]
65+
public function can_concatenate_array_columns(): void
5966
{
6067
$dql = 'SELECT ARRAY_CAT(t.textArray, t.textArray) as result
6168
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayDimensionsTest.php‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@
55
namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
66

77
use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayDimensions;
8+
use PHPUnit\Framework\Attributes\Test;
89

910
class ArrayDimensionsTest extends ArrayTestCase
1011
{
1112
protected function getStringFunctions(): array
1213
{
13-
return ['ARRAY_DIMENSIONS' => ArrayDimensions::class];
14+
return [
15+
'ARRAY_DIMENSIONS' => ArrayDimensions::class,
16+
];
1417
}
1518

16-
public function test_array_dimensions_with_text_array(): void
19+
#[Test]
20+
public function can_get_text_array_dimensions(): void
1721
{
1822
$dql = 'SELECT ARRAY_DIMENSIONS(t.textArray) as result
1923
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
@@ -23,7 +27,8 @@ public function test_array_dimensions_with_text_array(): void
2327
$this->assertSame('[1:3]', $result[0]['result']);
2428
}
2529

26-
public function test_array_dimensions_with_integer_array(): void
30+
#[Test]
31+
public function can_get_integer_array_dimensions(): void
2732
{
2833
$dql = 'SELECT ARRAY_DIMENSIONS(t.integerArray) as result
2934
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
@@ -33,7 +38,8 @@ public function test_array_dimensions_with_integer_array(): void
3338
$this->assertSame('[1:3]', $result[0]['result']);
3439
}
3540

36-
public function test_array_dimensions_with_boolean_array(): void
41+
#[Test]
42+
public function can_get_boolean_array_dimensions(): void
3743
{
3844
$dql = 'SELECT ARRAY_DIMENSIONS(t.boolArray) as result
3945
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayLengthTest.php‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@
55
namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
66

77
use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayLength;
8+
use PHPUnit\Framework\Attributes\Test;
89

910
class ArrayLengthTest extends ArrayTestCase
1011
{
1112
protected function getStringFunctions(): array
1213
{
13-
return ['ARRAY_LENGTH' => ArrayLength::class];
14+
return [
15+
'ARRAY_LENGTH' => ArrayLength::class,
16+
];
1417
}
1518

16-
public function test_array_length_with_text_array(): void
19+
#[Test]
20+
public function can_get_text_array_length(): void
1721
{
1822
$dql = 'SELECT ARRAY_LENGTH(t.textArray, 1) as result
1923
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
@@ -24,7 +28,8 @@ public function test_array_length_with_text_array(): void
2428
$this->assertSame(3, $result[0]['result']);
2529
}
2630

27-
public function test_array_length_with_integer_array(): void
31+
#[Test]
32+
public function can_get_integer_array_length(): void
2833
{
2934
$dql = 'SELECT ARRAY_LENGTH(t.integerArray, 1) as result
3035
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
@@ -35,7 +40,8 @@ public function test_array_length_with_integer_array(): void
3540
$this->assertSame(3, $result[0]['result']);
3641
}
3742

38-
public function test_array_length_with_boolean_array(): void
43+
#[Test]
44+
public function can_get_boolean_array_length(): void
3945
{
4046
$dql = 'SELECT ARRAY_LENGTH(t.boolArray, 1) as result
4147
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
@@ -46,7 +52,8 @@ public function test_array_length_with_boolean_array(): void
4652
$this->assertSame(3, $result[0]['result']);
4753
}
4854

49-
public function test_array_length_with_invalid_dimension(): void
55+
#[Test]
56+
public function returns_null_for_invalid_dimension(): void
5057
{
5158
$dql = 'SELECT ARRAY_LENGTH(t.textArray, 2) as result
5259
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayNumberOfDimensionsTest.php‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@
55
namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
66

77
use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayNumberOfDimensions;
8+
use PHPUnit\Framework\Attributes\Test;
89

910
class ArrayNumberOfDimensionsTest extends ArrayTestCase
1011
{
1112
protected function getStringFunctions(): array
1213
{
13-
return ['ARRAY_NUMBER_OF_DIMENSIONS' => ArrayNumberOfDimensions::class];
14+
return [
15+
'ARRAY_NUMBER_OF_DIMENSIONS' => ArrayNumberOfDimensions::class,
16+
];
1417
}
1518

16-
public function test_array_number_of_dimensions_with_text_array(): void
19+
#[Test]
20+
public function can_get_text_array_number_of_dimensions(): void
1721
{
1822
$dql = 'SELECT ARRAY_NUMBER_OF_DIMENSIONS(t.textArray) as result
1923
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
@@ -24,7 +28,8 @@ public function test_array_number_of_dimensions_with_text_array(): void
2428
$this->assertSame(1, $result[0]['result']);
2529
}
2630

27-
public function test_array_number_of_dimensions_with_integer_array(): void
31+
#[Test]
32+
public function can_get_integer_array_number_of_dimensions(): void
2833
{
2934
$dql = 'SELECT ARRAY_NUMBER_OF_DIMENSIONS(t.integerArray) as result
3035
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
@@ -35,7 +40,8 @@ public function test_array_number_of_dimensions_with_integer_array(): void
3540
$this->assertSame(1, $result[0]['result']);
3641
}
3742

38-
public function test_array_number_of_dimensions_with_boolean_array(): void
43+
#[Test]
44+
public function can_get_boolean_array_number_of_dimensions(): void
3945
{
4046
$dql = 'SELECT ARRAY_NUMBER_OF_DIMENSIONS(t.boolArray) as result
4147
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/ArrayPositionTest.php‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,31 @@
55
namespace Tests\Integration\MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
66

77
use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\ArrayPosition;
8+
use PHPUnit\Framework\Attributes\Test;
89

910
class ArrayPositionTest extends ArrayTestCase
1011
{
1112
protected function getStringFunctions(): array
1213
{
13-
return ['ARRAY_POSITION' => ArrayPosition::class];
14+
return [
15+
'ARRAY_POSITION' => ArrayPosition::class,
16+
];
1417
}
1518

16-
public function test_array_position_with_text_array(): void
19+
#[Test]
20+
public function returns_position_when_text_element_is_found(): void
1721
{
18-
$dql = 'SELECT ARRAY_POSITION(t.textArray, \'banana\') as result
22+
$dql = 'SELECT ARRAY_POSITION(t.textArray, \'orange\') as result
1923
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
2024
WHERE t.id = 1';
2125

2226
$result = $this->executeDqlQuery($dql);
2327
$this->assertIsInt($result[0]['result']);
24-
$this->assertSame(2, $result[0]['result']);
28+
$this->assertSame(3, $result[0]['result']);
2529
}
2630

27-
public function test_array_position_with_integer_array(): void
31+
#[Test]
32+
public function returns_position_when_integer_element_is_found(): void
2833
{
2934
$dql = 'SELECT ARRAY_POSITION(t.integerArray, 2) as result
3035
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
@@ -35,7 +40,8 @@ public function test_array_position_with_integer_array(): void
3540
$this->assertSame(2, $result[0]['result']);
3641
}
3742

38-
public function test_array_position_with_boolean_array(): void
43+
#[Test]
44+
public function returns_position_when_boolean_element_is_found(): void
3945
{
4046
$dql = 'SELECT ARRAY_POSITION(t.boolArray, false) as result
4147
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t
@@ -46,7 +52,8 @@ public function test_array_position_with_boolean_array(): void
4652
$this->assertSame(2, $result[0]['result']);
4753
}
4854

49-
public function test_array_position_with_not_found_element(): void
55+
#[Test]
56+
public function returns_null_when_no_position_is_found(): void
5057
{
5158
$dql = 'SELECT ARRAY_POSITION(t.textArray, \'mango\') as result
5259
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsArrays t

0 commit comments

Comments
 (0)