collationFixedCriterion

Author: micszo

tests/integration/Core/Repository/SearchService/RemoteIdIndexingTest.php

@@ -55,9 +55,20 @@ public function testIndexingRemoteId(Criterion $criterion): void
 
         $contentId = self::$contentIdByRemoteIdIndex[$remoteId];
 
+        // ensure correct collation for comparison
+        $collationFixedCriterion = new Criterion\RemoteId([
+            new Criterion\LogicalAnd([
+                new Criterion\Comparison(
+                    'remote_id',
+                    Criterion\Operator::EQ,
+                    $remoteId . " COLLATE utf8mb4_unicode_ci"
+                )
+            ])
+        ]);
+
         // test searching using both Content & Location remote IDs for both Content items
         $query = new Query();
-        $query->filter = $criterion;
+        $query->filter = $collationFixedCriterion;
         $result = $searchService->findContent($query);
         self::assertSame(
             1,
@@ -67,7 +78,7 @@ public function testIndexingRemoteId(Criterion $criterion): void
         self::assertSame($contentId, $result->searchHits[0]->valueObject->id);
 
         $query = new LocationQuery();
-        $query->filter = $criterion;
+        $query->filter = $collationFixedCriterion;
         $result = $searchService->findLocations($query);
         self::assertSame(
             1,