MAGETWO-31968: PHP Fatal error: Call to a member function addStreamLog() on a non-object

 - Fixed Fatal error
 - added unit test method

Author: Bibu Mathew

dev/tests/unit/testsuite/Magento/Framework/Image/Adapter/ImageMagickTest.php

@@ -4,18 +4,63 @@
  */
 namespace Magento\Framework\Image\Adapter;
 
+use Magento\Framework\Filesystem\FilesystemException;
+use Magento\TestFramework\Helper\ObjectManager;
+
 class ImageMagickTest extends \PHPUnit_Framework_TestCase
 {
     /**
+     * @var \PHPUnit_Framework_MockObject_MockObject |\Magento\Framework\Filesystem
+     */
+    protected $filesystemMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject |\Psr\Log\LoggerInterface
+     */
+    protected $loggerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Filesystem\Directory\WriteInterface
+     */
+    protected $writeMock;
+    /**
+     * @var \Magento\Framework\Image\Adapter\ImageMagick
+     */
+    protected $imageMagic;
+
+    public function setup()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->loggerMock = $this->getMockBuilder( 'Psr\Log\LoggerInterface')->getMock();
+        $this->writeMock =  $this->getMockBuilder('Magento\Framework\Filesystem\Directory\WriteInterface')->getMock();
+        $this->filesystemMock = $this->getMock(
+            'Magento\Framework\Filesystem',
+            ['getDirectoryWrite'],
+            [],
+            '',
+            false
+        );
+        $this->filesystemMock
+            ->expects($this->once())
+            ->method('getDirectoryWrite')
+            ->will($this->returnValue(  $this->writeMock));
+
+        $this->imageMagic = $objectManager
+            ->getObject(
+                'Magento\Framework\Image\Adapter\ImageMagick',
+                ['filesystem' => $this->filesystemMock,
+                    'logger' => $this->loggerMock]
+            );
+    }
+    /**
+     * @param string $imagePath
+     * @param string $expectedMessage
      * @dataProvider watermarkDataProvider
      */
     public function testWatermark($imagePath, $expectedMessage)
     {
-        $filesystem =
-            $this->getMockBuilder('Magento\Framework\Filesystem')->disableOriginalConstructor()->getMock();
         $this->setExpectedException('LogicException', $expectedMessage);
-        $object = new \Magento\Framework\Image\Adapter\ImageMagick($filesystem);
-        $object->watermark($imagePath);
+        $this->imageMagic->watermark($imagePath);
     }
 
     /**
@@ -32,4 +77,16 @@ public function watermarkDataProvider()
             ]
         ];
     }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Unable to write file into directory product/cache. Access forbidden.
+     */
+    public function testSaveWithException()
+    {
+        $exception = new FilesystemException();
+        $this->writeMock->method('create')->will($this->throwException($exception));
+        $this->loggerMock->expects($this->once())->method('critical')->with($exception);
+        $this->imageMagic->save('product/cache','sample.jpg');
+    }
 }

lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php

@@ -260,11 +260,13 @@ abstract public function getColorAt($x, $y);
      * Initialize default values
      *
      * @param \Magento\Framework\Filesystem $filesystem
+     * @param \Psr\Log\LoggerInterface $logger
      * @param array $data
      */
-    public function __construct(\Magento\Framework\Filesystem $filesystem, array $data = [])
+    public function __construct(\Magento\Framework\Filesystem $filesystem, $logger, array $data = [])
     {
         $this->_filesystem = $filesystem;
+        $this->logger = $logger;
         $this->directoryWrite = $this->_filesystem->getDirectoryWrite(DirectoryList::ROOT);
     }