issue 31043: fix unit test

Author: rogerdz

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php

@@ -101,9 +101,9 @@ public function testGetMapAdditionalFieldsOnly()
         $storeId = 1;
         $productId = 42;
         $additionalFields = ['some data'];
-        $this->builderMock->expects($this->once())
+        $this->builderMock->expects($this->exactly(2))
             ->method('addField')
-            ->with('store_id', $storeId);
+            ->withConsecutive(['store_id', $storeId], ['entity_id', $productId]);
 
         $this->builderMock->expects($this->any())
             ->method('addFields')
@@ -167,7 +167,7 @@ public function testGetMap(int $productId, array $attributeData, $attributeValue
             $productId => [$attributeId => $attributeValue],
         ];
         $documents = $this->model->map($documentData, $storeId, $context);
-        $returnAttributeData = ['store_id' => $storeId] + $returnAttributeData;
+        $returnAttributeData = ['store_id' => $storeId] + ['entity_id' => $productId] +  $returnAttributeData;
         $this->assertSame($returnAttributeData, $documents[$productId]);
     }
 
@@ -183,6 +183,7 @@ public function testGetMapWithOptions()
         $returnAttributeData = [
             'store_id' => $storeId,
             'options' => $attributeValue,
+            'entity_id' => 10,
         ];
 
         $this->dataProvider->expects($this->never())

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php

@@ -228,6 +228,8 @@ function ($type) use ($complexType) {
                         return 'float';
                     } elseif ($type === 'keyword') {
                         return 'string';
+                    } elseif ($type === 'integer') {
+                        return 'integer';
                     } else {
                         return $complexType;
                     }
@@ -276,6 +278,10 @@ public function attributeProvider(): array
                         'type' => 'string',
                         'index' => 'no',
                     ],
+                    'entity_id' => [
+                        'type' => 'integer',
+                        'index' => 'no',
+                    ],
                 ],
             ],
             [
@@ -304,6 +310,10 @@ public function attributeProvider(): array
                         'type' => 'string',
                         'index' => 'no',
                     ],
+                    'entity_id' => [
+                        'type' => 'integer',
+                        'index' => 'no',
+                    ],
                 ],
             ],
             [
@@ -332,6 +342,10 @@ public function attributeProvider(): array
                         'type' => 'string',
                         'index' => 'no',
                     ],
+                    'entity_id' => [
+                        'type' => 'integer',
+                        'index' => 'no',
+                    ],
                 ],
             ],
             [
@@ -354,6 +368,10 @@ public function attributeProvider(): array
                         'type' => 'string',
                         'index' => 'no',
                     ],
+                    'entity_id' => [
+                        'type' => 'integer',
+                        'index' => 'no',
+                    ],
                 ],
             ],
             [
@@ -382,6 +400,10 @@ public function attributeProvider(): array
                         'type' => 'string',
                         'index' => 'no',
                     ],
+                    'entity_id' => [
+                        'type' => 'integer',
+                        'index' => 'no',
+                    ],
                 ],
             ],
             [
@@ -400,6 +422,10 @@ public function attributeProvider(): array
                         'type' => 'string',
                         'index' => 'no',
                     ],
+                    'entity_id' => [
+                        'type' => 'integer',
+                        'index' => 'no',
+                    ],
                 ],
             ],
         ];