Apply suggestions from code review on tests

Author: vidarl

tests/integration/Core/Repository/ContentServiceTest.php

@@ -6241,46 +6241,66 @@ function (Location $parentLocation) {
     }
 
     /**
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\BadStateException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ContentFieldValidationException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ContentValidationException
      */
-    public function testHideContentDraft(): void
+    public function testPublishHiddenDraft(): void
     {
-        $publishedContent = $this->createContentForHideRevealDraftTests(false);
-        $publishedContentMainLocationId = $publishedContent->getContentInfo()->getMainLocationId();
+        $draft = $this->createFolderDraft();
+        $draftContentInfo = $draft->getContentInfo();
+        $this->contentService->hideContent($draftContentInfo);
+
+        $publishedContent = $this->contentService->publishVersion($draft->getVersionInfo());
+        $contentInfo = $publishedContent->getContentInfo();
+
+        self::assertTrue($contentInfo->isHidden(), 'Content is not hidden');
+
+        $mainLocationId = $contentInfo->getMainLocationId();
+
         self::assertNotNull(
-            $publishedContentMainLocationId,
+            $mainLocationId,
             'Expected mainLocationId to be set for this test case.'
         );
-        $location = $this->locationService->loadLocation($publishedContentMainLocationId);
 
-        $content = $this->contentService->loadContent($publishedContent->getContentInfo()->getId());
-        self::assertTrue($content->getContentInfo()->isHidden(), 'Content is not hidden');
+        $location = $this->locationService->loadLocation($mainLocationId);
         self::assertTrue($location->isHidden(), 'Location is visible');
     }
 
     /**
-     * @covers \Ibexa\Contracts\Core\Repository\ContentService::revealContent
-
-     *
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\BadStateException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ContentFieldValidationException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ContentValidationException
      */
-    public function testHideAndRevealContentDraft(): void
+    public function testPublishRevealedDraft(): void
     {
-        $publishedContent = $this->createContentForHideRevealDraftTests(true);
-        $publishedContentMainLocationId = $publishedContent->getContentInfo()->getMainLocationId();
+        $draft = $this->createFolderDraft();
+        $draftContentInfo = $draft->getContentInfo();
+
+        $this->contentService->hideContent($draftContentInfo);
+        $this->contentService->revealContent($draftContentInfo);
+
+        $publishedContent = $this->contentService->publishVersion(
+            $draft->getVersionInfo()
+        );
+
+        $contentInfo = $publishedContent->getContentInfo();
+        $mainLocationId = $contentInfo->getMainLocationId();
+
+        self::assertFalse($contentInfo->isHidden(), 'Content is hidden');
         self::assertNotNull(
-            $publishedContentMainLocationId,
+            $mainLocationId,
             'Expected mainLocationId to be set for this test case.'
         );
-        $location = $this->locationService->loadLocation($publishedContentMainLocationId);
 
-        $content = $this->contentService->loadContent($publishedContent->getContentInfo()->getId());
-        self::assertFalse($content->getContentInfo()->isHidden(), 'Content is hidden');
+        $location = $this->locationService->loadLocation($mainLocationId);
+
         self::assertFalse($location->isHidden(), 'Location is hidden');
     }
 
@@ -6292,7 +6312,39 @@ public function testHideAndRevealContentDraft(): void
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ContentValidationException
      */
-    private function createContentForHideRevealDraftTests(bool $reveal): Content
+    public function testHideAndRevealNeverPublishedDraft(): void
+    {
+        $draft = $this->createFolderDraft();
+        $draftContentInfo = $draft->getContentInfo();
+
+        $this->contentService->hideContent($draftContentInfo);
+
+        self::assertTrue(
+            $this->contentService
+                ->loadContent($draftContentInfo->getId())
+                ->getContentInfo()
+                ->isHidden()
+        );
+
+        $this->contentService->revealContent($draftContentInfo);
+
+        self::assertFalse(
+            $this->contentService
+                ->loadContent($draftContentInfo->getId())
+                ->getContentInfo()
+                ->isHidden()
+        );
+    }
+
+    /**
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\BadStateException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ContentFieldValidationException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ContentValidationException
+     */
+    private function createFolderDraft(): Content
     {
         $contentTypeService = $this->getRepository()->getContentTypeService();
         $locationCreateStructs = $this->locationService->newLocationCreateStruct(2);
@@ -6301,18 +6353,10 @@ private function createContentForHideRevealDraftTests(bool $reveal): Content
         $contentCreate = $this->contentService->newContentCreateStruct($contentType, self::ENG_US);
         $contentCreate->setField('name', 'Folder to hide');
 
-        $draft = $this->contentService->createContent(
+        return $this->contentService->createContent(
             $contentCreate,
             [$locationCreateStructs]
         );
-
-        $draftContentInfo = $draft->getContentInfo();
-        $this->contentService->hideContent($draftContentInfo);
-        if ($reveal) {
-            $this->contentService->revealContent($draftContentInfo);
-        }
-
-        return $this->contentService->publishVersion($draft->getVersionInfo());
     }
 
     /**