EZP-30139: Fixed testRevealContent randomly failing on PostgreSQL (#2569

)
ezsystems · Mar 20, 2019 · 64e9fab · 64e9fab
1 parent 662a56e
commit 64e9fab
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/eZ/Publish/API/Repository/Tests/ContentServiceTest.php b/eZ/Publish/API/Repository/Tests/ContentServiceTest.php
@@ -6241,9 +6241,13 @@ public function testHideContent(array $locationsToHide)
     }
 
     /**
-     * @param \eZ\Publish\API\Repository\Values\Content\LocationCreateStruct[] $locationsToHide
+     * @param \eZ\Publish\API\Repository\Values\Content\LocationCreateStruct[] $locationsToReveal
      *
      * @dataProvider provideLocationsToHideAndReveal
+     *
+     * @throws \eZ\Publish\API\Repository\Exceptions\ForbiddenException
+     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
+     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
      */
     public function testRevealContent(array $locationsToReveal)
     {
@@ -6268,6 +6272,13 @@ public function testRevealContent(array $locationsToReveal)
 
         $publishedContent = $contentService->publishVersion($content->versionInfo);
         $locations = $locationService->loadLocations($publishedContent->contentInfo);
+        // sort the Locations putting hidden one on top, as the order in which they're returned is not deterministic
+        usort(
+            $locations,
+            function (Location $location) {
+                return $location->hidden ? -1 : 1;
+            }
+        );
 
         // Sanity check
         $this->assertCount(3, $locations);