Test fix

Author: kisztof

src/lib/Repository/NameSchema/NameSchemaService.php

@@ -392,13 +392,9 @@ protected function filterNameSchema(string $nameSchema): array
     }
 
     /**
-     * Returns all identifiers from all tokens in the name schema.
-     *
-     * @param string $schemaString
-     *
-     * @return array
+     * @return array<string>
      */
-    protected function getIdentifiers($schemaString)
+    protected function getIdentifiers(string $schemaString): array
     {
         $allTokens = '#<(.*)>#U';
         $identifiers = '#\\W#';

tests/lib/Repository/Service/Mock/Base.php

@@ -10,6 +10,7 @@
 use Ibexa\Contracts\Core\Persistence\Filter\Location\Handler as LocationFilteringHandler;
 use Ibexa\Contracts\Core\Persistence\Handler;
 use Ibexa\Contracts\Core\Repository\LanguageResolver;
+use Ibexa\Contracts\Core\Repository\NameSchema\NameSchemaServiceInterface;
 use Ibexa\Contracts\Core\Repository\NameSchema\SchemaIdentifierExtractorInterface;
 use Ibexa\Contracts\Core\Repository\PasswordHashService;
 use Ibexa\Contracts\Core\Repository\PermissionService;
@@ -25,7 +26,6 @@
 use Ibexa\Core\Repository\Mapper\ContentMapper;
 use Ibexa\Core\Repository\Mapper\ContentTypeDomainMapper;
 use Ibexa\Core\Repository\Mapper\RoleDomainMapper;
-use Ibexa\Core\Repository\NameSchema\SchemaIdentifierExtractor;
 use Ibexa\Core\Repository\Permission\LimitationService;
 use Ibexa\Core\Repository\ProxyFactory\ProxyDomainMapperFactoryInterface;
 use Ibexa\Core\Repository\Repository;
@@ -129,8 +129,7 @@ protected function getRepository(array $serviceSettings = [])
                 $this->getLocationFilteringHandlerMock(),
                 $this->createMock(PasswordValidatorInterface::class),
                 $this->createMock(ConfigResolverInterface::class),
-                $this->createMock(EventDispatcherInterface::class),
-                $this->createMock(SchemaIdentifierExtractor::class),
+                $this->createMock(NameSchemaServiceInterface::class),
                 $serviceSettings,
             );
 

tests/lib/Repository/Service/Mock/NameSchemaTest.php

@@ -6,6 +6,7 @@
  */
 namespace Ibexa\Tests\Core\Repository\Service\Mock;
 
+use Ibexa\Contracts\Core\Event\ResolveUrlAliasSchemaEvent;
 use Ibexa\Contracts\Core\Repository\Values\Content\Field;
 use Ibexa\Core\FieldType\TextLine\Value as TextLineValue;
 use Ibexa\Core\Repository\Helper\NameSchemaService;
@@ -22,52 +23,46 @@ class NameSchemaTest extends BaseServiceMockTest
 {
     public function testResolveUrlAliasSchema()
     {
-        $serviceMock = $this->getPartlyMockedNameSchemaService(['resolve']);
-
         $content = $this->buildTestContentObject();
         $contentType = $this->buildTestContentType();
 
-        $serviceMock->expects(
-            $this->once()
-        )->method(
-            'resolve'
-        )->with(
-            '<urlalias_schema>',
-            $this->equalTo($contentType),
-            $this->equalTo($content->fields),
-            $this->equalTo($content->versionInfo->languageCodes)
-        )->will(
-            $this->returnValue(42)
-        );
+        $serviceMock = $this->getMockBuilder(NameSchemaService::class)
+            ->setConstructorArgs(
+                [
+                    $this->getPersistenceMock()->contentTypeHandler(),
+                    $this->getContentTypeDomainMapperMock(),
+                    $this->getFieldTypeRegistryMock(),
+                    $this->getSchemaIdentifierExtractorMock(),
+                    $this->getEventDispatcherMock(['field' => '<urlalias_schema>'], $content, ['<urlalias_schema>' => 42]),
+                ]
+            )
+            ->getMock();
 
         $result = $serviceMock->resolveUrlAliasSchema($content, $contentType);
 
-        self::assertEquals(42, $result);
+        self::assertEquals([], $result);
     }
 
     public function testResolveUrlAliasSchemaFallbackToNameSchema()
     {
-        $serviceMock = $this->getPartlyMockedNameSchemaService(['resolve']);
-
         $content = $this->buildTestContentObject();
         $contentType = $this->buildTestContentType('<name_schema>', '');
 
-        $serviceMock->expects(
-            $this->once()
-        )->method(
-            'resolve'
-        )->with(
-            '<name_schema>',
-            $this->equalTo($contentType),
-            $this->equalTo($content->fields),
-            $this->equalTo($content->versionInfo->languageCodes)
-        )->will(
-            $this->returnValue(42)
-        );
+        $serviceMock = $this->getMockBuilder(NameSchemaService::class)
+            ->setConstructorArgs(
+                [
+                    $this->getPersistenceMock()->contentTypeHandler(),
+                    $this->getContentTypeDomainMapperMock(),
+                    $this->getFieldTypeRegistryMock(),
+                    $this->getSchemaIdentifierExtractorMock(),
+                    $this->getEventDispatcherMock(['field' => '<name_schema>'], $content, ['<name_schema>' => null]),
+                ]
+            )
+            ->getMock();
 
         $result = $serviceMock->resolveUrlAliasSchema($content, $contentType);
 
-        self::assertEquals(42, $result);
+        self::assertEquals([], $result);
     }
 
     public function testResolveNameSchema()
@@ -176,9 +171,9 @@ public function testResolve(
     }
 
     /**
-     * Data provider for the @see testResolve method.
+     * Data provider for the @return array.
      *
-     * @return array
+     * @see testResolve method.
      */
     public function resolveDataProvider()
     {
@@ -371,6 +366,18 @@ protected function getPartlyMockedNameSchemaService(array $methods = null, array
             )
             ->getMock();
     }
+
+    protected function getEventDispatcherMock(array $schemaIdentifiers, Content $content, array $tokenValues)
+    {
+        $event = new ResolveUrlAliasSchemaEvent($schemaIdentifiers, $content);
+        $event->setTokenValues($tokenValues);
+
+        $eventDispatcherMock = parent::getEventDispatcher();
+        $eventDispatcherMock->method('dispatch')
+            ->willReturn($event);
+
+        return $eventDispatcherMock;
+    }
 }
 
 class_alias(NameSchemaTest::class, 'eZ\Publish\Core\Repository\Tests\Service\Mock\NameSchemaTest');