diff --git a/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php b/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php index f323749..09e221c 100644 --- a/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php +++ b/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php @@ -16,6 +16,7 @@ /** * Tests the Drupal\Component\Uuid\Uuid class. * + * @group Drupal * @group UUID */ class UuidTest extends UnitTestCase { @@ -34,7 +35,7 @@ public static function getInfo() { * @dataProvider uuidInstances */ public function testGenerateUuid(UuidInterface $instance) { - $this->assertTrue(Uuid::isValid($instance->generate())); + $this->assertTrue(Uuid::isValid($instance->generate()), sprintf('UUID generation for %s works.', get_class($instance))); } /** @@ -43,7 +44,8 @@ public function testGenerateUuid(UuidInterface $instance) { * @dataProvider uuidInstances */ public function testUuidIsUnique(UuidInterface $instance) { - $this->assertNotEquals($instance->generate(), $instance->generate()); + $this->assertNotEquals($instance->generate(), $instance->generate(), 'Same UUID was not generated twice.'); + $this->assertTrue(Uuid::isValid($instance->generate()), sprintf('Same UUID was not generated twice with %s.', get_class($instance))); } /** @@ -55,16 +57,16 @@ public function testUuidValidation() { $uuid_min = '00000000-0000-0000-0000-000000000000'; $uuid_max = 'ffffffff-ffff-ffff-ffff-ffffffffffff'; - $this->assertTrue(Uuid::isValid($uuid_fqdn)); - $this->assertTrue(Uuid::isValid($uuid_min)); - $this->assertTrue(Uuid::isValid($uuid_max)); + $this->assertTrue(Uuid::isValid($uuid_fqdn), $uuid_fqdn . ' is a valid UUID.'); + $this->assertTrue(Uuid::isValid($uuid_min), $uuid_min . ' is a valid UUID.'); + $this->assertTrue(Uuid::isValid($uuid_max), $uuid_max . ' is a valid UUID.'); // These are invalid UUIDs. $invalid_format = '0ab26e6b-f074-4e44-9da-601205fa0e976'; $invalid_length = '0ab26e6b-f074-4e44-9daf-1205fa0e9761f'; - $this->assertFalse(Uuid::isValid($invalid_format)); - $this->assertFalse(Uuid::isValid($invalid_length)); + $this->assertFalse(Uuid::isValid($invalid_format), $invalid_format . ' is not a valid UUID.'); + $this->assertFalse(Uuid::isValid($invalid_length), $invalid_length . ' is not a valid UUID.'); } /**