fixup! Apply suggestions from code review on tests

Author: vidarl

tests/integration/Core/Repository/ContentServiceTest.php

@@ -6284,7 +6284,20 @@ public function testPublishRevealedDraft(): void
         $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()
+        );
 
         $publishedContent = $this->contentService->publishVersion(
             $draft->getVersionInfo()
@@ -6305,37 +6318,70 @@ public function testPublishRevealedDraft(): void
     }
 
     /**
+     * @dataProvider draftVisibilityTransitionsProvider
+     *
      * @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 testHideAndRevealNeverPublishedDraft(): void
-    {
+    public function testDraftVisibilityTransitions(
+        bool $initiallyHidden,
+        bool $secondDraftHidden
+    ): void {
         $draft = $this->createFolderDraft();
-        $draftContentInfo = $draft->getContentInfo();
 
-        $this->contentService->hideContent($draftContentInfo);
+        if ($initiallyHidden) {
+            $this->contentService->hideContent($draft->getContentInfo());
+        }
 
-        self::assertTrue(
-            $this->contentService
-                ->loadContent($draftContentInfo->getId())
-                ->getContentInfo()
-                ->isHidden()
+        $publishedContent = $this->contentService->publishVersion($draft->getVersionInfo());
+        $draft2 = $this->contentService->createContentDraft($publishedContent->getContentInfo());
+
+        if ($secondDraftHidden) {
+            $this->contentService->hideContent($draft2->getContentInfo());
+        } else {
+            $this->contentService->revealContent($draft2->getContentInfo());
+        }
+
+        $publishedContent2 = $this->contentService->publishVersion($draft2->getVersionInfo());
+        $contentInfo = $publishedContent2->getContentInfo();
+
+        self::assertSame(
+            $secondDraftHidden,
+            $contentInfo->isHidden(),
+            'Unexpected final hidden state for content.'
         );
 
-        $this->contentService->revealContent($draftContentInfo);
+        $mainLocationId = $contentInfo->getMainLocationId();
 
-        self::assertFalse(
-            $this->contentService
-                ->loadContent($draftContentInfo->getId())
-                ->getContentInfo()
-                ->isHidden()
+        self::assertNotNull(
+            $mainLocationId,
+            'Expected mainLocationId to be set.'
+        );
+
+        $location = $this->locationService->loadLocation($mainLocationId);
+
+        self::assertSame(
+            $secondDraftHidden,
+            $location->isHidden(),
+            'Unexpected final hidden state for location.'
         );
     }
 
+    /**
+     * @return iterable<string, array{bool, bool}>
+     */
+    public static function draftVisibilityTransitionsProvider(): iterable
+    {
+        yield 'hidden -> hidden' => [true, true];
+        yield 'hidden -> visible' => [true, false];
+        yield 'visible -> hidden' => [false, true];
+        yield 'visible -> visible' => [false, false];
+    }
+
     /**
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\BadStateException