Revert "Revert "Add ability to run unit tests locally and add support for CDATA""

Author: evasilchenko

Helper/ProductSync/XmlHelper.php

@@ -22,6 +22,28 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\EntityManager\MetadataPool;
 
+
+class SimpleXMLElementExtended extends \SimpleXMLElement {
+
+    /**
+     * https://stackoverflow.com/a/20511976
+     * Adds a child with $value inside CDATA
+     * @param unknown $name
+     * @param unknown $value
+     */
+    public function addChildWithCDATA($name, $value = NULL) {
+      $new_child = $this->addChild($name);
+  
+      if ($new_child !== NULL) {
+        $node = dom_import_simplexml($new_child);
+        $no   = $node->ownerDocument;
+        $node->appendChild($no->createCDATASection($value));
+      }
+  
+      return $new_child;
+    }
+  }
+
 /**
  * Class XmlHelper
  * @package Ordergroove\Subscription\Helper\ProductSync
@@ -174,7 +196,7 @@ public function createWebsiteProductsXml($websiteId)
         $linkField = $metadata->getLinkField();
         try {
             $this->logger->info("In createWebsiteProductsXml for: ".$websiteId);
-            $this->xml = new \SimpleXMLElement('<products/>');
+            $this->xml = new SimpleXMLElementExtended('<products/>');
             $collection = $this->productFactory->create()->getCollection();
 
             $entityType = $collection->getEntity()->getType();
@@ -273,7 +295,7 @@ public function processProductIntoXml($args)
             return;
         }
         $productXml = $this->xml->addChild('product');
-        $productXml->addChild('name', str_replace($symbols["search"], $symbols["replace"], $productData['name']));
+        $productXml->addChildWithCDATA('name', str_replace($symbols["search"], $symbols["replace"], $productData['name']));
         $productXml->addChild('product_id', $productData['entity_id']);
         $productXml->addChild('sku', $productData['sku']);
         $productXml->addChild('price', $productData['price']);

Test/Unit/Block/Catalog/GetProductDataTest.php

@@ -44,7 +44,7 @@ class GetProductDataTest extends TestCase
      * setUp
      * @return void
      */
-    public function setUp()
+    public function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
         $this->registry = $this->createPartialMock(Registry::class, ['registry']);

Test/Unit/Block/MainJsTest.php

@@ -34,7 +34,7 @@ class MainJsTest extends TestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 
@@ -58,7 +58,7 @@ public function setUp()
     /**
      * @return void
      */
-    public function testGetMainJsUrl()
+    public function testGetMainJsUrl() : void
     {
         $this->urlBuilder->expects($this->once())->method("getPublicIdUrl")->willReturn("https://test.com");
         $this->assertEquals("https://test.com", $this->mainJs->getMainJsUrl());

Test/Unit/Block/MsiJsTest.php

@@ -41,7 +41,7 @@ class MsiJsTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Block/System/Config/CheckConnectionTest.php

@@ -32,7 +32,7 @@ class CheckConnectionTest extends TestCase
      */
     protected $layout;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $objectManager = new ObjectManager($this);
         $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManager\ObjectManager::class);
@@ -52,7 +52,7 @@ protected function setUp()
         );
     }
 
-    protected function tearDown()
+    protected function tearDown() : void
     {
     }
 

Test/Unit/Controller/Msi/IndexTest.php

@@ -60,7 +60,7 @@ class IndexTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp() : void
     {
         $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManager\ObjectManager::class);
         $this->request = $this->createMock(\Magento\Framework\App\Request\Http::class);

Test/Unit/Controller/Subscription/PlaceOrderTest.php

@@ -84,7 +84,7 @@ class PlaceOrderTest extends TestCase
      */
     protected $request;
 
-    public function setUp()
+    public function setUp() : void
     {
         $objectManager = new ObjectManager($this);
         $this->context = $this->createMock(Context::class);

Test/Unit/Helper/ConfigHelperTest.php

@@ -35,7 +35,7 @@ class ConfigHelperTest extends TestCase
      * setUp
      * @return void
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Helper/ProductSync/ProductSyncTest.php

@@ -29,7 +29,7 @@ class ProductSyncTest extends TestCase
      * @var ObjectManager
      */
     protected $objectManager;
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
         $this->productSync = $this->objectManager->getObject(ProductSync::class);
@@ -50,7 +50,7 @@ protected function setUp()
         );
     }
 
-    protected function tearDown()
+    protected function tearDown() : void
     {
     }
 

Test/Unit/Helper/ProductSync/SftpHelperTest.php

@@ -43,7 +43,7 @@ class SftpHelperTest extends TestCase
      */
     protected $infoLogger;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 
@@ -74,7 +74,7 @@ protected function setUp()
         );
     }
 
-    protected function tearDown()
+    protected function tearDown() : void
     {
     }
 

Test/Unit/Helper/ProductSync/XmlHelperTest.php

