ISSUE-33310 Fixed unit and static test fail

Author: engcom-Bravo

app/code/Magento/Newsletter/Model/Queue.php

@@ -48,14 +48,14 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
     protected $_template;
 
     /**
-     * Subscribers collection
+     * Subscriber collection
      *
      * @var \Magento\Newsletter\Model\ResourceModel\Subscriber\Collection
      */
     protected $_subscribersCollection;
 
     /**
-     * Save stores flag.
+     * Flag for Save Stores.
      *
      * @var boolean
      */
@@ -68,15 +68,15 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
      */
     protected $_stores = [];
 
-    const STATUS_NEVER = 0;
+    public const STATUS_NEVER = 0;
 
-    const STATUS_SENDING = 1;
+    public const STATUS_SENDING = 1;
 
-    const STATUS_CANCEL = 2;
+    public const STATUS_CANCEL = 2;
 
-    const STATUS_SENT = 3;
+    public const STATUS_SENT = 3;
 
-    const STATUS_PAUSE = 4;
+    public const STATUS_PAUSE = 4;
 
     /**
      * Filter for newsletter text
@@ -86,7 +86,7 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
     protected $_templateFilter;
 
     /**
-     * Date
+     * Datetime
      *
      * @var \Magento\Framework\Stdlib\DateTime\DateTime
      */
@@ -100,7 +100,7 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
     protected $_problemFactory;
 
     /**
-     * Template factory
+     * Factory of Template
      *
      * @var \Magento\Newsletter\Model\TemplateFactory
      */
@@ -168,8 +168,8 @@ public function __construct(
         $this->_subscribersCollection = $subscriberCollectionFactory->create();
         $this->_transportBuilder = $transportBuilder;
 
-        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-        $this->timezone = $timezone ?: $objectManager->get(TimezoneInterface::class);
+//        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+//        $this->timezone = $timezone ?: $objectManager->get(TimezoneInterface::class);
         $this->utcConverter = $utcConverter ?? $objectManager->get(LocalizedDateToUtcConverterInterface::class);
     }
 

app/code/Magento/Newsletter/Model/Template.php

@@ -41,7 +41,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
      * Mail object
      *
      * @deprecated 100.3.0 Unused property
-     *
+     * @var string
      */
     protected $_mail;
 
@@ -60,7 +60,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
     protected $_request;
 
     /**
-     * Filter factory
+     * Factory of Filter class
      *
      * @var \Magento\Newsletter\Model\Template\FilterFactory
      */
@@ -224,7 +224,8 @@ public function getTemplateText()
                 'template_text',
                 __(
                     'Follow this link to unsubscribe <!-- This tag is for unsubscribe link  -->' .
-                    '<a href="{{var subscriber_data.unsubscription_link}}">{{var subscriber_data.unsubscription_link}}' .
+                    '<a href="{{var subscriber_data.unsubscription_link}}">
+                        {{var subscriber_data.unsubscription_link}}' .
                     '</a>'
                 )
             );

app/code/Magento/Newsletter/Test/Unit/Model/QueueTest.php

@@ -169,7 +169,9 @@ public function testSendPerSubscriber2()
             ->getMock();
         $item = $this->getMockBuilder(Subscriber::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getStoreId', 'getSubscriberEmail', 'getSubscriberFullName', 'received'])
+            ->setMethods(
+                ['getStoreId', 'getSubscriberEmail', 'getSubscriberFullName', 'received', 'getUnsubscriptionLink']
+            )
             ->getMock();
         $transport = $this->getMockForAbstractClass(TransportInterface::class);
         $this->subscribersCollectionMock->expects($this->once())->method('getQueueJoinedFlag')->willReturn(false);
@@ -188,6 +190,9 @@ public function testSendPerSubscriber2()
         $item->expects($this->once())->method('getStoreId')->willReturn('store_id');
         $item->expects($this->once())->method('getSubscriberEmail')->willReturn('email');
         $item->expects($this->once())->method('getSubscriberFullName')->willReturn('full_name');
+        $item->expects($this->once())
+            ->method('getUnsubscriptionLink')
+            ->willReturn('http://example.com/newsletter/subscriber/unsubscribe/');
         $this->transportBuilderMock->expects($this->once())->method('setTemplateOptions')->willReturnSelf();
         $this->transportBuilderMock->expects($this->once())->method('setTemplateVars')->willReturnSelf();
         $this->transportBuilderMock->expects($this->once())->method('setFrom')->willReturnSelf();