From 5b8b548bd4b91118ace8da96c6e01e5ed8aee445 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Thu, 7 Jul 2016 20:08:24 +0200 Subject: [PATCH] When invalid (null) identifiers are provided, an exception should be thrown --- tests/Doctrine/Tests/ORM/UnitOfWorkTest.php | 32 ++++++--------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php index e94a187d7..cab05d56d 100644 --- a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php +++ b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php @@ -447,35 +447,19 @@ class UnitOfWorkTest extends OrmTestCase public function entitiesWithInvalidIdentifiersProvider() { - $emptyString = new EntityWithStringIdentifier(); + $firstNullString = new EntityWithCompositeStringIdentifier(); - $emptyString->id = ''; + $firstNullString->id2 = uniqid('id2', true); - $nonEmptyString = new EntityWithStringIdentifier(); + $secondNullString = new EntityWithCompositeStringIdentifier(); - $nonEmptyString->id = uniqid('id', true); - - $emptyStrings = new EntityWithCompositeStringIdentifier(); - - $emptyStrings->id1 = ''; - $emptyStrings->id2 = ''; - - $nonEmptyStrings = new EntityWithCompositeStringIdentifier(); - - $nonEmptyStrings->id1 = uniqid('id1', true); - $nonEmptyStrings->id2 = uniqid('id2', true); - - $booleanTrue = new EntityWithBooleanIdentifier(); - - $booleanTrue->id = true; - - $booleanFalse = new EntityWithBooleanIdentifier(); - - $booleanFalse->id = false; + $secondNullString->id1 = uniqid('id1', true); return [ - 'null string, single field' => [new EntityWithStringIdentifier()], - 'null strings, two fieldds' => [new EntityWithCompositeStringIdentifier()], + 'null string, single field' => [new EntityWithStringIdentifier()], + 'null strings, two fields' => [new EntityWithCompositeStringIdentifier()], + 'first null string, two fields' => [$firstNullString], + 'second null string, two fields' => [$secondNullString], ]; } }