@@ -57,7 +57,7 @@ class XmlHelperTest extends TestCase
      */
     private $scopeConfig;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
         $this->storeRepository = $this->getMockBuilder(StoreRepository::class)
@@ -109,7 +109,7 @@ protected function setUp()
         );
     }
 
-    protected function tearDown()
+    protected function tearDown() : void
     {
     }
 

Test/Unit/Helper/PurchasePost/DataMapper/DataMapHelperTest.php

@@ -191,7 +191,7 @@ public function testGetAddressMappedData()
      * setUp
      * @return void
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Helper/PurchasePost/DataMapper/DataMapTest.php

@@ -43,7 +43,7 @@ class DataMapTest extends TestCase
      * setUp
      * @return void
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Helper/PurchasePost/SendPurchasePostDataTest.php

@@ -55,7 +55,7 @@ class SendPurchasePostDataTest extends TestCase
      * setUp
      * @return void
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Helper/RecurringOrderHelper/CreateRecurringOrderHelperTest.php

@@ -69,7 +69,7 @@ class CreateRecurringOrderHelperTest extends TestCase
     /**
      * Constructor
      */
-    public function setUp()
+    public function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Helper/UrlBuilderHelperTest.php

@@ -29,7 +29,7 @@ class UrlBuilderHelperTest extends TestCase
      * setUp
      * @return void
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Model/Authentication/ValidateAuthorizationTest.php

@@ -29,7 +29,7 @@ class ValidateAuthorizationTest extends TestCase
      */
     protected $validateAuthorization;
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Model/Config/ConfigProviderTest.php

@@ -39,7 +39,7 @@ class ConfigProviderTest extends TestCase
      * setUp
      * @return void
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Model/Config/Source/SyncSelectTest.php

@@ -19,7 +19,7 @@ class SyncSelectTest extends TestCase
      */
     protected $timeZoneInterface;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $objectManager = new ObjectManager($this);
         $this->timeZoneInterface = $this->getMockBuilder(Timezone::class)
@@ -35,7 +35,7 @@ protected function setUp()
         );
     }
 
-    protected function tearDown()
+    protected function tearDown() : void
     {
     }
 

Test/Unit/Model/Config/TokenBuilderTest.php

@@ -31,7 +31,7 @@ class TokenBuilderTest extends TestCase
      * setUp
      * @return void
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Model/Config/UrlBuilderTest.php

@@ -37,7 +37,7 @@ class UrlBuilderTest extends TestCase
      * setUp
      * @return void
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Model/Cookie/OgAuthCookieTest.php

@@ -165,7 +165,7 @@ public function testSet()
      * setUp
      * @return void
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Model/Customer/UpdateDataApiHelper/UpdateDataApiHelperTest.php

@@ -67,7 +67,7 @@ class UpdateDataApiHelperTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Model/Customer/UpdateDataApiTest.php

@@ -90,7 +90,7 @@ class UpdateDataApiTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Model/RecurringOrder/CreateRecurringOrderTest.php

@@ -83,7 +83,7 @@ class CreateRecurringOrderTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
         $this->product = $this->getMockBuilder(Product::class)

Test/Unit/Model/Request/ValidateRequestTest.php

@@ -31,7 +31,7 @@ class ValidateRequestTest extends TestCase
     /**
      * Set Up
      */
-    public function setUp()
+    public function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
         $this->request = $this->getMockBuilder(Http::class)

Test/Unit/Model/Signature/SignatureTest.php

@@ -34,7 +34,7 @@ class SignatureTest extends TestCase
      * setUp
      * @return void
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Observer/CustomerUpdate/ChangeInEmailTest.php

@@ -111,7 +111,7 @@ public function testExecuteEmailNoChange()
      * setUp
      * @return void
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Observer/DataAssignObserverTest.php

@@ -27,7 +27,7 @@ class DataAssignObserverTest extends TestCase
      * @var ObjectManager
      */
     private $objectManager;
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Observer/Sales/SendPurchasePostTest.php

@@ -63,7 +63,7 @@ class SendPurchasePostTest extends Testcase
      * setUp
      * @return void
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Plugin/Account/Login/CreateCookieTest.php

@@ -114,7 +114,7 @@ public function testAfterExecuteCustomerLoggedIn()
      * setUp
      * @return void
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Plugin/Account/Logout/DeleteCookieTest.php

@@ -57,7 +57,7 @@ class DeleteCookieTest extends TestCase
      * setUp
      * @return void
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
 

Test/Unit/Plugin/Account/Telephone/ChangeInTelephoneTest.php

@@ -134,7 +134,7 @@ public function testAroundExecute()
      * setUp
      * @return void
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);
         $this->customerSession = $this->getMockBuilder(Session::class)

Test/Unit/Plugin/Checkout/CustomerData/AbstractItemPluginTest.php

@@ -32,7 +32,7 @@ class AbstractItemPluginTest extends TestCase
      * setUp
      * @return void
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = new ObjectManager($this);