Verified Commit 56ee638f authored by quietone's avatar quietone
Browse files

Issue #2169467 by fago, smustgrave: Improve typedData manager variable name in... 

Issue #2169467 by fago, smustgrave: Improve typedData manager variable name in ConstaintValidation tests
parent 5ac87858

core/tests/Drupal/KernelTests/Core/Entity/BundleConstraintValidatorTest.php

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ class BundleConstraintValidatorTest extends KernelTestBase { 
   *

   * @var \Drupal\Core\TypedData\TypedDataManager

   */

  protected $typedData;

  protected $typedDataManager;



  /**

   * {@inheritdoc}
@@ -32,7 +32,7 @@ class BundleConstraintValidatorTest extends KernelTestBase { 
  protected function setUp(): void {

    parent::setUp();

    $this->installEntitySchema('user');

    $this->typedData = $this->container->get('typed_data_manager');

    $this->typedDataManager = $this->container->get('typed_data_manager');

  }



  /**
@@ -61,14 +61,14 @@ protected function assertValidation($bundle): void { 
    // Test the validation.

    $node = $this->container->get('entity_type.manager')->getStorage('node')->create(['type' => 'foo']);



    $typed_data = $this->typedData->create($definition, $node);

    $typed_data = $this->typedDataManager->create($definition, $node);

    $violations = $typed_data->validate();

    $this->assertEquals(0, $violations->count(), 'Validation passed for correct value.');



    // Test the validation when an invalid value is passed.

    $page_node = $this->container->get('entity_type.manager')->getStorage('node')->create(['type' => 'baz']);



    $typed_data = $this->typedData->create($definition, $page_node);

    $typed_data = $this->typedDataManager->create($definition, $page_node);

    $violations = $typed_data->validate();

    $this->assertEquals(1, $violations->count(), 'Validation failed for incorrect value.');

core/tests/Drupal/KernelTests/Core/Entity/EntityTypeConstraintValidatorTest.php

+4 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ class EntityTypeConstraintValidatorTest extends EntityKernelTestBase { 
   *

   * @var \Drupal\Core\TypedData\TypedDataManager

   */

  protected $typedData;

  protected $typedDataManager;



  /**

   * {@inheritdoc}
@@ -30,7 +30,7 @@ class EntityTypeConstraintValidatorTest extends EntityKernelTestBase { 
   */

  protected function setUp(): void {

    parent::setUp();

    $this->typedData = $this->container->get('typed_data_manager');

    $this->typedDataManager = $this->container->get('typed_data_manager');

  }



  /**
@@ -47,7 +47,7 @@ public function testValidation(): void { 


    // Test the validation.

    $node = $this->container->get('entity_type.manager')->getStorage('node')->create(['type' => 'page']);

    $typed_data = $this->typedData->create($definition, $node);

    $typed_data = $this->typedDataManager->create($definition, $node);

    $violations = $typed_data->validate();

    $this->assertEquals(0, $violations->count(), 'Validation passed for correct value.');
@@ -55,7 +55,7 @@ public function testValidation(): void { 
    // is passed.

    $account = $this->createUser();



    $typed_data = $this->typedData->create($definition, $account);

    $typed_data = $this->typedDataManager->create($definition, $account);

    $violations = $typed_data->validate();

    $this->assertEquals(1, $violations->count(), 'Validation failed for incorrect value.');

core/tests/Drupal/KernelTests/Core/Entity/ValidReferenceConstraintValidatorTest.php

+5 −5
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ class ValidReferenceConstraintValidatorTest extends EntityKernelTestBase { 
   *

   * @var \Drupal\Core\TypedData\TypedDataManager

   */

  protected $typedData;

  protected $typedDataManager;



  /**

   * {@inheritdoc}
@@ -45,7 +45,7 @@ protected function setUp(): void { 
    $this->installSchema('user', ['users_data']);

    $this->installSchema('node', ['node_access']);

    $this->installConfig('node');

    $this->typedData = $this->container->get('typed_data_manager');

    $this->typedDataManager = $this->container->get('typed_data_manager');



    $this->createContentType(['type' => 'article', 'name' => 'Article']);

    $this->createContentType(['type' => 'page', 'name' => 'Basic page']);
@@ -61,16 +61,16 @@ public function testValidation(): void { 
    $definition = BaseFieldDefinition::create('entity_reference')

      ->setSettings(['target_type' => 'user']);



    $typed_data = $this->typedData->create($definition, ['target_id' => $entity->id()]);

    $typed_data = $this->typedDataManager->create($definition, ['target_id' => $entity->id()]);

    $violations = $typed_data->validate();

    $this->assertEquals(0, $violations->count(), 'Validation passed for correct value.');



    // NULL is also considered a valid reference.

    $typed_data = $this->typedData->create($definition, ['target_id' => NULL]);

    $typed_data = $this->typedDataManager->create($definition, ['target_id' => NULL]);

    $violations = $typed_data->validate();

    $this->assertEquals(0, $violations->count(), 'Validation passed for correct value.');



    $typed_data = $this->typedData->create($definition, ['target_id' => $entity->id()]);

    $typed_data = $this->typedDataManager->create($definition, ['target_id' => $entity->id()]);

    // Delete the referenced entity.

    $entity->delete();

    $violations = $typed_data->validate();

core/tests/Drupal/KernelTests/Core/TypedData/AllowedValuesConstraintValidatorTest.php

+11 −11
Original line number Diff line number Diff line
@@ -20,14 +20,14 @@ class AllowedValuesConstraintValidatorTest extends KernelTestBase { 
   *

   * @var \Drupal\Core\TypedData\TypedDataManager

   */

  protected $typedData;

  protected $typedDataManager;



  /**

   * {@inheritdoc}

   */

  protected function setUp(): void {

    parent::setUp();

    $this->typedData = $this->container->get('typed_data_manager');

    $this->typedDataManager = $this->container->get('typed_data_manager');

  }



  /**
@@ -41,12 +41,12 @@ public function testValidation(): void { 
      ->addConstraint('AllowedValues', [1, 2, 3]);



    // Test the validation.

    $typed_data = $this->typedData->create($definition, 1);

    $typed_data = $this->typedDataManager->create($definition, 1);

    $violations = $typed_data->validate();

    $this->assertEquals(0, $violations->count(), 'Validation passed for correct value.');



    // Test the validation when an invalid value is passed.

    $typed_data = $this->typedData->create($definition, 4);

    $typed_data = $this->typedDataManager->create($definition, 4);

    $violations = $typed_data->validate();

    $this->assertEquals(1, $violations->count(), 'Validation failed for incorrect value.');
@@ -57,7 +57,7 @@ public function testValidation(): void { 
    $this->assertEquals(4, $violation->getInvalidValue(), 'The invalid value is set correctly in the violation.');



    // Test the validation when a value of an incorrect type is passed.

    $typed_data = $this->typedData->create($definition, '1');

    $typed_data = $this->typedDataManager->create($definition, '1');

    $violations = $typed_data->validate();

    $this->assertEquals(0, $violations->count(), 'Value is coerced to the correct type and is valid.');

  }
@@ -71,23 +71,23 @@ public function testValidationCallback(): void { 
    // values and can be used to coerce the value to the correct type.

    $definition = DataDefinition::create('string')

      ->addConstraint('AllowedValues', ['choices' => [1, 2, 3], 'callback' => [static::class, 'allowedValueCallback']]);

    $typed_data = $this->typedData->create($definition, 'a');

    $typed_data = $this->typedDataManager->create($definition, 'a');

    $violations = $typed_data->validate();

    $this->assertEquals(0, $violations->count(), 'Validation passed for correct value.');



    $typed_data = $this->typedData->create($definition, 1);

    $typed_data = $this->typedDataManager->create($definition, 1);

    $violations = $typed_data->validate();

    $this->assertEquals(0, $violations->count(), 'Validation passed for value that will be cast to the correct type.');



    $typed_data = $this->typedData->create($definition, 2);

    $typed_data = $this->typedDataManager->create($definition, 2);

    $violations = $typed_data->validate();

    $this->assertEquals(1, $violations->count(), 'Validation failed for incorrect value.');



    $typed_data = $this->typedData->create($definition, 'd');

    $typed_data = $this->typedDataManager->create($definition, 'd');

    $violations = $typed_data->validate();

    $this->assertEquals(1, $violations->count(), 'Validation failed for incorrect value.');



    $typed_data = $this->typedData->create($definition, 0);

    $typed_data = $this->typedDataManager->create($definition, 0);

    $violations = $typed_data->validate();

    $this->assertEquals(1, $violations->count(), 'Validation failed for incorrect value.');

  }
@@ -111,7 +111,7 @@ public function testValidationCallbackException(): void { 
    // values and can be used to coerce the value to the correct type.

    $definition = DataDefinition::create('string')

      ->addConstraint('AllowedValues', ['choices' => [1, 2, 3], 'callback' => [static::class, 'doesNotExist']]);

    $typed_data = $this->typedData->create($definition, 1);

    $typed_data = $this->typedDataManager->create($definition, 1);



    $this->expectException(ConstraintDefinitionException::class);

    $this->expectExceptionMessage('The AllowedValuesConstraint constraint expects a valid callback');

core/tests/Drupal/KernelTests/Core/TypedData/ClassResolverConstraintValidatorTest.php

+5 −5
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ class ClassResolverConstraintValidatorTest extends KernelTestBase { 
   *

   * @var \Drupal\Core\TypedData\TypedDataManager

   */

  protected TypedDataManagerInterface $typedData;

  protected TypedDataManagerInterface $typedDataManager;



  /**

   * {@inheritdoc}
@@ -30,7 +30,7 @@ class ClassResolverConstraintValidatorTest extends KernelTestBase { 
  protected function setUp(): void {

    parent::setUp();



    $this->typedData = $this->container->get('typed_data_manager');

    $this->typedDataManager = $this->container->get('typed_data_manager');

    $this->container->set('test.service', new class() {



      /**
@@ -98,7 +98,7 @@ public static function provideServiceValidationCases(): array { 
  public function testValidationForService(string $method, int $expected_violations, string $message, ?string $expected_violation_message = NULL): void {

    $definition = DataDefinition::create('integer')

      ->addConstraint('ClassResolver', ['classOrService' => 'test.service', 'method' => $method]);

    $typed_data = $this->typedData->create($definition, 1);

    $typed_data = $this->typedDataManager->create($definition, 1);

    $violations = $typed_data->validate();

    $this->assertEquals($expected_violations, $violations->count(), $message);

    if ($expected_violation_message) {
@@ -115,7 +115,7 @@ public function testValidationForService(string $method, int $expected_violation 
  public function testNonExistingMethod(): void {

    $definition = DataDefinition::create('integer')

      ->addConstraint('ClassResolver', ['classOrService' => 'test.service', 'method' => 'missingMethod']);

    $typed_data = $this->typedData->create($definition, 1);

    $typed_data = $this->typedDataManager->create($definition, 1);



    $this->expectException(\InvalidArgumentException::class);

    $this->expectExceptionMessage('The method "missingMethod" does not exist on the service "test.service".');
@@ -131,7 +131,7 @@ public function testNonExistingMethod(): void { 
  public function testNonExistingClass(): void {

    $definition = DataDefinition::create('integer')

      ->addConstraint('ClassResolver', ['classOrService' => '\Drupal\NonExisting\Class', 'method' => 'boo']);

    $typed_data = $this->typedData->create($definition, 1);

    $typed_data = $this->typedDataManager->create($definition, 1);



    $this->expectExceptionMessage('Class "\Drupal\NonExisting\Class" does not exist.');

    $typed_data->validate();