TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working : Refactor adapter into facade

Browse Source
This commit is contained in:
gmorel
2013-10-10 22:29:53 +02:00
parent 7f59c8a954
commit 5a6f6483b1
23 changed files with 123 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/lib/Thelia/Tests/Coupon/CouponBaseAdapterTest.php
View File

@@ -28,7 +28,7 @@ namespace Thelia\Coupon;
* Date: 8/19/13
* Time: 3:24 PM
*
* Unit Test BaseAdapter Class
* Unit Test BaseFacade Class
*
* @package Coupon
* @author Guillaume MOREL <gmorel@openstudio.fr>
@@ -44,7 +44,7 @@ class CouponBaseAdapterTest extends \PHPUnit_Framework_TestCase
);
}
// /**
// * @var BaseAdapter
// * @var BaseFacade
// */
// protected $object;
//
@@ -54,7 +54,7 @@ class CouponBaseAdapterTest extends \PHPUnit_Framework_TestCase
// */
// protected function setUp()
// {
// $this->object = new BaseAdapter;
// $this->object = new BaseFacade;
// }
//
// /**
@@ -66,7 +66,7 @@ class CouponBaseAdapterTest extends \PHPUnit_Framework_TestCase
// }
//
// /**
// * @covers Thelia\Coupon\BaseAdapter::getCart
// * @covers Thelia\Coupon\BaseFacade::getCart
// * @todo Implement testGetCart().
// */
// public function testGetCart()
@@ -78,7 +78,7 @@ class CouponBaseAdapterTest extends \PHPUnit_Framework_TestCase
// }
//
// /**
// * @covers Thelia\Coupon\BaseAdapter::getDeliveryAddress
// * @covers Thelia\Coupon\BaseFacade::getDeliveryAddress
// * @todo Implement testGetDeliveryAddress().
// */
// public function testGetDeliveryAddress()
@@ -90,7 +90,7 @@ class CouponBaseAdapterTest extends \PHPUnit_Framework_TestCase
// }
//
// /**
// * @covers Thelia\Coupon\BaseAdapter::getCustomer
// * @covers Thelia\Coupon\BaseFacade::getCustomer
// * @todo Implement testGetCustomer().
// */
// public function testGetCustomer()

20
core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php
View File

@@ -23,14 +23,6 @@
namespace Thelia\Coupon;
use Thelia\Constraint\Validator\PriceParam;
use Thelia\Constraint\Validator\RuleValidator;
use Thelia\Constraint\Rule\AvailableForTotalAmount;
use Thelia\Constraint\Rule\Operators;
use Thelia\Coupon\Type\CouponInterface;
use Thelia\Exception\CouponExpiredException;
use Thelia\Model\Coupon;
require_once 'CouponManagerTest.php';
/**
@@ -109,9 +101,9 @@ class CouponFactoryTest extends \PHPUnit_Framework_TestCase
// $isRemovingPostage
// );
//
// /** @var AdapterInterface $stubCouponBaseAdapter */
// /** @var FacadeInterface $stubCouponBaseAdapter */
// $stubCouponBaseAdapter = $this->getMock(
// 'Thelia\Coupon\BaseAdapter',
// 'Thelia\Coupon\BaseFacade',
// array('findOneCouponByCode'),
// array()
// );
@@ -135,7 +127,7 @@ class CouponFactoryTest extends \PHPUnit_Framework_TestCase
// $date = new \DateTime();
// $date->setTimestamp(strtotime("today - 2 months"));
//
// /** @var AdapterInterface $mockAdapter */
// /** @var FacadeInterface $mockAdapter */
// $mockAdapter = $this->generateCouponModelMock(null, null, null, null, null, null, null, null, $date);
// $couponFactory = new CouponFactory($mockAdapter);
// $coupon = $couponFactory->buildCouponFromCode('XMAS1');
@@ -151,7 +143,7 @@ class CouponFactoryTest extends \PHPUnit_Framework_TestCase
// {
// $date = new \DateTime();
//
// /** @var AdapterInterface $mockAdapter */
// /** @var FacadeInterface $mockAdapter */
// $mockAdapter = $this->generateCouponModelMock(null, null, null, null, null, null, null, null, $date);
// $couponFactory = new CouponFactory($mockAdapter);
// $coupon = $couponFactory->buildCouponFromCode('XMAS1');
@@ -165,7 +157,7 @@ class CouponFactoryTest extends \PHPUnit_Framework_TestCase
// */
// public function testBuildCouponFromCodeWithoutRule()
// {
// /** @var AdapterInterface $mockAdapter */
// /** @var FacadeInterface $mockAdapter */
// $mockAdapter = $this->generateCouponModelMock(null, null, null, null, null, null, null, null, null, new ConditionCollection(array()));
// $couponFactory = new CouponFactory($mockAdapter);
// $coupon = $couponFactory->buildCouponFromCode('XMAS1');
@@ -178,7 +170,7 @@ class CouponFactoryTest extends \PHPUnit_Framework_TestCase
// */
// public function testBuildCouponFromCode()
// {
// /** @var AdapterInterface $mockAdapter */
// /** @var FacadeInterface $mockAdapter */
// $mockAdapter = $this->generateCouponModelMock();
// $couponFactory = new CouponFactory($mockAdapter);
// /** @var CouponInterface $coupon */

