MC-35985: Enable new consumer configuration settings on current consumers

- Update tests;

Author: adifucan

app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php

@@ -153,7 +153,7 @@ public function testRun(
                     ['cron_consumers_runner/cron_run', true, true],
                     ['cron_consumers_runner/max_messages', 10000, $maxMessages],
                     ['cron_consumers_runner/consumers', [], $allowedConsumers],
-                    ['queue/only_spawn_when_message_available', 0, 0],
+                    ['queue/only_spawn_when_message_available', null, 0],
                 ]
             );
 
@@ -277,14 +277,16 @@ public function runDataProvider()
      * @param int $shellBackgroundExpects
      * @param boolean $globalOnlySpawnWhenMessageAvailable
      * @param int $getOnlySpawnWhenMessageAvailableCallCount
+     * @param int $isMassagesAvailableInTheQueueCallCount
      * @dataProvider runBasedOnOnlySpawnWhenMessageAvailableConsumerConfigurationDataProvider
      */
     public function testRunBasedOnOnlySpawnWhenMessageAvailableConsumerConfiguration(
         $onlySpawnWhenMessageAvailable,
         $isMassagesAvailableInTheQueue,
         $shellBackgroundExpects,
         $globalOnlySpawnWhenMessageAvailable,
-        $getOnlySpawnWhenMessageAvailableCallCount
+        $getOnlySpawnWhenMessageAvailableCallCount,
+        $isMassagesAvailableInTheQueueCallCount
     ) {
         $consumerName = 'consumerName';
         $connectionName = 'connectionName';
@@ -296,7 +298,7 @@ public function testRunBasedOnOnlySpawnWhenMessageAvailableConsumerConfiguration
                     ['cron_consumers_runner/cron_run', true, true],
                     ['cron_consumers_runner/max_messages', 10000, 1000],
                     ['cron_consumers_runner/consumers', [], []],
-                    ['queue/only_spawn_when_message_available', 0, $globalOnlySpawnWhenMessageAvailable],
+                    ['queue/only_spawn_when_message_available', true, $globalOnlySpawnWhenMessageAvailable],
                 ]
             );
 
@@ -323,7 +325,7 @@ public function testRunBasedOnOnlySpawnWhenMessageAvailableConsumerConfiguration
             ->method('isLocked')
             ->willReturn(false);
 
-        $this->checkIsAvailableMessagesMock->expects($this->exactly((int)$onlySpawnWhenMessageAvailable))
+        $this->checkIsAvailableMessagesMock->expects($this->exactly($isMassagesAvailableInTheQueueCallCount))
             ->method('execute')
             ->willReturn($isMassagesAvailableInTheQueue);
 
@@ -344,42 +346,48 @@ public function runBasedOnOnlySpawnWhenMessageAvailableConsumerConfigurationData
                 'isMassagesAvailableInTheQueue' => true,
                 'shellBackgroundExpects' => 1,
                 'globalOnlySpawnWhenMessageAvailable' => false,
-                'getOnlySpawnWhenMessageAvailableCallCount' => 1
+                'getOnlySpawnWhenMessageAvailableCallCount' => 1,
+                'isMassagesAvailableInTheQueueCallCount' => 1
             ],
             [
                 'onlySpawnWhenMessageAvailable' => true,
                 'isMassagesAvailableInTheQueue' => false,
                 'shellBackgroundExpects' => 0,
                 'globalOnlySpawnWhenMessageAvailable' => false,
-                'getOnlySpawnWhenMessageAvailableCallCount' => 1
+                'getOnlySpawnWhenMessageAvailableCallCount' => 1,
+                'isMassagesAvailableInTheQueueCallCount' => 1
             ],
             [
                 'onlySpawnWhenMessageAvailable' => false,
                 'isMassagesAvailableInTheQueue' => true,
                 'shellBackgroundExpects' => 1,
                 'globalOnlySpawnWhenMessageAvailable' => false,
-                'getOnlySpawnWhenMessageAvailableCallCount' => 1
+                'getOnlySpawnWhenMessageAvailableCallCount' => 2,
+                'isMassagesAvailableInTheQueueCallCount' => 0
             ],
             [
-                'onlySpawnWhenMessageAvailable' => false,
-                'isMassagesAvailableInTheQueue' => false,
+                'onlySpawnWhenMessageAvailable' => null,
+                'isMassagesAvailableInTheQueue' => true,
                 'shellBackgroundExpects' => 1,
-                'globalOnlySpawnWhenMessageAvailable' => false,
-                'getOnlySpawnWhenMessageAvailableCallCount' => 1
+                'globalOnlySpawnWhenMessageAvailable' => true,
+                'getOnlySpawnWhenMessageAvailableCallCount' => 2,
+                'isMassagesAvailableInTheQueueCallCount' => 1
             ],
             [
-                'onlySpawnWhenMessageAvailable' => true,
+                'onlySpawnWhenMessageAvailable' => null,
                 'isMassagesAvailableInTheQueue' => true,
                 'shellBackgroundExpects' => 1,
-                'globalOnlySpawnWhenMessageAvailable' => true,
-                'getOnlySpawnWhenMessageAvailableCallCount' => 0
+                'globalOnlySpawnWhenMessageAvailable' => false,
+                'getOnlySpawnWhenMessageAvailableCallCount' => 2,
+                'isMassagesAvailableInTheQueueCallCount' => 0
             ],
             [
-                'onlySpawnWhenMessageAvailable' => true,
+                'onlySpawnWhenMessageAvailable' => false,
                 'isMassagesAvailableInTheQueue' => true,
                 'shellBackgroundExpects' => 1,
-                'globalOnlySpawnWhenMessageAvailable' => false,
-                'getOnlySpawnWhenMessageAvailableCallCount' => 1
+                'globalOnlySpawnWhenMessageAvailable' => true,
+                'getOnlySpawnWhenMessageAvailableCallCount' => 2,
+                'isMassagesAvailableInTheQueueCallCount' => 0
             ],
         ];
     }

dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php

@@ -127,6 +127,7 @@ public function testSpecificConsumerAndRerun()
         $specificConsumer = 'exportProcessor';
         $config = $this->config;
         $config['cron_consumers_runner'] = ['consumers' => [$specificConsumer], 'max_messages' => 0];
+        $config['queue'] = ['only_spawn_when_message_available' => 0];
         $this->writeConfig($config);
         $this->reRunConsumersAndCheckLocks($specificConsumer);
         $this->reRunConsumersAndCheckLocks($specificConsumer);