From 8799873f178154336380a47c57248ebe4c7d7f77 Mon Sep 17 00:00:00 2001 From: Roman Liukshyn <rliukshyn@magento.com> Date: Tue, 20 Dec 2016 17:57:03 +0200 Subject: [PATCH] MTA-3953: Implement instrument which allow Functional Tests to download file from Magento Export functionality --- .../Mtf/Util/Command/File/Resource/Data.php | 58 ------------ .../Mtf/Util/Command/File/Resource/Reader.php | 89 ------------------- .../Command/File/Resource/ReaderInterface.php | 29 ------ .../ExpressCheckoutFromProductPageTest.xml | 2 +- .../ExpressCheckoutFromShoppingCartTest.xml | 2 +- .../TestCase/ExpressCheckoutOnePageTest.xml | 6 +- 6 files changed, 5 insertions(+), 181 deletions(-) delete mode 100644 dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Resource/Data.php delete mode 100644 dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Resource/Reader.php delete mode 100644 dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Resource/ReaderInterface.php diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Resource/Data.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Resource/Data.php deleted file mode 100644 index 6b358452041..00000000000 --- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Resource/Data.php +++ /dev/null @@ -1,58 +0,0 @@ -<?php -/** - * Copyright © 2016 Magento. All rights reserved. - * See COPYING.txt for license details. - */ - -namespace Magento\Mtf\Util\Command\File\Resource; - -/** - * Data mapping for Export file. - */ -class Data -{ - /** - * File data. - * - * @var array - */ - private $data; - - /** - * @param array $data - */ - public function __construct(array $data) - { - $this->data = $data; - } - - /** - * Get file name. - * - * @return string - */ - public function getName() - { - return $this->data['name']; - } - - /** - * Get file content. - * - * @return string - */ - public function getContent() - { - return $this->data['content']; - } - - /** - * Get file creation date. - * - * @return string - */ - public function getDate() - { - return $this->data['date']; - } -} diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Resource/Reader.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Resource/Reader.php deleted file mode 100644 index df696046c84..00000000000 --- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Resource/Reader.php +++ /dev/null @@ -1,89 +0,0 @@ -<?php -/** - * Copyright © 2016 Magento. All rights reserved. - * See COPYING.txt for license details. - */ - -namespace Magento\Mtf\Util\Command\File\Resource; - -use Magento\Mtf\ObjectManagerInterface; -use Magento\Mtf\Util\Protocol\CurlTransport; -use Magento\Mtf\Util\Protocol\CurlInterface; - -/** - * File reader for Magento export files. - */ -class Reader implements ReaderInterface -{ - /** - * Pattern for file name in Magento. - * - * @var string - */ - private $template; - - /** - * Object manager instance. - * - * @var ObjectManagerInterface - */ - private $objectManager; - - /** - * Curl transport protocol. - * - * @var CurlTransport - */ - private $transport; - - /** - * @param ObjectManagerInterface $objectManager - * @param CurlTransport $transport - * @param string $template - */ - public function __construct(ObjectManagerInterface $objectManager, CurlTransport $transport, $template) - { - $this->objectManager = $objectManager; - $this->template = $template; - $this->transport = $transport; - } - - /** - * Exporting files as Data object from Magento. - * - * @return Data[] - */ - public function getData() - { - $data = []; - foreach ($this->getFiles() as $file) { - $data[] = $this->objectManager->create(Data::class, ['data' => $file]); - } - - return $data; - } - - /** - * Get files by template from the Magento. - * - * @return array - */ - private function getFiles() - { - $this->transport->write($this->prepareUrl(), [], CurlInterface::GET); - $serializedFiles = $this->transport->read(); - $this->transport->close(); - - return unserialize($serializedFiles); - } - - /** - * Prepare url. - * - * @return string - */ - private function prepareUrl() - { - return $_ENV['app_frontend_url'] . self::URL . '?template=' . urlencode($this->template); - } -} diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Resource/ReaderInterface.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Resource/ReaderInterface.php deleted file mode 100644 index 46ae0f9d876..00000000000 --- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Resource/ReaderInterface.php +++ /dev/null @@ -1,29 +0,0 @@ -<?php -/** - * Copyright © 2016 Magento. All rights reserved. - * See COPYING.txt for license details. - */ - -namespace Magento\Mtf\Util\Command\File\Resource; - -use Magento\Mtf\ObjectManagerInterface; -use Magento\Mtf\Util\Protocol\CurlTransport; -use Magento\Mtf\Util\Protocol\CurlInterface; - -/** - * File reader interface for Magento export files. - */ -interface ReaderInterface -{ - /** - * Url to export.php. - */ - const URL = 'dev/tests/functional/utils/export.php'; - - /** - * Exporting files as Data object from Magento. - * - * @return Data[] - */ - public function getData(); -} diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.xml index 1d92fa149ef..6005fe4008d 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.xml +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.xml @@ -27,7 +27,7 @@ </data> <data name="payment/method" xsi:type="string">paypal_express</data> <data name="configData" xsi:type="string">paypal_express, freeshipping</data> - <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data> + <data name="tag" xsi:type="string">test_type:3rd_party_test_deprecated, severity:S0</data> <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" /> <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" /> <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" /> diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.xml index 38c876719bc..233958afa1a 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.xml +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.xml @@ -28,7 +28,7 @@ <item name="grandTotal" xsi:type="string">145.98</item> </data> <data name="configData" xsi:type="string">payflowpro</data> - <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data> + <data name="tag" xsi:type="string">test_type:3rd_party_test_deprecated, severity:S0</data> <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" /> <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" /> <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" /> diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.xml index e52ed631ae4..7de72c8ac9d 100644 --- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.xml +++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutOnePageTest.xml @@ -26,7 +26,7 @@ </data> <data name="payment/method" xsi:type="string">paypal_express</data> <data name="configData" xsi:type="string">paypal_express</data> - <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data> + <data name="tag" xsi:type="string">test_type:3rd_party_test_deprecated, severity:S0</data> <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" /> <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" /> <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" /> @@ -51,7 +51,7 @@ </data> <data name="payment/method" xsi:type="string">paypal_express</data> <data name="configData" xsi:type="string">payflowlink</data> - <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data> + <data name="tag" xsi:type="string">test_type:3rd_party_test_deprecated, severity:S0</data> <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" /> <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" /> <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" /> @@ -76,7 +76,7 @@ </data> <data name="payment/method" xsi:type="string">paypal_express</data> <data name="configData" xsi:type="string">paypal_express</data> - <data name="tag" xsi:type="string">test_type:3rd_party_test</data> + <data name="tag" xsi:type="string">test_type:3rd_party_test_deprecated</data> <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" /> <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" /> <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" /> -- GitLab