49
core/lib/Thelia/Tests/Coupon/CouponManagerTest.php
View File

@@ -23,11 +23,6 @@
namespace Thelia\Coupon;
use Thelia\Constraint\Validator\PriceParam;
use Thelia\Constraint\Validator\RuleValidator;
use Thelia\Constraint\Rule\Operators;
use Thelia\Coupon\Type\CouponInterface;
use Thelia\Tools\PhpUnitUtils;
/**
* Created by JetBrains PhpStorm.
@@ -88,7 +83,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// /** @var CouponInterface $coupon */
// $coupon = self::generateValidCoupon();
//
// /** @var AdapterInterface $stubCouponBaseAdapter */
// /** @var FacadeInterface $stubCouponBaseAdapter */
// $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon), $cartTotalPrice, $checkoutTotalPrice);
//
// $couponManager = new CouponManager($stubCouponBaseAdapter);
@@ -108,7 +103,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// */
// public function testGetDiscountTwoCoupon()
// {
// $adapter = new BaseAdapter();
// $adapter = new BaseFacade();
// $cartTotalPrice = 100.00;
// $checkoutTotalPrice = 120.00;
//
@@ -128,7 +123,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// /** @var CouponInterface $coupon2 */
// $coupon2 = $this->generateValidCoupon('XMAS2', null, null, null, 15.00, null, null, $rules);
//
// /** @var AdapterInterface $stubCouponBaseAdapter */
// /** @var FacadeInterface $stubCouponBaseAdapter */
// $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon1, $coupon2), $cartTotalPrice, $checkoutTotalPrice);
//
// $couponManager = new CouponManager($stubCouponBaseAdapter);
@@ -148,7 +143,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// */
// public function testGetDiscountAlwaysInferiorToPrice()
// {
// $adapter = new BaseAdapter();
// $adapter = new BaseFacade();
// $cartTotalPrice = 21.00;
// $checkoutTotalPrice = 26.00;
//
@@ -166,7 +161,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// /** @var CouponInterface $coupon */
// $coupon = $this->generateValidCoupon('XMAS2', null, null, null, 30.00, null, null, $rules);
//
// /** @var AdapterInterface $stubCouponBaseAdapter */
// /** @var FacadeInterface $stubCouponBaseAdapter */
// $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon), $cartTotalPrice, $checkoutTotalPrice);
//
// $couponManager = new CouponManager($stubCouponBaseAdapter);
@@ -185,7 +180,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// */
// public function testIsCouponRemovingPostage()
// {
// $adapter = new BaseAdapter();
// $adapter = new BaseFacade();
// $cartTotalPrice = 21.00;
// $checkoutTotalPrice = 27.00;
//
@@ -203,7 +198,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// /** @var CouponInterface $coupon */
// $coupon = $this->generateValidCoupon('XMAS2', null, null, null, 30.00, null, null, $rules, null, true);
//
// /** @var AdapterInterface $stubCouponBaseAdapter */
// /** @var FacadeInterface $stubCouponBaseAdapter */
// $stubCouponBaseAdapter = $this->generateFakeAdapter(array($coupon), $cartTotalPrice, $checkoutTotalPrice);
//
// $couponManager = new CouponManager($stubCouponBaseAdapter);
@@ -231,7 +226,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
//
// $coupons = array($couponCumulative1);
//
// /** @var AdapterInterface $stubCouponBaseAdapter */
// /** @var FacadeInterface $stubCouponBaseAdapter */
// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice);
//
// // When
@@ -264,7 +259,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// $couponCumulative1 = $this->generateValidCoupon(null, null, null, null, null, null, null, null, true);
//
// $coupons = array($couponCumulative1);
// /** @var AdapterInterface $stubCouponBaseAdapter */
// /** @var FacadeInterface $stubCouponBaseAdapter */
// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice);
//
// // When
@@ -299,7 +294,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true);
//
// $coupons = array($couponCumulative1, $couponCumulative2);
// /** @var AdapterInterface $stubCouponBaseAdapter */
// /** @var FacadeInterface $stubCouponBaseAdapter */
// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice);
//
// // When
@@ -334,7 +329,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, false);
//
// $coupons = array($couponCumulative1, $couponCumulative2);
// /** @var AdapterInterface $stubCouponBaseAdapter */
// /** @var FacadeInterface $stubCouponBaseAdapter */
// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice);
//
// // When
@@ -369,7 +364,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true);
//
// $coupons = array($couponCumulative1, $couponCumulative2);
// /** @var AdapterInterface $stubCouponBaseAdapter */
// /** @var FacadeInterface $stubCouponBaseAdapter */
// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice);
//
// // When
@@ -404,7 +399,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, false);
//
// $coupons = array($couponCumulative1, $couponCumulative2);
// /** @var AdapterInterface $stubCouponBaseAdapter */
// /** @var FacadeInterface $stubCouponBaseAdapter */
// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice);
//
// // When
@@ -437,7 +432,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// $couponCumulative1 = $this->generateValidCoupon('XMAS1', null, null, null, null, null, new \DateTime(), null, true);
//
// $coupons = array($couponCumulative1);
// /** @var AdapterInterface $stubCouponBaseAdapter */
// /** @var FacadeInterface $stubCouponBaseAdapter */
// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice);
//
// // When
@@ -472,7 +467,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, new \DateTime(), null, true);
//
// $coupons = array($couponCumulative1, $couponCumulative2);
// /** @var AdapterInterface $stubCouponBaseAdapter */
// /** @var FacadeInterface $stubCouponBaseAdapter */
// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice);
//
// // When
@@ -507,7 +502,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, null, null, true);
//
// $coupons = array($couponCumulative1, $couponCumulative2);
// /** @var AdapterInterface $stubCouponBaseAdapter */
// /** @var FacadeInterface $stubCouponBaseAdapter */
// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice);
//
// // When
@@ -542,7 +537,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// $couponCumulative2 = $this->generateValidCoupon('XMAS2', null, null, null, null, null, new \DateTime(), null, true);
//
// $coupons = array($couponCumulative1, $couponCumulative2);
// /** @var AdapterInterface $stubCouponBaseAdapter */
// /** @var FacadeInterface $stubCouponBaseAdapter */
// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice);
//
// // When
@@ -581,7 +576,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// $couponCumulative4 = $this->generateValidCoupon('XMAS4', null, null, null, null, null, null, null, true);
//
// $coupons = array($couponCumulative1, $couponCumulative2, $couponCumulative3, $couponCumulative4);
// /** @var AdapterInterface $stubCouponBaseAdapter */
// /** @var FacadeInterface $stubCouponBaseAdapter */
// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice);
//
// // When
@@ -620,7 +615,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// $couponCumulative4 = $this->generateValidCoupon('XMAS4', null, null, null, null, null, null, null, false);
//
// $coupons = array($couponCumulative1, $couponCumulative2, $couponCumulative3, $couponCumulative4);
// /** @var AdapterInterface $stubCouponBaseAdapter */
// /** @var FacadeInterface $stubCouponBaseAdapter */
// $stubCouponBaseAdapter = $this->generateFakeAdapter($coupons, $cartTotalPrice, $checkoutTotalPrice);
//
// // When
@@ -645,7 +640,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// */
// public static function generateValidRules()
// {
// $adapter = new BaseAdapter();
// $adapter = new BaseFacade();
// $rule1 = new AvailableForTotalAmount(
// $adapter, array(
// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator(
@@ -692,7 +687,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// public function generateFakeAdapter(array $coupons, $cartTotalPrice, $checkoutTotalPrice, $postagePrice = 6.00)
// {
// $stubCouponBaseAdapter = $this->getMock(
// 'Thelia\Coupon\BaseAdapter',
// 'Thelia\Coupon\BaseFacade',
// array(
// 'getCurrentCoupons',
// 'getCartTotalPrice',
@@ -758,7 +753,7 @@ class CouponManagerTest extends \PHPUnit_Framework_TestCase
// $isAvailableOnSpecialOffers = null,
// $maxUsage = null
// ) {
// $adapter = new BaseAdapter();
// $adapter = new BaseFacade();
// if ($code === null) {
// $code = self::VALID_CODE;
// }

