Eliminate usage of Zend_Mail from Magento 2 Open Source

dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php

@@ -25,9 +25,9 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var \Zend_Mail|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Mail\Message|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $mail;
+    protected $message;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
@@ -45,13 +45,13 @@ protected function mockModel($filesystem = null)
             $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         }
 
-        $this->mail = $this->getMockBuilder(\Zend_Mail::class)
-            ->setMethods(['send', 'addTo', 'addBcc', 'setReturnPath', 'setReplyTo'])
+        $this->message = $this->getMockBuilder(\Magento\Framework\Mail\Message::class)
+            ->setMethods(['addTo', 'addBcc', 'setReplyTo'])
             ->setConstructorArgs(['utf-8'])
             ->getMock();
 
         $this->model = $this->getMockBuilder(\Magento\Email\Model\Template::class)
-            ->setMethods(['_getMail'])
+            ->setMethods(['mockableMethod'])
             ->setConstructorArgs([
                 $this->objectManager->get(\Magento\Framework\Model\Context::class),
                 $this->objectManager->get(\Magento\Framework\View\DesignInterface::class),
@@ -70,21 +70,9 @@ protected function mockModel($filesystem = null)
             ->getMock();
 
         $this->objectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend');
-
-        $this->model->expects($this->any())->method('_getMail')->will($this->returnCallback([$this, 'getMail']));
         $this->model->setSenderName('sender')->setSenderEmail('[email protected]')->setTemplateSubject('Subject');
     }
 
-    /**
-     * Return a disposable \Zend_Mail instance
-     *
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Zend_Mail
-     */
-    public function getMail()
-    {
-        return clone $this->mail;
-    }
-
     public function testSetGetTemplateFilter()
     {
         $this->mockModel();

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php

@@ -4237,4 +4237,5 @@
     ['Zend_Feed', 'Zend\Feed'],
     ['Zend_Uri', 'Zend\Uri\Uri'],
     ['Zend_Mime', 'Magento\Framework\HTTP\Mime'],
+    ['Zend_Mail', 'Zend\Mail'],
 ];