Skip to content

Commit be0d8ad

Browse files
aaa2000aaa2000
committed
test: keep only one for a nested property
1 parent 118dcbb commit be0d8ad

5 files changed

Lines changed: 10 additions & 125 deletions

File tree

‎tests/Fixtures/TestBundle/Entity/Uuid/RamseyUuidBinaryDeviceEndpoint.php‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,10 @@
3333
'myDevice' => new QueryParameter(
3434
filter: new UuidBinaryFilter(),
3535
),
36-
'myDevice.externalId' => new QueryParameter(
37-
filter: new UuidBinaryFilter(),
38-
property: 'myDevice.externalId',
39-
),
4036
'myDeviceExternalIdAlias' => new QueryParameter(
4137
filter: new UuidBinaryFilter(),
4238
property: 'myDevice.externalId',
4339
),
44-
'name_converted.name_converted' => new QueryParameter(
45-
filter: new UuidBinaryFilter(),
46-
property: 'nameConverted.nameConverted',
47-
),
48-
'nameConverted.nameConverted' => new QueryParameter(
49-
filter: new UuidBinaryFilter(),
50-
property: 'nameConverted.nameConverted',
51-
),
52-
'nameConvertedAlias' => new QueryParameter(
53-
filter: new UuidBinaryFilter(),
54-
property: 'nameConverted.nameConverted',
55-
),
5640
]
5741
),
5842
new Post(),

‎tests/Fixtures/TestBundle/Entity/Uuid/RamseyUuidDeviceEndpoint.php‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,10 @@
3333
'myDevice' => new QueryParameter(
3434
filter: new UuidFilter(),
3535
),
36-
'myDevice.externalId' => new QueryParameter(
37-
filter: new UuidFilter(),
38-
property: 'myDevice.externalId',
39-
),
4036
'myDeviceExternalIdAlias' => new QueryParameter(
4137
filter: new UuidFilter(),
4238
property: 'myDevice.externalId',
4339
),
44-
'name_converted.name_converted' => new QueryParameter(
45-
filter: new UuidFilter(),
46-
property: 'nameConverted.nameConverted',
47-
),
48-
'nameConverted.nameConverted' => new QueryParameter(
49-
filter: new UuidFilter(),
50-
property: 'nameConverted.nameConverted',
51-
),
52-
'nameConvertedAlias' => new QueryParameter(
53-
filter: new UuidFilter(),
54-
property: 'nameConverted.nameConverted',
55-
),
5640
]
5741
),
5842
new Post(),

‎tests/Fixtures/TestBundle/Entity/Uuid/SymfonyUlidDeviceEndpoint.php‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,10 @@
3333
'myDevice' => new QueryParameter(
3434
filter: new UlidFilter(),
3535
),
36-
'myDevice.externalId' => new QueryParameter(
37-
filter: new UlidFilter(),
38-
property: 'myDevice.externalId',
39-
),
4036
'myDeviceExternalIdAlias' => new QueryParameter(
4137
filter: new UlidFilter(),
4238
property: 'myDevice.externalId',
4339
),
44-
'name_converted.name_converted' => new QueryParameter(
45-
filter: new UlidFilter(),
46-
property: 'nameConverted.nameConverted',
47-
),
48-
'nameConverted.nameConverted' => new QueryParameter(
49-
filter: new UlidFilter(),
50-
property: 'nameConverted.nameConverted',
51-
),
52-
'nameConvertedAlias' => new QueryParameter(
53-
filter: new UlidFilter(),
54-
property: 'nameConverted.nameConverted',
55-
),
5640
]
5741
),
5842
new Post(),

‎tests/Fixtures/TestBundle/Entity/Uuid/SymfonyUuidDeviceEndpoint.php‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,10 @@
3232
'myDevice' => new QueryParameter(
3333
filter: new UuidFilter(),
3434
),
35-
'myDevice.externalId' => new QueryParameter(
36-
filter: new UuidFilter(),
37-
property: 'myDevice.externalId',
38-
),
3935
'myDeviceExternalIdAlias' => new QueryParameter(
4036
filter: new UuidFilter(),
4137
property: 'myDevice.externalId',
4238
),
43-
'name_converted.name_converted' => new QueryParameter(
44-
filter: new UuidFilter(),
45-
property: 'nameConverted.nameConverted',
46-
),
47-
'nameConverted.nameConverted' => new QueryParameter(
48-
filter: new UuidFilter(),
49-
property: 'nameConverted.nameConverted',
50-
),
51-
'nameConvertedAlias' => new QueryParameter(
52-
filter: new UuidFilter(),
53-
property: 'nameConverted.nameConverted',
54-
),
5539
]
5640
),
5741
new Post(),

‎tests/Functional/Uuid/UuidFilterBaseTestCase.php‎

