MAGNIMEX-SPRINT2: Add lost php unit tests

replace MockBuilder with just getMock methods for collection classes
fix cs for ZipTest.php, merge conficts

Author: Andrei Kuprienka

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/CategoryProcessorTest.php

@@ -73,9 +73,14 @@ protected function setUp()
             ->method('getItemById')
             ->will($this->returnValueMap($map));
 
-        $categoryColFactory = $this->getMockBuilder('Magento\Catalog\Model\Resource\Category\CollectionFactory')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $categoryColFactory = $this->getMock(
+            'Magento\Catalog\Model\Resource\Category\CollectionFactory',
+            ['create'],
+            [],
+            '',
+            false
+        );
+
         $categoryColFactory->method('create')->will($this->returnValue($categoryCollection));
 
         $categoryFactory = $this->getMockBuilder('Magento\Catalog\Model\CategoryFactory')

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/TaxClassProcessorTest.php

@@ -50,9 +50,15 @@ protected function setUp()
                 'Magento\Tax\Model\Resource\TaxClass\Collection',
                 [$taxClass]
             );
-        $taxClassCollectionFactory = $this->getMockBuilder('Magento\Tax\Model\Resource\TaxClass\CollectionFactory')
-            ->disableOriginalConstructor()
-            ->getMock();
+
+        $taxClassCollectionFactory = $this->getMock(
+            'Magento\Tax\Model\Resource\TaxClass\CollectionFactory',
+            ['create'],
+            [],
+            '',
+            false
+        );
+
         $taxClassCollectionFactory->method('create')->will($this->returnValue($taxClassCollection));
 
         $anotherTaxClass = $this->getMockBuilder('Magento\Tax\Model\ClassModel')
@@ -61,9 +67,14 @@ protected function setUp()
         $anotherTaxClass->method('getClassName')->will($this->returnValue(self::TEST_TAX_CLASS_NAME));
         $anotherTaxClass->method('getId')->will($this->returnValue(self::TEST_JUST_CREATED_TAX_CLASS_ID));
 
-        $taxClassFactory = $this->getMockBuilder('Magento\Tax\Model\ClassModelFactory')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $taxClassFactory = $this->getMock(
+            'Magento\Tax\Model\ClassModelFactory',
+            ['create'],
+            [],
+            '',
+            false
+        );
+
         $taxClassFactory->method('create')->will($this->returnValue($anotherTaxClass));
 
         $this->taxClassProcessor =

lib/internal/Magento/Framework/Archive/Test/Unit/ZipTest.php

@@ -1,56 +1,56 @@
-<?php
-
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\Archive\Test\Unit;
-
-use Composer\Composer;
-
-class ZipTest extends \PHPUnit_Framework_TestCase
-{
-
-    /**
-     * @var \Magento\Framework\Archive\Zip|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $zip;
-
-    public function setUp()
-    {
-        $this->zip = $this->getMockBuilder('\Magento\Framework\Archive\Zip')
-            ->disableOriginalConstructor()
-            ->getMock();
-    }
-
-    /**
-     * Check constructor if no exceptions is thrown.
-     */
-    public function testConstructorNoExceptions()
-    {
-        try{
-            $reflectedClass = new \ReflectionClass('\Magento\Framework\Archive\Zip');
-            $constructor = $reflectedClass->getConstructor();
-            $constructor->invoke($this->zip, []);
-        } catch (\Exception $e){
-            $this->fail('Failed asserting that no exceptions is thrown');
-        }
-    }
-
-    /**
-     * @depends testConstructorNoExceptions
-     */
-    public function testPack()
-    {
-        $this->markTestSkipped('Method pack contains dependency on \ZipArchive object');
-    }
-
-    /**
-     * @depends testConstructorNoExceptions
-     */
-    public function testUnpack()
-    {
-        $this->markTestSkipped('Method unpack contains dependency on \ZipArchive object');
-    }
-}
+<?php
+
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Archive\Test\Unit;
+
+use Composer\Composer;
+
+class ZipTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * @var \Magento\Framework\Archive\Zip|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $zip;
+
+    public function setUp()
+    {
+        $this->zip = $this->getMockBuilder('\Magento\Framework\Archive\Zip')
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    /**
+     * Check constructor if no exceptions is thrown.
+     */
+    public function testConstructorNoExceptions()
+    {
+        try {
+            $reflectedClass = new \ReflectionClass('\Magento\Framework\Archive\Zip');
+            $constructor = $reflectedClass->getConstructor();
+            $constructor->invoke($this->zip, []);
+        } catch (\Exception $e) {
+            $this->fail('Failed asserting that no exceptions is thrown');
+        }
+    }
+
+    /**
+     * @depends testConstructorNoExceptions
+     */
+    public function testPack()
+    {
+        $this->markTestSkipped('Method pack contains dependency on \ZipArchive object');
+    }
+
+    /**
+     * @depends testConstructorNoExceptions
+     */
+    public function testUnpack()
+    {
+        $this->markTestSkipped('Method unpack contains dependency on \ZipArchive object');
+    }
+}