18
core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php
View File

@@ -23,10 +23,6 @@
namespace Thelia\Coupon;
use Thelia\Constraint\Validator\PriceParam;
use Thelia\Constraint\Validator\RuleValidator;
use Thelia\Constraint\Rule\Operators;
use Thelia\Coupon\Type\RemoveXAmountManager;
//require_once '../CouponManagerTest.php';
@@ -153,7 +149,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase
// */
// public function testGetEffect()
// {
// $adapter = new BaseAdapter();
// $adapter = new BaseFacade();
// $coupon = CouponManagerTest::generateValidCoupon(null, null, null, null, null, null, null, null, false, false);
//
// $expected = 10;
@@ -228,7 +224,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase
// public function testGetEffectIfTotalAmountInferiorTo400Valid()
// {
// // Given
// $adapter = new BaseAdapter();
// $adapter = new BaseFacade();
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::INFERIOR,
// 400.00
@@ -253,7 +249,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase
// public function testGetEffectIfTotalAmountInferiorOrEqualTo400Valid()
// {
// // Given
// $adapter = new BaseAdapter();
// $adapter = new BaseFacade();
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::INFERIOR_OR_EQUAL,
// 400.00
@@ -278,7 +274,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase
// public function testGetEffectIfTotalAmountEqualTo400Valid()
// {
// // Given
// $adapter = new BaseAdapter();
// $adapter = new BaseFacade();
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::EQUAL,
// 400.00
@@ -303,7 +299,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase
// public function testGetEffectIfTotalAmountSuperiorOrEqualTo400Valid()
// {
// // Given
// $adapter = new BaseAdapter();
// $adapter = new BaseFacade();
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::SUPERIOR_OR_EQUAL,
// 400.00
@@ -328,7 +324,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase
// public function testGetEffectIfTotalAmountSuperiorTo400Valid()
// {
// // Given
// $adapter = new BaseAdapter();
// $adapter = new BaseFacade();
// $rule0 = $this->generateValidRuleAvailableForTotalAmountOperatorTo(
// Operators::SUPERIOR,
// 400.00
@@ -365,7 +361,7 @@ class RemoveXAmountTest extends \PHPUnit_Framework_TestCase
// */
// protected function generateValidRuleAvailableForTotalAmountOperatorTo($operator, $amount)
// {
// $adapter = new BaseAdapter();
// $adapter = new BaseFacade();
// $validators = array(
// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator(
// $operator,

9
core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php
View File

@@ -24,11 +24,6 @@
namespace Thelia\Coupon;
use PHPUnit_Framework_TestCase;
use Thelia\Constraint\Rule\Operators;
use Thelia\Constraint\Validator\PriceParam;
use Thelia\Constraint\Validator\RuleValidator;
use Thelia\Coupon\Type\CouponInterface;
use Thelia\Coupon\Type\RemoveXPercentManager;
//require_once '../CouponManagerTest.php';
@@ -407,7 +402,7 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase
// */
// protected function generateValidRuleAvailableForTotalAmountOperatorTo($operator, $amount)
// {
// $adapter = new BaseAdapter();
// $adapter = new BaseFacade();
// $validators = array(
// AvailableForTotalAmount::PARAM1_PRICE => new RuleValidator(
// $operator,
@@ -432,7 +427,7 @@ class RemoveXPercentTest extends \PHPUnit_Framework_TestCase
// public function generateFakeAdapter($cartTotalPrice)
// {
// $stubCouponBaseAdapter = $this->getMock(
// 'Thelia\Coupon\BaseAdapter',
// 'Thelia\Coupon\BaseFacade',
// array(
// 'getCartTotalPrice'
// ),