Lines changed: 10 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use ApiPlatform\Tests\RecreateSchemaTrait;
1818
use ApiPlatform\Tests\SetupClassResourcesTrait;
1919
use Doctrine\ORM\EntityManagerInterface;
20-
use PHPUnit\Framework\Attributes\DataProvider;
2120
use Symfony\Component\HttpFoundation\Response;
2221

2322
abstract class UuidFilterBaseTestCase extends ApiTestCase
@@ -316,15 +315,21 @@ public function testGetOpenApiDescription(): void
316315
);
317316
}
318317

319-
#[DataProvider('provideSearchFilterByNestedProperty')]
320-
public function testSearchFilterByUuidNested(callable $fixtureFactoryCallable, callable $queryCallable): void
318+
public function testSearchFilterByUuidNested(): void
321319
{
322320
$this->recreateSchema(static::getResources());
323321

324-
$expectedDeviceEndpoint = $fixtureFactoryCallable($this);
322+
$manager = $this->getEntityManager();
323+
$manager->persist($fooDevice = $this->createDevice());
324+
$manager->persist($barDevice = $this->createDevice());
325+
$manager->persist($this->createDeviceEndpoint(null, $fooDevice));
326+
$manager->persist($expectedDeviceEndpoint = $this->createDeviceEndpoint(null, $barDevice));
327+
$manager->flush();
325328

326329
$response = self::createClient()->request('GET', '/'.$this->getUrlPrefix().'_device_endpoints', [
327-
'query' => $queryCallable($expectedDeviceEndpoint),
330+
'query' => [
331+
'myDeviceExternalIdAlias' => (string) $expectedDeviceEndpoint->myDevice->externalId,
332+
],
328333
]);
329334

330335
self::assertResponseIsSuccessful();
@@ -345,62 +350,6 @@ public function testSearchFilterByUuidNested(callable $fixtureFactoryCallable, c
345350
);
346351
}
347352

348-
public static function provideSearchFilterByNestedProperty(): iterable
349-
{
350-
yield 'Filter uuid by nested property' => [
351-
$fixtureFactoryWithMyDeviceCallable = function (UuidFilterBaseTestCase $self) {
352-
$manager = $self->getEntityManager();
353-
$manager->persist($fooDevice = $self->createDevice());
354-
$manager->persist($barDevice = $self->createDevice());
355-
$manager->persist($self->createDeviceEndpoint(null, $fooDevice));
356-
$manager->persist($expectedDeviceEndpoint = $self->createDeviceEndpoint(null, $barDevice));
357-
$manager->flush();
358-
359-
return $expectedDeviceEndpoint;
360-
},
361-
fn ($expectedDeviceEndpoint) => [
362-
'myDevice.externalId' => (string) $expectedDeviceEndpoint->myDevice->externalId,
363-
],
364-
];
365-
366-
yield 'Filter uuid by nested property with alias as query parameter' => [
367-
$fixtureFactoryWithMyDeviceCallable,
368-
fn ($expectedDeviceEndpoint) => [
369-
'myDeviceExternalIdAlias' => (string) $expectedDeviceEndpoint->myDevice->externalId,
370-
],
371-
];
372-
373-
yield 'Filter uuid by nested property when property name is converted with property name converted as query parameter' => [
374-
$fixtureFactoryWithNameConvertedCallable = function (UuidFilterBaseTestCase $self) {
375-
$manager = $self->getEntityManager();
376-
$manager->persist($fooDevice = $self->createDevice());
377-
$manager->persist($barDevice = $self->createDevice());
378-
$manager->persist($self->createDeviceEndpoint(null, null, $fooDevice));
379-
$manager->persist($expectedDeviceEndpoint = $self->createDeviceEndpoint(null, null, $barDevice));
380-
$manager->flush();
381-
382-
return $expectedDeviceEndpoint;
383-
},
384-
fn ($expectedDeviceEndpoint) => [
385-
'name_converted.name_converted' => (string) $expectedDeviceEndpoint->nameConverted->nameConverted,
386-
],
387-
];
388-
389-
yield 'Filter uuid by nested property when name is converted with property name as query parameter' => [
390-
$fixtureFactoryWithNameConvertedCallable,
391-
fn ($expectedDeviceEndpoint) => [
392-
'nameConverted.nameConverted' => (string) $expectedDeviceEndpoint->nameConverted->nameConverted,
393-
],
394-
];
395-
396-
yield 'Filter uuid by nested property when name is converted with alias as query parameter' => [
397-
$fixtureFactoryWithNameConvertedCallable,
398-
fn ($expectedDeviceEndpoint) => [
399-
'nameConvertedAlias' => (string) $expectedDeviceEndpoint->nameConverted->nameConverted,
400-
],
401-
];
402-
}
403-
404353
public function getEntityManager(): EntityManagerInterface
405354
{
406355
return $this->getManager();

0 commit comments

Comments
 (0)