MC-14937: Complete Page Builder Analytics data collection

- Fix integration tests

Author: davemacaulay

dev/tests/integration/testsuite/Magento/CmsPageBuilderAnalytics/Model/ContentTypeUsageReportProviderTest.php

@@ -21,7 +21,7 @@ class ContentTypeUsageReportProviderTest extends \PHPUnit\Framework\TestCase
      * @magentoDataFixture Magento/CmsPageBuilderAnalytics/_files/pages.php
      * @dataProvider reportDataProvider
      */
-    public function testGetReport($expectedReportData)
+    public function testGetReport($expectedReportData, $ignoredContentTypes)
     {
         /* @var $resourceConnection ResourceConnection */
         $resourceConnection = Bootstrap::getObjectManager()->get(ResourceConnection::class)
@@ -39,7 +39,25 @@ public function testGetReport($expectedReportData)
         );
         $reportData = $contentTypeUsageReportProvider->getReport('pagebuilder_page_test');
 
-        $this->assertEquals(sort($expectedReportData[0][0]), sort(iterator_to_array($reportData->getInnerIterator()[0][0])));
+        foreach ($reportData->getInnerIterator() as $reportItem) {
+            // Ignore the header within the report
+            if ($reportItem[0] === 'Content Type') {
+                continue;
+            }
+
+            // Skip over any ignored content types
+            if (in_array($reportItem[0], $ignoredContentTypes)) {
+                continue;
+            }
+
+            // Verify we have expected report data for the content type
+            if (!isset($expectedReportData[$reportItem[0]])) {
+                $this->fail('There is no report data for ' . $reportItem[0] . '.');
+            }
+
+            // Verify the count values match the expected report data
+            $this->assertEquals($expectedReportData[$reportItem[0]], $reportItem[1]);
+        }
     }
 
     /**
@@ -50,86 +68,29 @@ public function reportDataProvider(): array
         return [
             [
                 [
-                    [
-                        'Content Type',
-                        'Count'
-                    ],
-                    [
-                        'button-item',
-                        6
-                    ],
-                    [
-                        'slide',
-                        12
-                    ],
-                    [
-                        'text',
-                        1
-                    ],
-                    [
-                        'image',
-                        2
-                    ],
-                    [
-                        'block',
-                        1
-                    ],
-                    [
-                        'row',
-                        7
-                    ],
-                    [
-                        'column-group',
-                        5
-                    ],
-                    [
-                        'column',
-                        12
-                    ],
-                    [
-                        'video',
-                        2
-                    ],
-                    [
-                        'heading',
-                        3
-                    ],
-                    [
-                        'tabs',
-                        1
-                    ],
-                    [
-                        'products',
-                        0
-                    ],
-                    [
-                        'tab-item',
-                        2
-                    ],
-                    [
-                        'banner',
-                        4
-                    ],
-                    [
-                        'buttons',
-                        2
-                    ],
-                    [
-                        'slider',
-                        3
-                    ],
-                    [
-                        'divider',
-                        5
-                    ],
-                    [
-                        'map',
-                        2
-                    ],
-                    [
-                        'html',
-                        2
-                    ]
+                    'button-item' => 6,
+                    'slide' => 12,
+                    'text' => 1,
+                    'image' => 2,
+                    'block' => 1,
+                    'row' => 7,
+                    'column-group' => 5,
+                    'column' => 12,
+                    'video' => 2,
+                    'heading' => 3,
+                    'tabs' => 1,
+                    'products' => 0,
+                    'tab-item' => 2,
+                    'banner' => 4,
+                    'buttons' => 2,
+                    'slider' => 3,
+                    'divider' => 5,
+                    'map' => 2,
+                    'html' => 2
+                ],
+                // Ignored content types
+                [
+                    'dynamic_block'
                 ]
             ]
         ];