Merge pull request #106 from gmorel/master

Condition Module - adding/refactor unit tests

core/lib/Thelia/Action/Coupon.php

@@ -25,14 +25,14 @@ namespace Thelia\Action;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Thelia\Condition\ConditionFactory;
-use Thelia\Condition\ConditionManagerInterface;
+use Thelia\Condition\Implementation\ConditionInterface;
 use Thelia\Core\Event\Coupon\CouponConsumeEvent;
 use Thelia\Core\Event\Coupon\CouponCreateOrUpdateEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Core\HttpFoundation\Request;
 use Thelia\Coupon\CouponFactory;
 use Thelia\Coupon\CouponManager;
-use Thelia\Coupon\ConditionCollection;
+use Thelia\Condition\ConditionCollection;
 use Thelia\Coupon\Type\CouponInterface;
 use Thelia\Model\Coupon as CouponModel;
 use Thelia\Model\CouponQuery;
@@ -94,6 +94,7 @@ class Coupon extends BaseAction implements EventSubscriberInterface
     public function consume(CouponConsumeEvent $event)
     {
         $totalDiscount = 0;
+        $isValid = false;
 
         /** @var CouponFactory $couponFactory */
         $couponFactory = $this->container->get('thelia.coupon.factory');
@@ -104,40 +105,40 @@ class Coupon extends BaseAction implements EventSubscriberInterface
         /** @var CouponInterface $coupon */
         $coupon = $couponFactory->buildCouponFromCode($event->getCode());
 
-        $isValid = $coupon->isMatching();
+        if ($coupon) {
+            $isValid = $coupon->isMatching();
+            if ($isValid) {
+                /** @var Request $request */
+                $request = $this->container->get('request');
+                $consumedCoupons = $request->getSession()->getConsumedCoupons();
 
-        if ($isValid) {
-            /** @var Request $request */
-            $request = $this->container->get('request');
-            $consumedCoupons = $request->getSession()->getConsumedCoupons();
+                if (!isset($consumedCoupons) || !$consumedCoupons) {
+                    $consumedCoupons = array();
+                }
 
-            if (!isset($consumedCoupons) || !$consumedCoupons) {
-                $consumedCoupons = array();
+                // Prevent accumulation of the same Coupon on a Checkout
+                $consumedCoupons[$event->getCode()] = $event->getCode();
+
+                $request->getSession()->setConsumedCoupons($consumedCoupons);
+
+                $totalDiscount = $couponManager->getDiscount();
+                // @todo insert false product in cart with the name of the coupon and the discount as negative price
+
+                // Decrement coupon quantity
+                // @todo move this part in after order event
+                $couponQuery = CouponQuery::create();
+                $couponModel = $couponQuery->findOneByCode($coupon->getCode());
+                $couponManager->decrementQuantity($couponModel);
+
+                $request
+                    ->getSession()
+                    ->getCart()
+                    ->setDiscount($totalDiscount)
+                    ->save();
             }
-
-            // Prevent accumulation of the same Coupon on a Checkout
-            $consumedCoupons[$event->getCode()] = $event->getCode();
-
-            $request->getSession()->setConsumedCoupons($consumedCoupons);
-
-            $totalDiscount = $couponManager->getDiscount();
-            // @todo insert false product in cart with the name of the coupon and the discount as negative price
-
-            // Decrement coupon quantity
-            // @todo move this part in after order event
-            $couponQuery = CouponQuery::create();
-            $couponModel = $couponQuery->findOneByCode($coupon->getCode());
-            $couponManager->decrementeQuantity($couponModel);
-
-            $request
-                ->getSession()
-                ->getCart()
-                ->setDiscount($totalDiscount)
-                ->save()
-            ;
-
         }
 
+
         $event->setIsValid($isValid);
         $event->setDiscount($totalDiscount);
     }
@@ -154,7 +155,7 @@ class Coupon extends BaseAction implements EventSubscriberInterface
         $coupon->setDispatcher($this->getDispatcher());
 
         // Set default condition if none found
-        /** @var ConditionManagerInterface $noConditionRule */
+        /** @var ConditionInterface $noConditionRule */
         $noConditionRule = $this->container->get('thelia.condition.match_for_everyone');
         /** @var ConditionFactory $conditionFactory */
         $conditionFactory = $this->container->get('thelia.condition.factory');

core/lib/Thelia/Condition/ConditionCollection.php

@@ -21,17 +21,17 @@
 /*                                                                                */
 /**********************************************************************************/
 
-namespace Thelia\Coupon;
+namespace Thelia\Condition;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Thelia\Condition\ConditionManagerInterface;
+use Thelia\Condition\Implementation\ConditionInterface;
 
 /**
  * Created by JetBrains PhpStorm.
  * Date: 8/19/13
  * Time: 3:24 PM
  *
- * Manage a set of ConditionManagerInterface
+ * Manage a set of ConditionInterface
  *
  * @package Condition
  * @author  Guillaume MOREL <gmorel@openstudio.fr>
@@ -39,13 +39,13 @@ use Thelia\Condition\ConditionManagerInterface;
  */
 class ConditionCollection
 {
-    /** @var array Array of ConditionManagerInterface */
+    /** @var array Array of ConditionInterface */
     protected $conditions = array();
 
     /**
      * Get Conditions
      *
-     * @return array Array of ConditionManagerInterface
+     * @return array Array of ConditionInterface
      */
     public function getConditions()
     {
@@ -53,13 +53,13 @@ class ConditionCollection
     }
 
     /**
-     * Add a ConditionManagerInterface to the Collection
+     * Add a ConditionInterface to the Collection
      *
-     * @param ConditionManagerInterface $condition Condition
+     * @param ConditionInterface $condition Condition
      *
      * @return $this
      */
-    public function add(ConditionManagerInterface $condition)
+    public function add(ConditionInterface $condition)
     {
         $this->conditions[] = $condition;
 
@@ -84,7 +84,7 @@ class ConditionCollection
     public function __toString()
     {
         $arrayToSerialize = array();
-        /** @var ConditionManagerInterface $condition */
+        /** @var ConditionInterface $condition */
         foreach ($this->getConditions() as $condition) {
             $arrayToSerialize[] = $condition->getSerializableCondition();
         }

core/lib/Thelia/Condition/ConditionEvaluator.php

@@ -24,8 +24,9 @@
 namespace Thelia\Condition;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Thelia\Condition\Implementation\ConditionInterface;
 use Thelia\Condition\Operators;
-use Thelia\Coupon\ConditionCollection;
+use Thelia\Condition\ConditionCollection;
 
 
 /**
@@ -51,7 +52,7 @@ class ConditionEvaluator
     public function isMatching(ConditionCollection $conditions)
     {
         $isMatching = true;
-        /** @var ConditionManagerInterface $condition */
+        /** @var ConditionInterface $condition */
         foreach ($conditions->getConditions() as $condition) {
             if (!$condition->isMatching()) {
                 $isMatching = false;

core/lib/Thelia/Condition/ConditionFactory.php

@@ -24,8 +24,9 @@
 namespace Thelia\Condition;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Thelia\Condition\Implementation\ConditionInterface;
 use Thelia\Coupon\FacadeInterface;
-use Thelia\Coupon\ConditionCollection;
+use Thelia\Condition\ConditionCollection;
 
 
 /**
@@ -58,7 +59,7 @@ class ConditionFactory
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
-        $this->adapter = $container->get('thelia.adapter');
+        $this->adapter = $container->get('thelia.facade');
     }
 
     /**
@@ -71,7 +72,7 @@ class ConditionFactory
     public function serializeConditionCollection(ConditionCollection $collection)
     {
         if ($collection->isEmpty()) {
-            /** @var ConditionManagerInterface $conditionNone */
+            /** @var ConditionInterface $conditionNone */
             $conditionNone = $this->container->get(
                 'thelia.condition.match_for_everyone'
             );
@@ -80,7 +81,7 @@ class ConditionFactory
         $serializableConditions = array();
         $conditions = $collection->getConditions();
         if ($conditions !== null) {
-            /** @var $condition ConditionManagerInterface */
+            /** @var $condition ConditionInterface */
             foreach ($conditions as $condition) {
                 $serializableConditions[] = $condition->getSerializableCondition();
             }
@@ -106,7 +107,7 @@ class ConditionFactory
             /** @var SerializableCondition $condition */
             foreach ($unserializedConditions as $condition) {
                 if ($this->container->has($condition->conditionServiceId)) {
-                    /** @var ConditionManagerInterface $conditionManager */
+                    /** @var ConditionInterface $conditionManager */
                     $conditionManager = $this->build(
                         $condition->conditionServiceId,
                         (array) $condition->operators,
@@ -129,7 +130,7 @@ class ConditionFactory
      * @param array  $values             Values setting this Condition
      *
      * @throws \InvalidArgumentException
-     * @return ConditionManagerInterface Ready to use Condition or false
+     * @return ConditionInterface Ready to use Condition or false
      */
     public function build($conditionServiceId, array $operators, array $values)
     {
@@ -137,7 +138,7 @@ class ConditionFactory
             return false;
         }
 
-        /** @var ConditionManagerInterface $condition */
+        /** @var ConditionInterface $condition */
         $condition = $this->container->get($conditionServiceId);
         $condition->setValidatorsFromForm($operators, $values);
 
@@ -157,7 +158,7 @@ class ConditionFactory
             return false;
         }
 
-        /** @var ConditionManagerInterface $condition */
+        /** @var ConditionInterface $condition */
         $condition = $this->container->get($conditionServiceId);
 
         return $condition->getValidators();

core/lib/Thelia/Condition/ConditionOrganizer.php

@@ -21,27 +21,27 @@
 /*                                                                                */
 /**********************************************************************************/
 
-namespace Thelia\Coupon;
+namespace Thelia\Condition;
 
 /**
  * Created by JetBrains PhpStorm.
  * Date: 8/19/13
  * Time: 3:24 PM
  *
- * Manage how Coupons could interact with a Checkout
+ * Manage how Condition could interact with each others
  *
  * @package Condition
  * @author  Guillaume MOREL <gmorel@openstudio.fr>
  *
  */
-class RuleOrganizer implements RuleOrganizerInterface
+class ConditionOrganizer implements ConditionOrganizerInterface
 {
     /**
-     * Organize ConditionManagerInterface
+     * Organize ConditionInterface
      *
-     * @param array $conditions Array of ConditionManagerInterface
+     * @param array $conditions Array of ConditionInterface
      *
-     * @return array Array of ConditionManagerInterface sorted
+     * @return array Array of ConditionInterface sorted
      */
     public function organize(array $conditions)
     {

core/lib/Thelia/Condition/ConditionOrganizerInterface.php

@@ -21,27 +21,27 @@
 /*                                                                                */
 /**********************************************************************************/
 
-namespace Thelia\Coupon;
+namespace Thelia\Condition;
 
 /**
  * Created by JetBrains PhpStorm.
  * Date: 8/19/13
  * Time: 3:24 PM
  *
- * Manage how Condition could interact with a Checkout
+ * Manage how Condition could interact with each other
  *
  * @package Condition
  * @author  Guillaume MOREL <gmorel@openstudio.fr>
  *
  */
-interface RuleOrganizerInterface
+interface ConditionOrganizerInterface
 {
     /**
-     * Organize ConditionManagerInterface
+     * Organize ConditionInterface
      *
-     * @param array $conditions Array of ConditionManagerInterface
+     * @param array $conditions Array of ConditionInterface
      *
-     * @return array Array of ConditionManagerInterface sorted
+     * @return array Array of ConditionInterface sorted
      */
     public function organize(array $conditions);
 }

core/lib/Thelia/Condition/Implementation/ConditionAbstract.php

@@ -21,9 +21,12 @@
 /*                                                                                */
 /**********************************************************************************/
 
-namespace Thelia\Condition;
+namespace Thelia\Condition\Implementation;
 
 use Symfony\Component\Intl\Exception\NotImplementedException;
+use Thelia\Condition\ConditionEvaluator;
+use Thelia\Condition\Operators;
+use Thelia\Condition\SerializableCondition;
 use Thelia\Core\Translation\Translator;
 use Thelia\Coupon\FacadeInterface;
 use Thelia\Exception\InvalidConditionValueException;
@@ -35,13 +38,13 @@ use Thelia\Type\FloatType;
  * Date: 8/19/13
  * Time: 3:24 PM
  *
- * Assist in writing a condition of whether the Rule is applied or not
+ * Assist in writing a condition of whether the Condition is applied or not
  *
  * @package Constraint
  * @author  Guillaume MOREL <gmorel@openstudio.fr>
  *
  */
-abstract class ConditionManagerAbstract implements ConditionManagerInterface
+abstract class ConditionAbstract implements ConditionInterface
 {
 
     /** @var string Service Id from Resources/config.xml  */
@@ -54,7 +57,7 @@ abstract class ConditionManagerAbstract implements ConditionManagerInterface
     protected $validators = array();
 
     /** @var  FacadeInterface Provide necessary value from Thelia */
-    protected $adapter = null;
+    protected $facade = null;
 
     /** @var Translator Service Translator */
     protected $translator = null;
@@ -71,13 +74,13 @@ abstract class ConditionManagerAbstract implements ConditionManagerInterface
     /**
      * Constructor
      *
-     * @param FacadeInterface $adapter Service adapter
+     * @param FacadeInterface $facade Service Facade
      */
-    public function __construct(FacadeInterface $adapter)
+    public function __construct(FacadeInterface $facade)
     {
-        $this->adapter = $adapter;
-        $this->translator = $adapter->getTranslator();
-        $this->conditionValidator = $adapter->getConditionEvaluator();
+        $this->facade = $facade;
+        $this->translator = $facade->getTranslator();
+        $this->conditionValidator = $facade->getConditionEvaluator();
     }
 
     /**
@@ -181,9 +184,9 @@ abstract class ConditionManagerAbstract implements ConditionManagerInterface
      * @return bool
      * @throws \Thelia\Exception\InvalidConditionValueException
      */
-    protected function IsCurrencyValid($currencyValue)
+    protected function isCurrencyValid($currencyValue)
     {
-        $availableCurrencies = $this->adapter->getAvailableCurrencies();
+        $availableCurrencies = $this->facade->getAvailableCurrencies();
         /** @var Currency $currency */
         $currencyFound = false;
         foreach ($availableCurrencies as $currency) {

core/lib/Thelia/Condition/Implementation/ConditionInterface.php

@@ -21,8 +21,9 @@
 /*                                                                                */
 /**********************************************************************************/
 
-namespace Thelia\Condition;
+namespace Thelia\Condition\Implementation;
 
+use Thelia\Condition\SerializableCondition;
 use Thelia\Core\Translation\Translator;
 use Thelia\Coupon\FacadeInterface;
 
@@ -37,7 +38,7 @@ use Thelia\Coupon\FacadeInterface;
  * @author  Guillaume MOREL <gmorel@openstudio.fr>
  *
  */
-interface ConditionManagerInterface
+interface ConditionInterface
 {
     /**
      * Constructor
@@ -47,7 +48,7 @@ interface ConditionManagerInterface
     function __construct(FacadeInterface $adapter);
 
     /**
-     * Get Rule Service id
+     * Get Condition Service id
      *
      * @return string
      */

core/lib/Thelia/Condition/Implementation/MatchForEveryone.php

@@ -24,7 +24,7 @@
 namespace Thelia\Condition\Implementation;
 
 use InvalidArgumentException;
-use Thelia\Condition\ConditionManagerAbstract;
+use Thelia\Condition\Implementation\ConditionAbstract;
 
 /**
  * Created by JetBrains PhpStorm.
@@ -37,7 +37,7 @@ use Thelia\Condition\ConditionManagerAbstract;
  * @author  Guillaume MOREL <gmorel@openstudio.fr>
  *
  */
-class MatchForEveryoneManager extends ConditionManagerAbstract
+class MatchForEveryone extends ConditionAbstract
 {
     /** @var string Service Id from Resources/config.xml  */
     protected $serviceId = 'thelia.condition.match_for_everyone';

core/lib/Thelia/Condition/Implementation/MatchForTotalAmount.php

@@ -24,7 +24,7 @@
 namespace Thelia\Condition\Implementation;
 
 use Symfony\Component\Intl\Exception\NotImplementedException;
-use Thelia\Condition\ConditionManagerAbstract;
+use Thelia\Condition\Implementation\ConditionAbstract;
 use Thelia\Condition\Operators;
 use Thelia\Exception\InvalidConditionOperatorException;
 use Thelia\Model\Currency;
@@ -42,7 +42,7 @@ use Thelia\Model\CurrencyQuery;
  * @author  Guillaume MOREL <gmorel@openstudio.fr>
  *
  */
-class MatchForTotalAmountManager extends ConditionManagerAbstract
+class MatchForTotalAmount extends ConditionAbstract
 {
     /** Condition 1st parameter : price */
     CONST INPUT1 = 'price';
@@ -124,7 +124,7 @@ class MatchForTotalAmountManager extends ConditionManagerAbstract
         $this->isPriceValid($priceValue);
 
 
-        $this->IsCurrencyValid($currencyValue);
+        $this->isCurrencyValid($currencyValue);
 
 
         $this->operators = array(
@@ -146,26 +146,13 @@ class MatchForTotalAmountManager extends ConditionManagerAbstract
      */
     public function isMatching()
     {
-        $isOperator1Legit = $this->isOperatorLegit(
-            $this->operators[self::INPUT1],
-            $this->availableOperators[self::INPUT1]
-        );
-        $isOperator2Legit = $this->isOperatorLegit(
-            $this->operators[self::INPUT2],
-            $this->availableOperators[self::INPUT2]
-        );
-
-        if (!$isOperator1Legit || !$isOperator2Legit) {
-            return false;
-        }
-
         $condition1 = $this->conditionValidator->variableOpComparison(
-            $this->adapter->getCartTotalPrice(),
+            $this->facade->getCartTotalPrice(),
             $this->operators[self::INPUT1],
             $this->values[self::INPUT1]
         );
         $condition2 = $this->conditionValidator->variableOpComparison(
-            $this->adapter->getCheckoutCurrency(),
+            $this->facade->getCheckoutCurrency(),
             $this->operators[self::INPUT2],
             $this->values[self::INPUT2]
         );

core/lib/Thelia/Condition/Implementation/MatchForXArticles.php

@@ -24,7 +24,7 @@
 namespace Thelia\Condition\Implementation;
 
 use InvalidArgumentException;
-use Thelia\Condition\ConditionManagerAbstract;
+use Thelia\Condition\Implementation\ConditionAbstract;
 use Thelia\Condition\Operators;
 use Thelia\Exception\InvalidConditionOperatorException;
 use Thelia\Exception\InvalidConditionValueException;
@@ -40,7 +40,7 @@ use Thelia\Exception\InvalidConditionValueException;
  * @author  Guillaume MOREL <gmorel@openstudio.fr>
  *
  */
-class MatchForXArticlesManager extends ConditionManagerAbstract
+class MatchForXArticles extends ConditionAbstract
 {
     /** Condition 1st parameter : quantity */
     CONST INPUT1 = 'quantity';
@@ -124,7 +124,7 @@ class MatchForXArticlesManager extends ConditionManagerAbstract
     public function isMatching()
     {
         $condition1 = $this->conditionValidator->variableOpComparison(
-            $this->adapter->getNbArticlesInCart(),
+            $this->facade->getNbArticlesInCart(),
             $this->operators[self::INPUT1],
             $this->values[self::INPUT1]
         );

core/lib/Thelia/Condition/SerializableCondition.php

@@ -28,7 +28,7 @@ namespace Thelia\Condition;
  * Date: 8/19/13
  * Time: 3:24 PM
  *
- * A condition set by an admin ready to be serialized and stored in DataBase
+ * A condition ready to be serialized and stored in DataBase
  *
  * @package Condition
  * @author  Guillaume MOREL <gmorel@openstudio.fr>

core/lib/Thelia/Config/Resources/coupon.xml

@@ -9,7 +9,7 @@
 
 
         <!-- Coupon module -->
-        <service id="thelia.adapter" class="Thelia\Coupon\BaseFacade">
+        <service id="thelia.facade" class="Thelia\Coupon\BaseFacade">
             <argument type="service" id="service_container" />
         </service>
         <service id="thelia.coupon.manager" class="Thelia\Coupon\CouponManager">
@@ -19,12 +19,12 @@
             <argument type="service" id="service_container" />
         </service>
 
-        <service id="thelia.coupon.type.remove_x_amount" class="Thelia\Coupon\Type\RemoveXAmountManager">
-            <argument type="service" id="thelia.adapter" />
+        <service id="thelia.coupon.type.remove_x_amount" class="Thelia\Coupon\Type\RemoveXAmount">
+            <argument type="service" id="thelia.facade" />
             <tag name="thelia.coupon.addCoupon"/>
         </service>
-        <service id="thelia.coupon.type.remove_x_percent" class="Thelia\Coupon\Type\RemoveXPercentManager">
-            <argument type="service" id="thelia.adapter" />
+        <service id="thelia.coupon.type.remove_x_percent" class="Thelia\Coupon\Type\RemoveXPercent">
+            <argument type="service" id="thelia.facade" />
             <tag name="thelia.coupon.addCoupon"/>
         </service>
 
@@ -35,21 +35,22 @@
         </service>
         <service id="thelia.condition.validator" class="Thelia\Condition\ConditionEvaluator">
         </service>
-        <service id="thelia.condition.match_for_everyone" class="Thelia\Condition\Implementation\MatchForEveryoneManager">
-            <argument type="service" id="thelia.adapter" />
+        <service id="thelia.condition.match_for_everyone" class="Thelia\Condition\Implementation\MatchForEveryone">
+            <argument type="service" id="thelia.facade" />
             <tag name="thelia.coupon.addCondition"/>
         </service>
-        <service id="thelia.condition.match_for_x_articles" class="Thelia\Condition\Implementation\MatchForXArticlesManager">
-            <argument type="service" id="thelia.adapter" />
+        <service id="thelia.condition.match_for_total_amount" class="Thelia\Condition\Implementation\MatchForTotalAmount">
+            <argument type="service" id="thelia.facade" />
             <tag name="thelia.coupon.addCondition"/>
         </service>
-        <service id="thelia.condition.match_for_total_amount" class="Thelia\Condition\Implementation\MatchForTotalAmountManager">
-            <argument type="service" id="thelia.adapter" />
+        <service id="thelia.condition.match_for_x_articles" class="Thelia\Condition\Implementation\MatchForXArticles">
+            <argument type="service" id="thelia.facade" />
             <tag name="thelia.coupon.addCondition"/>
         </service>
 
 
 
+
     </services>
 
 </config>

core/lib/Thelia/Controller/Admin/CouponController.php

@@ -26,13 +26,13 @@ namespace Thelia\Controller\Admin;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Router;
 use Thelia\Condition\ConditionFactory;
-use Thelia\Condition\ConditionManagerInterface;
+use Thelia\Condition\Implementation\ConditionInterface;
 use Thelia\Core\Security\Resource\AdminResources;
 use Thelia\Core\Event\Coupon\CouponCreateOrUpdateEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Core\Security\AccessManager;
 use Thelia\Coupon\CouponManager;
-use Thelia\Coupon\ConditionCollection;
+use Thelia\Condition\ConditionCollection;
 use Thelia\Coupon\Type\CouponInterface;
 use Thelia\Form\CouponCreationForm;
 use Thelia\Form\Exception\FormValidationException;
@@ -227,7 +227,7 @@ class CouponController extends BaseAdminController
 
             $args['conditionsObject'] = array();
 
-            /** @var ConditionManagerInterface $condition */
+            /** @var ConditionInterface $condition */
             foreach ($conditions->getConditions() as $condition) {
                 $args['conditionsObject'][] = array(
                     'serviceId' => $condition->getServiceId(),
@@ -519,7 +519,7 @@ class CouponController extends BaseAdminController
         $couponManager = $this->container->get('thelia.coupon.manager');
         $availableConditions = $couponManager->getAvailableConditions();
         $cleanedConditions = array();
-        /** @var ConditionManagerInterface $availableCondition */
+        /** @var ConditionInterface $availableCondition */
         foreach ($availableConditions as $availableCondition) {
             $condition = array();
             $condition['serviceId'] = $availableCondition->getServiceId();
@@ -564,7 +564,7 @@ class CouponController extends BaseAdminController
     protected function cleanConditionForTemplate(ConditionCollection $conditions)
     {
         $cleanedConditions = array();
-        /** @var $condition ConditionManagerInterface */
+        /** @var $condition ConditionInterface */
         foreach ($conditions->getConditions() as $condition) {
             $cleanedConditions[] = $condition->getToolTip();
         }

core/lib/Thelia/Core/Event/Coupon/CouponCreateOrUpdateEvent.php

@@ -23,7 +23,7 @@
 
 namespace Thelia\Core\Event\Coupon;
 use Thelia\Core\Event\ActionEvent;
-use Thelia\Coupon\ConditionCollection;
+use Thelia\Condition\ConditionCollection;
 use Thelia\Model\Coupon;
 
 /**
@@ -39,7 +39,7 @@ use Thelia\Model\Coupon;
  */
 class CouponCreateOrUpdateEvent extends ActionEvent
 {
-    /** @var ConditionCollection Array of ConditionManagerInterface */
+    /** @var ConditionCollection Array of ConditionInterface */
     protected $conditions = null;
 
     /** @var string Coupon code (ex: XMAS) */
@@ -280,7 +280,7 @@ class CouponCreateOrUpdateEvent extends ActionEvent
     /**
      * Get Conditions
      *
-     * @return null|ConditionCollection Array of ConditionManagerInterface
+     * @return null|ConditionCollection Array of ConditionInterface
      */
     public function getConditions()
     {
@@ -290,7 +290,7 @@ class CouponCreateOrUpdateEvent extends ActionEvent
     /**
      * Set Conditions
      *
-     * @param ConditionCollection $conditions Array of ConditionManagerInterface
+     * @param ConditionCollection $conditions Array of ConditionInterface
      *
      * @return $this
      */

core/lib/Thelia/Core/Template/Loop/Coupon.php

@@ -26,7 +26,7 @@ namespace Thelia\Core\Template\Loop;
 use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\Util\PropelModelPager;
 use Thelia\Condition\ConditionFactory;
-use Thelia\Condition\ConditionManagerInterface;
+use Thelia\Condition\Implementation\ConditionInterface;
 use Thelia\Core\HttpFoundation\Request;
 use Thelia\Core\Template\Element\BaseI18nLoop;
 use Thelia\Core\Template\Element\LoopResult;
@@ -106,7 +106,7 @@ class Coupon extends BaseI18nLoop implements PropelSearchLoopInterface
             /** @var CouponInterface $couponManager */
             $couponManager = $this->container->get($coupon->getType());
             $couponManager->set(
-                $this->container->get('thelia.adapter'),
+                $this->container->get('thelia.facade'),
                 $coupon->getCode(),
                 $coupon->getTitle(),
                 $coupon->getShortDescription(),
@@ -125,7 +125,7 @@ class Coupon extends BaseI18nLoop implements PropelSearchLoopInterface
             $daysLeftBeforeExpiration = floor($datediff/(60*60*24));
 
             $cleanedConditions = array();
-            /** @var ConditionManagerInterface $condition */
+            /** @var ConditionInterface $condition */
             foreach ($conditions->getConditions() as $condition) {
                 $cleanedConditions[] = $condition->getToolTip();
             }

core/lib/Thelia/Coupon/CouponFactory.php

@@ -24,7 +24,6 @@
 namespace Thelia\Coupon;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
 use Thelia\Condition\ConditionFactory;
 use Thelia\Coupon\Type\CouponInterface;
 use Thelia\Exception\CouponExpiredException;
@@ -48,7 +47,7 @@ class CouponFactory
     protected $container = null;
 
     /** @var  FacadeInterface Provide necessary value from Thelia*/
-    protected $adapter;
+    protected $facade;
 
     /**
      * Constructor
@@ -58,7 +57,7 @@ class CouponFactory
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
-        $this->adapter = $container->get('thelia.adapter');
+        $this->facade = $container->get('thelia.facade');
     }
 
     /**
@@ -68,17 +67,14 @@ class CouponFactory
      *
      * @throws \Thelia\Exception\CouponExpiredException
      * @throws \Thelia\Exception\InvalidConditionException
-     * @throws \Symfony\Component\Translation\Exception\NotFoundResourceException
      * @return CouponInterface ready to be processed
      */
     public function buildCouponFromCode($couponCode)
     {
         /** @var Coupon $couponModel */
-        $couponModel = $this->adapter->findOneCouponByCode($couponCode);
+        $couponModel = $this->facade->findOneCouponByCode($couponCode);
         if ($couponModel === null) {
-            throw new NotFoundResourceException(
-                'Coupon ' . $couponCode . ' not found in Database'
-            );
+           return false;
         }
 
         if ($couponModel->getExpirationDate() < new \DateTime()) {
@@ -86,8 +82,8 @@ class CouponFactory
         }
 
         /** @var CouponInterface $couponInterface */
-        $couponInterface = $this->buildCouponInterfaceFromModel($couponModel);
-        if ($couponInterface->getConditions()->isEmpty()) {
+        $couponInterface = $this->buildCouponFromModel($couponModel);
+        if ($couponInterface && $couponInterface->getConditions()->isEmpty()) {
             throw new InvalidConditionException(
                 get_class($couponInterface)
             );
@@ -103,7 +99,7 @@ class CouponFactory
      *
      * @return CouponInterface ready to use CouponInterface object instance
      */
-    protected function buildCouponInterfaceFromModel(Coupon $model)
+    public function buildCouponFromModel(Coupon $model)
     {
         $isCumulative = ($model->getIsCumulative() == 1 ? true : false);
         $isRemovingPostage = ($model->getIsRemovingPostage() == 1 ? true : false);
@@ -115,7 +111,7 @@ class CouponFactory
         /** @var CouponInterface $couponManager*/
         $couponManager = $this->container->get($model->getType());
         $couponManager->set(
-            $this->adapter,
+            $this->facade,
             $model->getCode(),
             $model->getTitle(),
             $model->getShortDescription(),

core/lib/Thelia/Coupon/CouponManager.php

@@ -24,7 +24,7 @@
 namespace Thelia\Coupon;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Thelia\Condition\ConditionManagerInterface;
+use Thelia\Condition\Implementation\ConditionInterface;
 use Thelia\Coupon\Type\CouponInterface;
 use Thelia\Model\Coupon;
 
@@ -42,7 +42,7 @@ use Thelia\Model\Coupon;
 class CouponManager
 {
     /** @var FacadeInterface Provides necessary value from Thelia */
-    protected $adapter = null;
+    protected $facade = null;
 
     /** @var ContainerInterface Service Container */
     protected $container = null;
@@ -64,8 +64,8 @@ class CouponManager
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
-        $this->adapter = $container->get('thelia.adapter');
-        $this->coupons = $this->adapter->getCurrentCoupons();
+        $this->facade = $container->get('thelia.facade');
+        $this->coupons = $this->facade->getCurrentCoupons();
     }
 
 
@@ -87,12 +87,12 @@ class CouponManager
             $discount = $this->getEffect($couponsKept);
 
             if ($isRemovingPostage) {
-                $postage = $this->adapter->getCheckoutPostagePrice();
+                $postage = $this->facade->getCheckoutPostagePrice();
                 $discount += $postage;
             }
 
             // Just In Case test
-            $checkoutTotalPrice = $this->adapter->getCartTotalPrice();
+            $checkoutTotalPrice = $this->facade->getCartTotalPrice();
             if ($discount >= $checkoutTotalPrice) {
                 $discount = $checkoutTotalPrice;
             }
@@ -164,7 +164,7 @@ class CouponManager
 
         /** @var CouponInterface $coupon */
         foreach ($coupons as $coupon) {
-            if ($coupon->isMatching($this->adapter)) {
+            if ($coupon->isMatching($this->facade)) {
                 $couponsKept[] = $coupon;
             }
         }
@@ -184,7 +184,7 @@ class CouponManager
         $discount = 0.00;
         /** @var CouponInterface $coupon */
         foreach ($coupons as $coupon) {
-            $discount += $coupon->exec($this->adapter);
+            $discount += $coupon->exec($this->facade);
         }
 
         return $discount;
@@ -213,9 +213,9 @@ class CouponManager
     /**
      * Add an available ConstraintManager (Services)
      *
-     * @param ConditionManagerInterface $condition ConditionManagerInterface
+     * @param ConditionInterface $condition ConditionInterface
      */
-    public function addAvailableCondition(ConditionManagerInterface $condition)
+    public function addAvailableCondition(ConditionInterface $condition)
     {
         $this->availableConditions[] = $condition;
     }
@@ -237,20 +237,21 @@ class CouponManager
      *
      * @param \Thelia\Model\Coupon $coupon Coupon consumed
      *
-     * @return bool
+     * @return int Usage left after decremental
      */
-    public function decrementeQuantity(Coupon $coupon)
+    public function decrementQuantity(Coupon $coupon)
     {
-        $ret = true;
+        $ret = -1;
         try {
 
-        $oldMaxUsage = $coupon->getMaxUsage();
+        $usageLeft = $coupon->getMaxUsage();
 
-        if ($oldMaxUsage > 0) {
-            $oldMaxUsage--;
-            $coupon->setMaxUsage($$oldMaxUsage);
+        if ($usageLeft > 0) {
+            $usageLeft--;
+            $coupon->setMaxUsage($usageLeft);
 
             $coupon->save();
+            $ret = $usageLeft;
         }
 
         } catch(\Exception $e) {

core/lib/Thelia/Coupon/Type/CouponAbstract.php

@@ -27,8 +27,8 @@ use Symfony\Component\Intl\Exception\NotImplementedException;
 use Thelia\Condition\ConditionEvaluator;
 use Thelia\Core\Translation\Translator;
 use Thelia\Coupon\FacadeInterface;
-use Thelia\Coupon\ConditionCollection;
-use Thelia\Coupon\RuleOrganizerInterface;
+use Thelia\Condition\ConditionCollection;
+use Thelia\Condition\ConditionOrganizerInterface;
 use Thelia\Exception\InvalidConditionException;
 
 /**
@@ -45,15 +45,15 @@ use Thelia\Exception\InvalidConditionException;
 abstract class CouponAbstract implements CouponInterface
 {
     /** @var  FacadeInterface Provide necessary value from Thelia */
-    protected $adapter = null;
+    protected $facade = null;
 
     /** @var Translator Service Translator */
     protected $translator = null;
 
-    /** @var RuleOrganizerInterface  */
+    /** @var ConditionOrganizerInterface  */
     protected $organizer = null;
 
-    /** @var ConditionCollection Array of ConditionManagerInterface */
+    /** @var ConditionCollection Array of ConditionInterface */
     protected $conditions = null;
 
     /** @var ConditionEvaluator Condition validator */
@@ -104,19 +104,19 @@ abstract class CouponAbstract implements CouponInterface
     /**
      * Constructor
      *
-     * @param FacadeInterface $adapter Service adapter
+     * @param FacadeInterface $facade Service facade
      */
-    public function __construct(FacadeInterface $adapter)
+    public function __construct(FacadeInterface $facade)
     {
-        $this->adapter = $adapter;
-        $this->translator = $adapter->getTranslator();
-        $this->conditionEvaluator = $adapter->getConditionEvaluator();
+        $this->facade = $facade;
+        $this->translator = $facade->getTranslator();
+        $this->conditionEvaluator = $facade->getConditionEvaluator();
     }
 
     /**
      * Set Condition Organizer
      *
-     * @param RuleOrganizerInterface $organizer Manage Condition groups (&& and ||)
+     * @param ConditionOrganizerInterface $organizer Manage Condition groups (&& and ||)
      *
      * @return $this
      */
@@ -214,7 +214,7 @@ abstract class CouponAbstract implements CouponInterface
      * Replace the existing Conditions by those given in parameter
      * If one Condition is badly implemented, no Condition will be added
      *
-     * @param ConditionCollection $conditions ConditionManagerInterface to add
+     * @param ConditionCollection $conditions ConditionInterface to add
      *
      * @return $this
      * @throws \Thelia\Exception\InvalidConditionException

core/lib/Thelia/Coupon/Type/CouponInterface.php

@@ -23,7 +23,8 @@
 
 namespace Thelia\Coupon\Type;
 
-use Thelia\Coupon\ConditionCollection;
+use Thelia\Condition\ConditionCollection;
+use Thelia\Coupon\FacadeInterface;
 
 /**
  * Created by JetBrains PhpStorm.
@@ -62,7 +63,7 @@ interface CouponInterface
     /**
      * Set Coupon
      *
-     * @param CouponInterface $adapter                    Provides necessary value from Thelia
+     * @param FacadeInterface $facade                     Provides necessary value from Thelia
      * @param string          $code                       Coupon code (ex: XMAS)
      * @param string          $title                      Coupon title (ex: Coupon for XMAS)
      * @param string          $shortDescription           Coupon short description
@@ -77,7 +78,7 @@ interface CouponInterface
      * @param \Datetime       $expirationDate             When the Code is expiring
      */
     public function set(
-        $adapter,
+        FacadeInterface $facade,
         $code,
         $title,
         $shortDescription,
@@ -139,20 +140,20 @@ interface CouponInterface
     /**
      * Return condition to validate the Coupon or not
      *
-     * @return ConditionCollection A set of ConditionManagerInterface
+     * @return ConditionCollection A set of ConditionInterface
      */
     public function getConditions();
 
     /**
-     * Replace the existing Rules by those given in parameter
-     * If one Rule is badly implemented, no Rule will be added
+     * Replace the existing Conditions by those given in parameter
+     * If one Condition is badly implemented, no Condition will be added
      *
-     * @param ConditionCollection $rules ConditionManagerInterface to add
+     * @param ConditionCollection $conditions ConditionInterface to add
      *
      * @return $this
      * @throws \Thelia\Exception\InvalidConditionException
      */
-    public function setConditions(ConditionCollection $rules);
+    public function setConditions(ConditionCollection $conditions);
 
     /**
      * Return Coupon expiration date
@@ -198,7 +199,7 @@ interface CouponInterface
      * A positive value
      *
      * Effects could also affect something else than the final Checkout price
-     * CouponAdapter $adapter could be use to directly pass a Session value
+     * FacadeInterface $facade could be used to directly pass a Session value
      * some would wish to modify
      * Hence affecting a wide variety of Thelia elements
      *
@@ -207,7 +208,7 @@ interface CouponInterface
     public function exec();
 
     /**
-     * Check if the current Coupon is matching its conditions (Rules)
+     * Check if the current Coupon is matching its conditions
      * Thelia variables are given by the FacadeInterface
      *
      * @return bool

core/lib/Thelia/Coupon/Type/RemoveXAmount.php

@@ -23,6 +23,7 @@
 
 namespace Thelia\Coupon\Type;
 
+use Thelia\Coupon\FacadeInterface;
 use Thelia\Coupon\Type\CouponAbstract;
 
 /**
@@ -36,7 +37,7 @@ use Thelia\Coupon\Type\CouponAbstract;
  * @author  Guillaume MOREL <gmorel@openstudio.fr>
  *
  */
-class RemoveXAmountManager extends CouponAbstract
+class RemoveXAmount extends CouponAbstract
 {
     /** @var string Service Id  */
     protected $serviceId = 'thelia.coupon.type.remove_x_amount';
@@ -44,7 +45,7 @@ class RemoveXAmountManager extends CouponAbstract
     /**
      * Set Coupon
      *
-     * @param CouponInterface $adapter                    Provides necessary value from Thelia
+     * @param FacadeInterface $facade                     Provides necessary value from Thelia
      * @param string          $code                       Coupon code (ex: XMAS)
      * @param string          $title                      Coupon title (ex: Coupon for XMAS)
      * @param string          $shortDescription           Coupon short description
@@ -59,7 +60,7 @@ class RemoveXAmountManager extends CouponAbstract
      * @param \Datetime       $expirationDate             When the Code is expiring
      */
     public function set(
-        $adapter,
+        FacadeInterface $facade,
         $code,
         $title,
         $shortDescription,
@@ -87,7 +88,7 @@ class RemoveXAmountManager extends CouponAbstract
         $this->isEnabled = $isEnabled;
         $this->maxUsage = $maxUsage;
         $this->expirationDate = $expirationDate;
-        $this->adapter = $adapter;
+        $this->facade = $facade;
     }
 
     /**
@@ -97,7 +98,7 @@ class RemoveXAmountManager extends CouponAbstract
      */
     public function getName()
     {
-        return $this->adapter
+        return $this->facade
             ->getTranslator()
             ->trans('Remove X amount to total cart', array(), 'constraint');
     }
@@ -109,7 +110,7 @@ class RemoveXAmountManager extends CouponAbstract
      */
     public function getToolTip()
     {
-        $toolTip = $this->adapter
+        $toolTip = $this->facade
             ->getTranslator()
             ->trans(
                 'This coupon will remove the entered amount to the customer total checkout. If the discount is superior to the total checkout price the customer will only pay the postage. Unless if the coupon is set to remove postage too.',

core/lib/Thelia/Coupon/Type/RemoveXPercent.php

@@ -23,8 +23,9 @@
 
 namespace Thelia\Coupon\Type;
 
+use Thelia\Coupon\FacadeInterface;
 use Thelia\Coupon\Type\CouponAbstract;
-use Thelia\Exception\MissingAdapterException;
+use Thelia\Exception\MissingFacadeException;
 
 /**
  * Created by JetBrains PhpStorm.
@@ -35,7 +36,7 @@ use Thelia\Exception\MissingAdapterException;
  * @author  Guillaume MOREL <gmorel@openstudio.fr>
  *
  */
-class RemoveXPercentManager extends CouponAbstract
+class RemoveXPercent extends CouponAbstract
 {
     /** @var string Service Id  */
     protected $serviceId = 'thelia.coupon.type.remove_x_percent';
@@ -45,7 +46,7 @@ class RemoveXPercentManager extends CouponAbstract
     /**
      * Set Coupon
      *
-     * @param CouponInterface $adapter                    Provides necessary value from Thelia
+     * @param FacadeInterface $facade                     Provides necessary value from Thelia
      * @param string          $code                       Coupon code (ex: XMAS)
      * @param string          $title                      Coupon title (ex: Coupon for XMAS)
      * @param string          $shortDescription           Coupon short description
@@ -60,7 +61,7 @@ class RemoveXPercentManager extends CouponAbstract
      * @param \Datetime       $expirationDate             When the Code is expiring
      */
     public function set(
-        $adapter,
+        FacadeInterface $facade,
         $code,
         $title,
         $shortDescription,
@@ -87,14 +88,14 @@ class RemoveXPercentManager extends CouponAbstract
         $this->isEnabled = $isEnabled;
         $this->maxUsage = $maxUsage;
         $this->expirationDate = $expirationDate;
-        $this->adapter = $adapter;
+        $this->facade = $facade;
     }
 
     /**
      * Return effects generated by the coupon
      * A negative value
      *
-     * @throws \Thelia\Exception\MissingAdapterException
+     * @throws \Thelia\Exception\MissingFacadeException
      * @throws \InvalidArgumentException
      * @return float
      */
@@ -106,7 +107,7 @@ class RemoveXPercentManager extends CouponAbstract
             );
         }
 
-        $basePrice = $this->adapter->getCartTotalPrice();
+        $basePrice = $this->facade->getCartTotalPrice();
 
         return $basePrice * (( $this->percent ) / 100);
     }
@@ -119,7 +120,7 @@ class RemoveXPercentManager extends CouponAbstract
      */
     public function getName()
     {
-        return $this->adapter
+        return $this->facade
             ->getTranslator()
             ->trans('Remove X percent to total cart', array(), 'constraint');
     }
@@ -131,7 +132,7 @@ class RemoveXPercentManager extends CouponAbstract
      */
     public function getToolTip()
     {
-        $toolTip = $this->adapter
+        $toolTip = $this->facade
             ->getTranslator()
             ->trans(
                 'This coupon will remove the entered percentage to the customer total checkout. If the discount is superior to the total checkout price the customer will only pay the postage. Unless if the coupon is set to remove postage too.',

core/lib/Thelia/Exception/MissingFacadeException.php

@@ -30,13 +30,13 @@ use Thelia\Log\Tlog;
  * Date: 8/19/13
  * Time: 3:24 PM
  *
- * Thrown when the Adapter is not set
+ * Thrown when the Facade is not set
  *
  * @package Coupon
  * @author  Guillaume MOREL <gmorel@openstudio.fr>
  *
  */
-class MissingAdapterException extends \RuntimeException
+class MissingFacadeException extends \RuntimeException
 {
     /**
      * {@inheritdoc}

core/lib/Thelia/Tests/Condition/ConditionCollectionTest.php

@@ -0,0 +1,186 @@
+<?php
+/**********************************************************************************/
+/*                                                                                */
+/*      Thelia	                                                                  */
+/*                                                                                */
+/*      Copyright (c) OpenStudio                                                  */
+/*      email : info@thelia.net                                                   */
+/*      web : http://www.thelia.net                                               */
+/*                                                                                */
+/*      This program is free software; you can redistribute it and/or modify      */
+/*      it under the terms of the GNU General Public License as published by      */
+/*      the Free Software Foundation; either version 3 of the License             */
+/*                                                                                */
+/*      This program is distributed in the hope that it will be useful,           */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of            */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             */
+/*      GNU General Public License for more details.                              */
+/*                                                                                */
+/*      You should have received a copy of the GNU General Public License         */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.      */
+/*                                                                                */
+/**********************************************************************************/
+
+namespace Thelia\Condition;
+use Thelia\Condition\Implementation\MatchForTotalAmount;
+use Thelia\Model\CurrencyQuery;
+
+/**
+ * Created by JetBrains PhpStorm.
+ * Date: 8/19/13
+ * Time: 3:24 PM
+ *
+ * Unit Test ConditionCollection Class
+ * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-11-17 at 18:59:24.
+ *
+ * @package Condition
+ * @author  Guillaume MOREL <gmorel@openstudio.fr>
+ *
+ */
+class ConditionCollectionTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ConditionCollection
+     */
+    protected $object;
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+    }
+
+
+    /**
+     * Generate adapter stub
+     *
+     * @param int    $cartTotalPrice   Cart total price
+     * @param string $checkoutCurrency Checkout currency
+     * @param string $i18nOutput       Output from each translation
+     *
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    public function generateFacadeStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR', $i18nOutput = '')
+    {
+        $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $currencies = CurrencyQuery::create();
+        $currencies = $currencies->find();
+        $stubFacade->expects($this->any())
+            ->method('getAvailableCurrencies')
+            ->will($this->returnValue($currencies));
+
+        $stubFacade->expects($this->any())
+            ->method('getCartTotalPrice')
+            ->will($this->returnValue($cartTotalPrice));
+
+        $stubFacade->expects($this->any())
+            ->method('getCheckoutCurrency')
+            ->will($this->returnValue($checkoutCurrency));
+
+        $stubFacade->expects($this->any())
+            ->method('getConditionEvaluator')
+            ->will($this->returnValue(new ConditionEvaluator()));
+
+        $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubTranslator->expects($this->any())
+            ->method('trans')
+            ->will($this->returnValue($i18nOutput));
+
+        $stubFacade->expects($this->any())
+            ->method('getTranslator')
+            ->will($this->returnValue($stubTranslator));
+
+        return $stubFacade;
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
+
+    /**
+     * @covers Thelia\Condition\ConditionCollection::getConditions
+     * @covers Thelia\Condition\ConditionCollection::add
+     */
+    public function testGetConditions()
+    {
+        $stubFacade = $this->generateFacadeStub();
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::EQUAL,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $collection = new ConditionCollection();
+        $collection->add($condition1);
+
+        $expected = $condition1;
+        $actual = $collection->getConditions()[0];
+
+        $this->assertEquals($expected, $actual);
+
+        $this->assertFalse($collection->isEmpty());
+    }
+
+    /**
+     * @covers Thelia\Condition\ConditionCollection::isEmpty
+     */
+    public function testIsEmpty()
+    {
+        $collection = new ConditionCollection();
+        $this->assertTrue($collection->isEmpty());
+    }
+
+    /**
+     * @covers Thelia\Condition\ConditionCollection::__toString
+     */
+    public function test__toString()
+    {
+        $stubFacade = $this->generateFacadeStub();
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators1 = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values1 = array(
+            MatchForTotalAmount::INPUT1 => 400,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators1, $values1);
+
+        $condition2 = new MatchForTotalAmount($stubFacade);
+        $operators2 = array(
+            MatchForTotalAmount::INPUT1 => Operators::INFERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values2 = array(
+            MatchForTotalAmount::INPUT1 => 600,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition2->setValidatorsFromForm($operators2, $values2);
+
+        $collection = new ConditionCollection();
+        $collection->add($condition1);
+        $collection->add($condition2);
+
+        $expected = '[{"conditionServiceId":"thelia.condition.match_for_total_amount","operators":{"price":">","currency":"=="},"values":{"price":400,"currency":"EUR"}},{"conditionServiceId":"thelia.condition.match_for_total_amount","operators":{"price":"<","currency":"=="},"values":{"price":600,"currency":"EUR"}}]';
+        $actual = $collection->__toString();;
+
+        $this->assertEquals($expected, $actual);
+
+    }
+}

core/lib/Thelia/Tests/Condition/ConditionEvaluatorTest.php

@@ -25,9 +25,7 @@ namespace Thelia\Condition\Implementation;
 
 use Thelia\Condition\ConditionEvaluator;
 use Thelia\Condition\Operators;
-use Thelia\Coupon\FacadeInterface;
-use Thelia\Coupon\ConditionCollection;
-use Thelia\Model\CurrencyQuery;
+use Thelia\Condition\ConditionCollection;
 
 /**
  * Created by JetBrains PhpStorm.
@@ -51,328 +49,11 @@ class ConditionEvaluatorTest extends \PHPUnit_Framework_TestCase
     {
     }
 
-    public function testTestSuccess1Rules()
-    {
-        $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $stubFacade->expects($this->any())
-            ->method('getTranslator')
-            ->will($this->returnValue($stubTranslator));
-        $stubFacade->expects($this->any())
-            ->method('getConditionEvaluator')
-            ->will($this->returnValue(new ConditionEvaluator()));
-
-        $currencies = CurrencyQuery::create();
-        $currencies = $currencies->find();
-        $stubFacade->expects($this->any())
-            ->method('getAvailableCurrencies')
-            ->will($this->returnValue($currencies));
-
-        $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $stubMatchForTotalAmountManager = $this->getMockBuilder('\Thelia\Condition\Implementation\MatchForTotalAmountManager')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $stubMatchForTotalAmountManager->expects($this->any())
-            ->method('isMatching')
-            ->will($this->returnValue(true));
-
-        $stubContainer->expects($this->any())
-            ->method('get')
-            ->will($this->returnValue($stubMatchForTotalAmountManager));
-
-        $stubContainer->expects($this->any())
-            ->method('has')
-            ->will($this->returnValue(true));
-
-        $stubFacade->expects($this->any())
-            ->method('getContainer')
-            ->will($this->returnValue($stubContainer));
-        $stubFacade->expects($this->any())
-            ->method('getCheckoutCurrency')
-            ->will($this->returnValue('EUR'));
-        $stubFacade->expects($this->any())
-            ->method('getCartTotalPrice')
-            ->will($this->returnValue(401.00));
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => '>',
-            MatchForTotalAmountManager::INPUT2 => '=='
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $conditions = new ConditionCollection();
-        $conditions->add($condition1);
-
-        $conditionEvaluator = new ConditionEvaluator();
-        $isValid = $conditionEvaluator->isMatching($conditions);
-
-        $expected = true;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    public function testTestFail1Rules()
-    {
-        $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $stubFacade->expects($this->any())
-            ->method('getTranslator')
-            ->will($this->returnValue($stubTranslator));
-        $stubFacade->expects($this->any())
-            ->method('getConditionEvaluator')
-            ->will($this->returnValue(new ConditionEvaluator()));
-
-        $currencies = CurrencyQuery::create();
-        $currencies = $currencies->find();
-        $stubFacade->expects($this->any())
-            ->method('getAvailableCurrencies')
-            ->will($this->returnValue($currencies));
-
-        $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $stubMatchForTotalAmountManager = $this->getMockBuilder('\Thelia\Condition\Implementation\MatchForTotalAmountManager')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $stubMatchForTotalAmountManager->expects($this->any())
-            ->method('isMatching')
-            ->will($this->returnValue(true));
-
-        $stubContainer->expects($this->any())
-            ->method('get')
-            ->will($this->returnValue($stubMatchForTotalAmountManager));
-
-        $stubContainer->expects($this->any())
-            ->method('has')
-            ->will($this->returnValue(true));
-
-        $stubFacade->expects($this->any())
-            ->method('getContainer')
-            ->will($this->returnValue($stubContainer));
-        $stubFacade->expects($this->any())
-            ->method('getCheckoutCurrency')
-            ->will($this->returnValue('EUR'));
-        $stubFacade->expects($this->any())
-            ->method('getCartTotalPrice')
-            ->will($this->returnValue(400.00));
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => '>',
-            MatchForTotalAmountManager::INPUT2 => '=='
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $conditions = new ConditionCollection();
-        $conditions->add($condition1);
-
-        $conditionEvaluator = new ConditionEvaluator();
-        $isValid = $conditionEvaluator->isMatching($conditions);
-
-        $expected = false;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual, 'Conditions evaluator always think Customer is matching conditions');
-    }
-
-    public function testTestSuccess2Rules()
-    {
-        $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $stubFacade->expects($this->any())
-            ->method('getTranslator')
-            ->will($this->returnValue($stubTranslator));
-        $stubFacade->expects($this->any())
-            ->method('getConditionEvaluator')
-            ->will($this->returnValue(new ConditionEvaluator()));
-
-        $currencies = CurrencyQuery::create();
-        $currencies = $currencies->find();
-        $stubFacade->expects($this->any())
-            ->method('getAvailableCurrencies')
-            ->will($this->returnValue($currencies));
-
-        $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $stubMatchForTotalAmountManager = $this->getMockBuilder('\Thelia\Condition\Implementation\MatchForTotalAmountManager')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $stubMatchForTotalAmountManager->expects($this->any())
-            ->method('isMatching')
-            ->will($this->returnValue(true));
-
-        $stubContainer->expects($this->any())
-            ->method('get')
-            ->will($this->returnValue($stubMatchForTotalAmountManager));
-
-        $stubContainer->expects($this->any())
-            ->method('has')
-            ->will($this->returnValue(true));
-
-        $stubFacade->expects($this->any())
-            ->method('getContainer')
-            ->will($this->returnValue($stubContainer));
-        $stubFacade->expects($this->any())
-            ->method('getCheckoutCurrency')
-            ->will($this->returnValue('EUR'));
-        $stubFacade->expects($this->any())
-            ->method('getCartTotalPrice')
-            ->will($this->returnValue(401.00));
-        $stubFacade->expects($this->any())
-            ->method('getNbArticlesInCart')
-            ->will($this->returnValue(5));
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => '>',
-            MatchForTotalAmountManager::INPUT2 => '=='
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $condition2 = new MatchForXArticlesManager($stubFacade);
-        $operators = array(
-            MatchForXArticlesManager::INPUT1 => '>'
-        );
-        $values = array(
-            MatchForXArticlesManager::INPUT1 => 4
-        );
-        $condition2->setValidatorsFromForm($operators, $values);
-
-        $conditions = new ConditionCollection();
-        $conditions->add($condition1);
-        $conditions->add($condition2);
-
-        $conditionEvaluator = new ConditionEvaluator();
-        $isValid = $conditionEvaluator->isMatching($conditions);
-
-        $expected = true;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    public function testTestFail2Rules()
-    {
-        $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $stubFacade->expects($this->any())
-            ->method('getTranslator')
-            ->will($this->returnValue($stubTranslator));
-        $stubFacade->expects($this->any())
-            ->method('getConditionEvaluator')
-            ->will($this->returnValue(new ConditionEvaluator()));
-
-        $currencies = CurrencyQuery::create();
-        $currencies = $currencies->find();
-        $stubFacade->expects($this->any())
-            ->method('getAvailableCurrencies')
-            ->will($this->returnValue($currencies));
-
-        $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $stubMatchForTotalAmountManager = $this->getMockBuilder('\Thelia\Condition\Implementation\MatchForTotalAmountManager')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $stubMatchForTotalAmountManager->expects($this->any())
-            ->method('isMatching')
-            ->will($this->returnValue(true));
-
-        $stubContainer->expects($this->any())
-            ->method('get')
-            ->will($this->returnValue($stubMatchForTotalAmountManager));
-
-        $stubContainer->expects($this->any())
-            ->method('has')
-            ->will($this->returnValue(true));
-
-        $stubFacade->expects($this->any())
-            ->method('getContainer')
-            ->will($this->returnValue($stubContainer));
-        $stubFacade->expects($this->any())
-            ->method('getCheckoutCurrency')
-            ->will($this->returnValue('EUR'));
-        $stubFacade->expects($this->any())
-            ->method('getCartTotalPrice')
-            ->will($this->returnValue(400.00));
-        $stubFacade->expects($this->any())
-            ->method('getNbArticlesInCart')
-            ->will($this->returnValue(5));
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => '>',
-            MatchForTotalAmountManager::INPUT2 => '=='
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $condition2 = new MatchForXArticlesManager($stubFacade);
-        $operators = array(
-            MatchForXArticlesManager::INPUT1 => '>'
-        );
-        $values = array(
-            MatchForXArticlesManager::INPUT1 => 4
-        );
-        $condition2->setValidatorsFromForm($operators, $values);
-
-        $conditions = new ConditionCollection();
-        $conditions->add($condition1);
-        $conditions->add($condition2);
-
-        $conditionEvaluator = new ConditionEvaluator();
-        $isValid = $conditionEvaluator->isMatching($conditions);
-
-        $expected = false;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual, 'Conditions evaluator always think Customer is matching conditions');
-    }
-
+    /**
+     * Test vatiable comparison
+     *
+     * @covers Thelia\Condition\ConditionEvaluator::variableOpComparison
+     */
     public function testVariableOpComparisonSuccess()
     {
         $conditionEvaluator = new ConditionEvaluator();
@@ -409,6 +90,11 @@ class ConditionEvaluatorTest extends \PHPUnit_Framework_TestCase
 
     }
 
+    /**
+     * Test vatiable comparison
+     *
+     * @covers Thelia\Condition\ConditionEvaluator::variableOpComparison
+     */
     public function testVariableOpComparisonFail()
     {
         $conditionEvaluator = new ConditionEvaluator();
@@ -440,7 +126,10 @@ class ConditionEvaluatorTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
+     * Test vatiable comparison
+     *
      * @expectedException \Exception
+     * @covers Thelia\Condition\ConditionEvaluator::variableOpComparison
      */
     public function testVariableOpComparisonException()
     {
@@ -450,6 +139,68 @@ class ConditionEvaluatorTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $actual);
     }
 
+    /**
+     * Test condition collection matching
+     *
+     * @covers Thelia\Condition\ConditionEvaluator::isMatching
+     */
+    public function testIsMatchingTrue()
+    {
+        $stubConditionTrue1 = $this->getMockBuilder('\Thelia\Condition\Implementation\MatchForXArticles')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubConditionTrue1->expects($this->any())
+            ->method('isMatching')
+            ->will($this->returnValue(true));
+
+        $stubConditionTrue2 = $this->getMockBuilder('\Thelia\Condition\Implementation\MatchForXArticles')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubConditionTrue2->expects($this->any())
+            ->method('isMatching')
+            ->will($this->returnValue(true));
+
+        $collection = new ConditionCollection();
+        $collection->add($stubConditionTrue1);
+        $collection->add($stubConditionTrue2);
+
+        $conitionEvaluator = new ConditionEvaluator();
+        $actual = $conitionEvaluator->isMatching($collection);
+
+        $this->assertTrue($actual);
+    }
+
+    /**
+     * Test condition collection matching
+     *
+     * @covers Thelia\Condition\ConditionEvaluator::isMatching
+     */
+    public function testIsMatchingFalse()
+    {
+        $stubConditionTrue = $this->getMockBuilder('\Thelia\Condition\Implementation\MatchForXArticles')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubConditionTrue->expects($this->any())
+            ->method('isMatching')
+            ->will($this->returnValue(true));
+
+        $stubConditionFalse = $this->getMockBuilder('\Thelia\Condition\Implementation\MatchForXArticles')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubConditionFalse->expects($this->any())
+            ->method('isMatching')
+            ->will($this->returnValue(false));
+
+        $collection = new ConditionCollection();
+        $collection->add($stubConditionTrue);
+        $collection->add($stubConditionFalse);
+
+        $conitionEvaluator = new ConditionEvaluator();
+        $actual = $conitionEvaluator->isMatching($collection);
+
+        $this->assertFalse($actual);
+    }
+
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.

core/lib/Thelia/Tests/Condition/ConditionFactoryTest.php

@@ -27,7 +27,7 @@ use Thelia\Condition\ConditionEvaluator;
 use Thelia\Condition\ConditionFactory;
 use Thelia\Condition\Operators;
 use Thelia\Coupon\FacadeInterface;
-use Thelia\Coupon\ConditionCollection;
+use Thelia\Condition\ConditionCollection;
 use Thelia\Model\CurrencyQuery;
 
 /**
@@ -84,7 +84,7 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase
             ->getMock();
         $stubContainer->expects($this->any())
             ->method('get')
-            ->will($this->returnValue(new MatchForTotalAmountManager($stubFacade)));
+            ->will($this->returnValue(new MatchForTotalAmount($stubFacade)));
 
         $stubContainer->expects($this->any())
             ->method('has')
@@ -94,14 +94,14 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase
             ->method('getContainer')
             ->will($this->returnValue($stubContainer));
 
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
+        $condition1 = new MatchForTotalAmount($stubFacade);
         $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
         );
         $values = array(
-            MatchForTotalAmountManager::INPUT1 => 40.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR'
+            MatchForTotalAmount::INPUT1 => 40.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -148,7 +148,7 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase
             ->getMock();
         $stubContainer->expects($this->any())
             ->method('get')
-            ->will($this->returnValue(new MatchForTotalAmountManager($stubFacade)));
+            ->will($this->returnValue(new MatchForTotalAmount($stubFacade)));
 
         $stubContainer->expects($this->any())
             ->method('has')
@@ -158,14 +158,14 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase
             ->method('getContainer')
             ->will($this->returnValue($stubContainer));
 
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
+        $condition1 = new MatchForTotalAmount($stubFacade);
         $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
         );
         $values = array(
-            MatchForTotalAmountManager::INPUT1 => 40.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR'
+            MatchForTotalAmount::INPUT1 => 40.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -210,7 +210,7 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase
             ->getMock();
         $stubContainer->expects($this->any())
             ->method('get')
-            ->will($this->returnValue(new MatchForTotalAmountManager($stubFacade)));
+            ->will($this->returnValue(new MatchForTotalAmount($stubFacade)));
 
         $stubContainer->expects($this->any())
             ->method('has')
@@ -220,25 +220,25 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase
             ->method('getContainer')
             ->will($this->returnValue($stubContainer));
 
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
+        $condition1 = new MatchForTotalAmount($stubFacade);
         $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
         );
         $values = array(
-            MatchForTotalAmountManager::INPUT1 => 40.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR'
+            MatchForTotalAmount::INPUT1 => 40.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
-        $condition2 = new MatchForTotalAmountManager($stubFacade);
+        $condition2 = new MatchForTotalAmount($stubFacade);
         $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
         );
         $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR'
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
         );
         $condition2->setValidatorsFromForm($operators, $values);
 
@@ -287,7 +287,7 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase
         $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container')
             ->disableOriginalConstructor()
             ->getMock();
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
+        $condition1 = new MatchForTotalAmount($stubFacade);
         $stubContainer->expects($this->any())
             ->method('get')
             ->will($this->returnValue($condition1));
@@ -301,12 +301,12 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase
             ->will($this->returnValue($stubContainer));
 
         $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
         );
         $values = array(
-            MatchForTotalAmountManager::INPUT1 => 40.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR'
+            MatchForTotalAmount::INPUT1 => 40.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -352,7 +352,7 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase
         $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container')
             ->disableOriginalConstructor()
             ->getMock();
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
+        $condition1 = new MatchForTotalAmount($stubFacade);
         $stubContainer->expects($this->any())
             ->method('get')
             ->will($this->returnValue($condition1));
@@ -366,12 +366,12 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase
             ->will($this->returnValue($stubContainer));
 
         $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
         );
         $values = array(
-            MatchForTotalAmountManager::INPUT1 => 40.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR'
+            MatchForTotalAmount::INPUT1 => 40.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -387,6 +387,66 @@ class ConditionFactoryTest extends \PHPUnit_Framework_TestCase
 
     }
 
+    /**
+     * Test condition serialization if collection is empty
+     *
+     * @covers Thelia\Condition\ConditionFactory::serializeConditionCollection
+     */
+    public function testSerializeConditionCollectionEmpty()
+    {
+        $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator')
+             ->disableOriginalConstructor()
+             ->getMock();
+
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $stubFacade->expects($this->any())
+            ->method('getTranslator')
+            ->will($this->returnValue($stubTranslator));
+        $stubFacade->expects($this->any())
+            ->method('getConditionEvaluator')
+            ->will($this->returnValue(new ConditionEvaluator()));
+
+        $currencies = CurrencyQuery::create();
+        $currencies = $currencies->find();
+        $stubFacade->expects($this->any())
+            ->method('getAvailableCurrencies')
+            ->will($this->returnValue($currencies));
+
+        $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubContainer->expects($this->any())
+            ->method('get')
+            ->will($this->returnValue(new MatchForEveryone($stubFacade)));
+
+        $stubContainer->expects($this->any())
+            ->method('has')
+            ->will($this->returnValue(true));
+
+        $stubFacade->expects($this->any())
+            ->method('getContainer')
+            ->will($this->returnValue($stubContainer));
+
+
+        $conditions = new ConditionCollection();
+
+        $conditionFactory = new ConditionFactory($stubContainer);
+
+
+        $conditionNone = new MatchForEveryone($stubFacade);
+        $expectedCollection = new ConditionCollection();
+        $expectedCollection->add($conditionNone);
+
+        $expected = $conditionFactory->serializeConditionCollection($expectedCollection);
+        $actual = $conditionFactory->serializeConditionCollection($conditions);
+
+        $this->assertEquals($expected, $actual);
+    }
+
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.

core/lib/Thelia/Tests/Condition/Implementation/MatchForEveryoneTest.php

@@ -33,13 +33,13 @@ use Thelia\Model\Currency;
  * Date: 8/19/13
  * Time: 3:24 PM
  *
- * Unit Test MatchForEveryoneManager Class
+ * Unit Test MatchForEveryone Class
  *
  * @package Condition
  * @author  Guillaume MOREL <gmorel@openstudio.fr>
  *
  */
-class MatchForEveryoneManagerTest extends \PHPUnit_Framework_TestCase
+class MatchForEveryoneTest extends \PHPUnit_Framework_TestCase
 {
     /** @var FacadeInterface $stubTheliaAdapter */
     protected $stubTheliaAdapter = null;
@@ -49,10 +49,11 @@ class MatchForEveryoneManagerTest extends \PHPUnit_Framework_TestCase
      *
      * @param int    $cartTotalPrice   Cart total price
      * @param string $checkoutCurrency Checkout currency
+     * @param string $i18nOutput       Output from each translation
      *
      * @return \PHPUnit_Framework_MockObject_MockObject
      */
-    public function generateAdapterStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR')
+    public function generateFacadeStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR', $i18nOutput = '')
     {
         $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade')
             ->disableOriginalConstructor()
@@ -70,6 +71,17 @@ class MatchForEveryoneManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getConditionEvaluator')
             ->will($this->returnValue(new ConditionEvaluator()));
 
+        $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubTranslator->expects($this->any())
+            ->method('trans')
+            ->will($this->returnValue($i18nOutput));
+
+        $stubFacade->expects($this->any())
+            ->method('getTranslator')
+            ->will($this->returnValue($stubTranslator));
+
         $currency1 = new Currency();
         $currency1->setCode('EUR');
         $currency2 = new Currency();
@@ -84,15 +96,15 @@ class MatchForEveryoneManagerTest extends \PHPUnit_Framework_TestCase
     /**
      * Check if validity test on BackOffice inputs are working
      *
-     * @covers Thelia\Condition\Implementation\MatchForEveryoneManager::setValidators
+     * @covers Thelia\Condition\Implementation\MatchForEveryone::setValidators
      *
      */
     public function testValidBackOfficeInputOperator()
     {
-        $stubFacade = $this->generateAdapterStub(399, 'EUR');
+        $stubFacade = $this->generateFacadeStub(399, 'EUR');
 
         /** @var FacadeInterface $stubFacade */
-        $condition1 = new MatchForEveryoneManager($stubFacade);
+        $condition1 = new MatchForEveryone($stubFacade);
         $operators = array();
         $values = array();
         $condition1->setValidatorsFromForm($operators, $values);
@@ -107,15 +119,15 @@ class MatchForEveryoneManagerTest extends \PHPUnit_Framework_TestCase
     /**
      * Check if condition is always matching
      *
-     * @covers Thelia\Condition\Implementation\MatchForEveryoneManager::isMatching
+     * @covers Thelia\Condition\Implementation\MatchForEveryone::isMatching
      *
      */
     public function testIsMatching()
     {
-        $stubFacade = $this->generateAdapterStub(399, 'EUR');
+        $stubFacade = $this->generateFacadeStub(399, 'EUR');
 
         /** @var FacadeInterface $stubFacade */
-        $condition1 = new MatchForEveryoneManager($stubFacade);
+        $condition1 = new MatchForEveryone($stubFacade);
 
         $isValid = $condition1->isMatching();
 
@@ -124,4 +136,67 @@ class MatchForEveryoneManagerTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $actual);
     }
 
+    /**
+     * Check getName i18n
+     *
+     * @covers Thelia\Condition\Implementation\MatchForEveryone::getName
+     *
+     */
+    public function testGetName()
+    {
+        $stubFacade = $this->generateFacadeStub(399, 'EUR', 'Everybody can use it (no condition)');
+
+        /** @var FacadeInterface $stubFacade */
+        $condition1 = new MatchForEveryone($stubFacade);
+
+        $actual = $condition1->getName();
+        $expected = 'Everybody can use it (no condition)';
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check tooltip i18n
+     *
+     * @covers Thelia\Condition\Implementation\MatchForEveryone::getToolTip
+     *
+     */
+    public function testGetToolTip()
+    {
+        $stubFacade = $this->generateFacadeStub(399, 'EUR', 'Will return always true');
+
+        /** @var FacadeInterface $stubFacade */
+        $condition1 = new MatchForEveryone($stubFacade);
+
+        $actual = $condition1->getToolTip();
+        $expected = 'Will return always true';
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check validator
+     *
+     * @covers Thelia\Condition\Implementation\MatchForEveryone::generateInputs
+     * @covers Thelia\Condition\Implementation\MatchForEveryone::setValidatorsFromForm
+     */
+    public function testGetValidator()
+    {
+        $stubFacade = $this->generateFacadeStub(399, 'EUR');
+
+        /** @var FacadeInterface $stubFacade */
+        $condition1 = new MatchForEveryone($stubFacade);
+        $actual1 = $condition1->setValidatorsFromForm(array(), array());
+        $expected1 = $condition1;
+        $actual2 = $condition1->getValidators();
+
+        $validators = array();
+        $validators['inputs'] = array();
+        $validators['setOperators'] = array();
+        $validators['setValues'] = array();
+        $expected2 = $validators;
+
+        $this->assertEquals($expected1, $actual1);
+        $this->assertEquals($expected2, $actual2);
+
+
+    }
 }

core/lib/Thelia/Tests/Condition/Implementation/MatchForTotalAmountManagerTest.php

@@ -1,610 +0,0 @@
-<?php
-/**********************************************************************************/
-/*                                                                                */
-/*      Thelia	                                                                  */
-/*                                                                                */
-/*      Copyright (c) OpenStudio                                                  */
-/*      email : info@thelia.net                                                   */
-/*      web : http://www.thelia.net                                               */
-/*                                                                                */
-/*      This program is free software; you can redistribute it and/or modify      */
-/*      it under the terms of the GNU General Public License as published by      */
-/*      the Free Software Foundation; either version 3 of the License             */
-/*                                                                                */
-/*      This program is distributed in the hope that it will be useful,           */
-/*      but WITHOUT ANY WARRANTY; without even the implied warranty of            */
-/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             */
-/*      GNU General Public License for more details.                              */
-/*                                                                                */
-/*      You should have received a copy of the GNU General Public License         */
-/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.      */
-/*                                                                                */
-/**********************************************************************************/
-
-namespace Thelia\Condition\Implementation;
-
-use Thelia\Condition\ConditionEvaluator;
-use Thelia\Condition\Operators;
-use Thelia\Coupon\FacadeInterface;
-use Thelia\Exception\InvalidConditionValueException;
-use Thelia\Model\Currency;
-
-/**
- * Created by JetBrains PhpStorm.
- * Date: 8/19/13
- * Time: 3:24 PM
- *
- * Unit Test MatchForTotalAmountManager Class
- *
- * @package Condition
- * @author  Guillaume MOREL <gmorel@openstudio.fr>
- *
- */
-class MatchForTotalAmountManagerTest extends \PHPUnit_Framework_TestCase
-{
-    /** @var FacadeInterface $stubTheliaAdapter */
-    protected $stubTheliaAdapter = null;
-
-    /**
-     * Generate adapter stub
-     *
-     * @param int    $cartTotalPrice   Cart total price
-     * @param string $checkoutCurrency Checkout currency
-     *
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    public function generateAdapterStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR')
-    {
-        $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $stubFacade->expects($this->any())
-            ->method('getCartTotalPrice')
-            ->will($this->returnValue($cartTotalPrice));
-
-        $stubFacade->expects($this->any())
-            ->method('getCheckoutCurrency')
-            ->will($this->returnValue($checkoutCurrency));
-
-        $stubFacade->expects($this->any())
-            ->method('getConditionEvaluator')
-            ->will($this->returnValue(new ConditionEvaluator()));
-
-        $currency1 = new Currency();
-        $currency1->setCode('EUR');
-        $currency2 = new Currency();
-        $currency2->setCode('USD');
-        $stubFacade->expects($this->any())
-            ->method('getAvailableCurrencies')
-            ->will($this->returnValue(array($currency1, $currency2)));
-
-        return $stubFacade;
-    }
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-
-    }
-
-    /**
-     * Check if validity test on BackOffice inputs are working
-     *
-     * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::setValidators
-     * @expectedException \Thelia\Exception\InvalidConditionOperatorException
-     *
-     */
-    public function testInValidBackOfficeInputOperator()
-    {
-        $stubFacade = $this->generateAdapterStub(399, 'EUR');
-
-        /** @var FacadeInterface $stubFacade */
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::IN,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => '400',
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $isValid = $condition1->isMatching();
-
-        $expected = true;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Check if validity test on BackOffice inputs are working
-     *
-     * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::setValidators
-     * @expectedException \Thelia\Exception\InvalidConditionOperatorException
-     *
-     */
-    public function testInValidBackOfficeInputOperator2()
-    {
-        $stubFacade = $this->generateAdapterStub(399, 'EUR');
-
-        /** @var FacadeInterface $stubFacade */
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR,
-            MatchForTotalAmountManager::INPUT2 => Operators::INFERIOR
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => '400',
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $isValid = $condition1->isMatching();
-
-        $expected = true;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Check if validity test on BackOffice inputs are working
-     *
-     * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::setValidators
-     * @expectedException \Thelia\Exception\InvalidConditionValueException
-     *
-     */
-    public function testInValidBackOfficeInputValue()
-    {
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->generateAdapterStub(399, 'EUR');
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 'X',
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $isValid = $condition1->isMatching();
-
-        $expected = true;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Check if validity test on BackOffice inputs are working
-     *
-     * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::setValidators
-     * @expectedException \Thelia\Exception\InvalidConditionValueException
-     *
-     */
-    public function testInValidBackOfficeInputValue2()
-    {
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->generateAdapterStub(399, 'EUR');
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400,
-            MatchForTotalAmountManager::INPUT2 => 'FLA');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $isValid = $condition1->isMatching();
-
-        $expected = true;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Check if test inferior operator is working
-     *
-     * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching
-     *
-     */
-    public function testMatchingConditionInferior()
-    {
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->generateAdapterStub(399, 'EUR');
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::INFERIOR,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $isValid = $condition1->isMatching();
-
-        $expected = true;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Check if test inferior operator is working
-     *
-     * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching
-     *
-     */
-    public function testNotMatchingConditionInferior()
-    {
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->generateAdapterStub(400, 'EUR');
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::INFERIOR,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $isValid = $condition1->isMatching();
-
-        $expected = false;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Check if test inferior operator is working
-     *
-     * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching
-     *
-     */
-    public function testMatchingConditionInferiorEquals()
-    {
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->generateAdapterStub(400, 'EUR');
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::INFERIOR_OR_EQUAL,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $isValid = $condition1->isMatching();
-
-        $expected = true;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Check if test inferior operator is working
-     *
-     * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching
-     *
-     */
-    public function testMatchingConditionInferiorEquals2()
-    {
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->generateAdapterStub(399, 'EUR');
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::INFERIOR_OR_EQUAL,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $isValid = $condition1->isMatching();
-
-        $expected = true;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Check if test inferior operator is working
-     *
-     * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching
-     *
-     */
-    public function testNotMatchingConditionInferiorEquals()
-    {
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->generateAdapterStub(401, 'EUR');
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::INFERIOR_OR_EQUAL,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $isValid = $condition1->isMatching();
-
-        $expected = false;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Check if test equals operator is working
-     *
-     * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching
-     *
-     */
-    public function testMatchingConditionEqual()
-    {
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->generateAdapterStub(400, 'EUR');
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::EQUAL,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $isValid = $condition1->isMatching();
-
-        $expected = true;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Check if test equals operator is working
-     *
-     * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching
-     *
-     */
-    public function testNotMatchingConditionEqual()
-    {
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->generateAdapterStub(399, 'EUR');
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::EQUAL,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $isValid = $condition1->isMatching();
-
-        $expected = false;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Check if test superior operator is working
-     *
-     * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching
-     *
-     */
-    public function testMatchingConditionSuperiorEquals()
-    {
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->generateAdapterStub(401, 'EUR');
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $isValid = $condition1->isMatching();
-
-        $expected = true;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Check if test superior operator is working
-     *
-     * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching
-     *
-     */
-    public function testMatchingConditionSuperiorEquals2()
-    {
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->generateAdapterStub(400, 'EUR');
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $isValid = $condition1->isMatching();
-
-        $expected = true;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Check if test superior operator is working
-     *
-     * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching
-     *
-     */
-    public function testNotMatchingConditionSuperiorEquals()
-    {
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->generateAdapterStub(399, 'EUR');
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $isValid = $condition1->isMatching();
-
-        $expected = false;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Check if test superior operator is working
-     *
-     * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching
-     *
-     */
-    public function testMatchingConditionSuperior()
-    {
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->generateAdapterStub(401, 'EUR');
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $isValid = $condition1->isMatching();
-
-        $expected = true;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Check if test superior operator is working
-     *
-     * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching
-     *
-     */
-    public function testNotMatchingConditionSuperior()
-    {
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->generateAdapterStub(399, 'EUR');
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $isValid = $condition1->isMatching();
-
-        $expected = false;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Check currency is checked
-     *
-     * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching
-     *
-     */
-    public function testMatchingConditionCurrency()
-    {
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->generateAdapterStub(400, 'EUR');
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::EQUAL,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'EUR');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $isValid = $condition1->isMatching();
-
-        $expected = true;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Check currency is checked
-     *
-     * @covers Thelia\Condition\Implementation\MatchForTotalAmountManager::isMatching
-     *
-     */
-    public function testNotMatchingConditionCurrency()
-    {
-        /** @var FacadeInterface $stubFacade */
-        $stubFacade = $this->generateAdapterStub(400.00, 'EUR');
-
-        $condition1 = new MatchForTotalAmountManager($stubFacade);
-        $operators = array(
-            MatchForTotalAmountManager::INPUT1 => Operators::EQUAL,
-            MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
-        );
-        $values = array(
-            MatchForTotalAmountManager::INPUT1 => 400.00,
-            MatchForTotalAmountManager::INPUT2 => 'USD');
-        $condition1->setValidatorsFromForm($operators, $values);
-
-        $isValid = $condition1->isMatching();
-
-        $expected = false;
-        $actual =$isValid;
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-}

core/lib/Thelia/Tests/Condition/Implementation/MatchForTotalAmountTest.php

@@ -0,0 +1,976 @@
+<?php
+/**********************************************************************************/
+/*                                                                                */
+/*      Thelia	                                                                  */
+/*                                                                                */
+/*      Copyright (c) OpenStudio                                                  */
+/*      email : info@thelia.net                                                   */
+/*      web : http://www.thelia.net                                               */
+/*                                                                                */
+/*      This program is free software; you can redistribute it and/or modify      */
+/*      it under the terms of the GNU General Public License as published by      */
+/*      the Free Software Foundation; either version 3 of the License             */
+/*                                                                                */
+/*      This program is distributed in the hope that it will be useful,           */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of            */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             */
+/*      GNU General Public License for more details.                              */
+/*                                                                                */
+/*      You should have received a copy of the GNU General Public License         */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.      */
+/*                                                                                */
+/**********************************************************************************/
+
+namespace Thelia\Condition\Implementation;
+
+use Thelia\Condition\ConditionEvaluator;
+use Thelia\Condition\ConditionFactory;
+use Thelia\Condition\Operators;
+use Thelia\Condition\ConditionCollection;
+use Thelia\Coupon\FacadeInterface;
+use Thelia\Exception\InvalidConditionValueException;
+use Thelia\Model\Currency;
+use Thelia\Model\CurrencyQuery;
+
+/**
+ * Created by JetBrains PhpStorm.
+ * Date: 8/19/13
+ * Time: 3:24 PM
+ *
+ * Unit Test MatchForTotalAmount Class
+ *
+ * @package Condition
+ * @author  Guillaume MOREL <gmorel@openstudio.fr>
+ *
+ */
+class MatchForTotalAmountTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var FacadeInterface $stubTheliaAdapter */
+    protected $stubTheliaAdapter = null;
+
+    /**
+     * Generate adapter stub
+     *
+     * @param int    $cartTotalPrice   Cart total price
+     * @param string $checkoutCurrency Checkout currency
+     *
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    public function generateAdapterStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR')
+    {
+        $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $stubFacade->expects($this->any())
+            ->method('getCartTotalPrice')
+            ->will($this->returnValue($cartTotalPrice));
+
+        $stubFacade->expects($this->any())
+            ->method('getCheckoutCurrency')
+            ->will($this->returnValue($checkoutCurrency));
+
+        $stubFacade->expects($this->any())
+            ->method('getConditionEvaluator')
+            ->will($this->returnValue(new ConditionEvaluator()));
+
+        $currency1 = new Currency();
+        $currency1->setCode('EUR');
+        $currency2 = new Currency();
+        $currency2->setCode('USD');
+        $stubFacade->expects($this->any())
+            ->method('getAvailableCurrencies')
+            ->will($this->returnValue(array($currency1, $currency2)));
+
+        return $stubFacade;
+    }
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+
+    }
+
+    /**
+     * Check if validity test on BackOffice inputs are working
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::setValidators
+     * @expectedException \Thelia\Exception\InvalidConditionOperatorException
+     *
+     */
+    public function testInValidBackOfficeInputOperator()
+    {
+        $stubFacade = $this->generateAdapterStub(399, 'EUR');
+
+        /** @var FacadeInterface $stubFacade */
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::IN,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => '400',
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $isValid = $condition1->isMatching();
+
+        $expected = true;
+        $actual =$isValid;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check if validity test on BackOffice inputs are working
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::setValidators
+     * @expectedException \Thelia\Exception\InvalidConditionOperatorException
+     *
+     */
+    public function testInValidBackOfficeInputOperator2()
+    {
+        $stubFacade = $this->generateAdapterStub(399, 'EUR');
+
+        /** @var FacadeInterface $stubFacade */
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::INFERIOR
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => '400',
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $isValid = $condition1->isMatching();
+
+        $expected = true;
+        $actual =$isValid;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check if validity test on BackOffice inputs are working
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::setValidators
+     * @expectedException \Thelia\Exception\InvalidConditionValueException
+     *
+     */
+    public function testInValidBackOfficeInputValue()
+    {
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->generateAdapterStub(399, 'EUR');
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 'X',
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $isValid = $condition1->isMatching();
+
+        $expected = true;
+        $actual =$isValid;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check if validity test on BackOffice inputs are working
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::setValidators
+     * @expectedException \Thelia\Exception\InvalidConditionValueException
+     *
+     */
+    public function testInValidBackOfficeInputValue2()
+    {
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->generateAdapterStub(399, 'EUR');
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400,
+            MatchForTotalAmount::INPUT2 => 'FLA');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $isValid = $condition1->isMatching();
+
+        $expected = true;
+        $actual =$isValid;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check if test inferior operator is working
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching
+     *
+     */
+    public function testMatchingConditionInferior()
+    {
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->generateAdapterStub(399, 'EUR');
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::INFERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $isValid = $condition1->isMatching();
+
+        $expected = true;
+        $actual =$isValid;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check if test inferior operator is working
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching
+     *
+     */
+    public function testNotMatchingConditionInferior()
+    {
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->generateAdapterStub(400, 'EUR');
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::INFERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $isValid = $condition1->isMatching();
+
+        $expected = false;
+        $actual =$isValid;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check if test inferior operator is working
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching
+     *
+     */
+    public function testMatchingConditionInferiorEquals()
+    {
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->generateAdapterStub(400, 'EUR');
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::INFERIOR_OR_EQUAL,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $isValid = $condition1->isMatching();
+
+        $expected = true;
+        $actual =$isValid;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check if test inferior operator is working
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching
+     *
+     */
+    public function testMatchingConditionInferiorEquals2()
+    {
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->generateAdapterStub(399, 'EUR');
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::INFERIOR_OR_EQUAL,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $isValid = $condition1->isMatching();
+
+        $expected = true;
+        $actual =$isValid;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check if test inferior operator is working
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching
+     *
+     */
+    public function testNotMatchingConditionInferiorEquals()
+    {
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->generateAdapterStub(401, 'EUR');
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::INFERIOR_OR_EQUAL,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $isValid = $condition1->isMatching();
+
+        $expected = false;
+        $actual =$isValid;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check if test equals operator is working
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching
+     *
+     */
+    public function testMatchingConditionEqual()
+    {
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->generateAdapterStub(400, 'EUR');
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::EQUAL,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $isValid = $condition1->isMatching();
+
+        $expected = true;
+        $actual =$isValid;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check if test equals operator is working
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching
+     *
+     */
+    public function testNotMatchingConditionEqual()
+    {
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->generateAdapterStub(399, 'EUR');
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::EQUAL,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $isValid = $condition1->isMatching();
+
+        $expected = false;
+        $actual =$isValid;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check if test superior operator is working
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching
+     *
+     */
+    public function testMatchingConditionSuperiorEquals()
+    {
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->generateAdapterStub(401, 'EUR');
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR_OR_EQUAL,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $isValid = $condition1->isMatching();
+
+        $expected = true;
+        $actual =$isValid;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check if test superior operator is working
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching
+     *
+     */
+    public function testMatchingConditionSuperiorEquals2()
+    {
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->generateAdapterStub(400, 'EUR');
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR_OR_EQUAL,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $isValid = $condition1->isMatching();
+
+        $expected = true;
+        $actual =$isValid;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check if test superior operator is working
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching
+     *
+     */
+    public function testNotMatchingConditionSuperiorEquals()
+    {
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->generateAdapterStub(399, 'EUR');
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR_OR_EQUAL,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $isValid = $condition1->isMatching();
+
+        $expected = false;
+        $actual =$isValid;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check if test superior operator is working
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching
+     *
+     */
+    public function testMatchingConditionSuperior()
+    {
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->generateAdapterStub(401, 'EUR');
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $isValid = $condition1->isMatching();
+
+        $expected = true;
+        $actual =$isValid;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check if test superior operator is working
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching
+     *
+     */
+    public function testNotMatchingConditionSuperior()
+    {
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->generateAdapterStub(399, 'EUR');
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $isValid = $condition1->isMatching();
+
+        $expected = false;
+        $actual =$isValid;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check currency is checked
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching
+     *
+     */
+    public function testMatchingConditionCurrency()
+    {
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->generateAdapterStub(400, 'EUR');
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::EQUAL,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $isValid = $condition1->isMatching();
+
+        $expected = true;
+        $actual =$isValid;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check currency is checked
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::isMatching
+     *
+     */
+    public function testNotMatchingConditionCurrency()
+    {
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->generateAdapterStub(400.00, 'EUR');
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::EQUAL,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'USD');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $isValid = $condition1->isMatching();
+
+        $expected = false;
+        $actual =$isValid;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check unknown currency
+     *
+     * @covers Thelia\Condition\Implementation\ConditionAbstract::isCurrencyValid
+     * @expectedException \Thelia\Exception\InvalidConditionValueException
+     *
+     */
+    public function testUnknownCurrencyCode()
+    {
+        $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $stubFacade->expects($this->any())
+            ->method('getTranslator')
+            ->will($this->returnValue($stubTranslator));
+        $stubFacade->expects($this->any())
+            ->method('getConditionEvaluator')
+            ->will($this->returnValue(new ConditionEvaluator()));
+
+        $currencies = CurrencyQuery::create();
+        $currencies = $currencies->find();
+        $stubFacade->expects($this->any())
+            ->method('getAvailableCurrencies')
+            ->will($this->returnValue($currencies));
+
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::EQUAL,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'UNK');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+
+        $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubContainer->expects($this->any())
+            ->method('get')
+            ->will($this->returnValue($condition1));
+
+        $stubContainer->expects($this->any())
+            ->method('has')
+            ->will($this->returnValue(true));
+
+        $stubFacade->expects($this->any())
+            ->method('getContainer')
+            ->will($this->returnValue($stubContainer));
+
+        $conditionFactory = new ConditionFactory($stubContainer);
+
+        $collection = new ConditionCollection();
+        $collection->add($condition1);
+
+        $serialized = $conditionFactory->serializeConditionCollection($collection);
+        $unserialized = $conditionFactory->unserializeConditionCollection($serialized);
+    }
+
+    /**
+     * Check invalid currency
+     *
+     * @covers Thelia\Condition\Implementation\ConditionAbstract::isPriceValid
+     * @expectedException \Thelia\Exception\InvalidConditionValueException
+     *
+     */
+    public function testInvalidCurrencyValue()
+    {
+        $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $stubFacade->expects($this->any())
+            ->method('getTranslator')
+            ->will($this->returnValue($stubTranslator));
+        $stubFacade->expects($this->any())
+            ->method('getConditionEvaluator')
+            ->will($this->returnValue(new ConditionEvaluator()));
+
+        $currencies = CurrencyQuery::create();
+        $currencies = $currencies->find();
+        $stubFacade->expects($this->any())
+            ->method('getAvailableCurrencies')
+            ->will($this->returnValue($currencies));
+
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::EQUAL,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 'notfloat',
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+
+        $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubContainer->expects($this->any())
+            ->method('get')
+            ->will($this->returnValue($condition1));
+
+        $stubContainer->expects($this->any())
+            ->method('has')
+            ->will($this->returnValue(true));
+
+        $stubFacade->expects($this->any())
+            ->method('getContainer')
+            ->will($this->returnValue($stubContainer));
+
+        $conditionFactory = new ConditionFactory($stubContainer);
+
+        $collection = new ConditionCollection();
+        $collection->add($condition1);
+
+        $serialized = $conditionFactory->serializeConditionCollection($collection);
+        $unserialized = $conditionFactory->unserializeConditionCollection($serialized);
+    }
+
+    /**
+     * Check invalid currency
+     *
+     * @covers Thelia\Condition\Implementation\ConditionAbstract::isPriceValid
+     * @expectedException \Thelia\Exception\InvalidConditionValueException
+     *
+     */
+    public function testPriceAsZero()
+    {
+        $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /** @var FacadeInterface $stubFacade */
+        $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $stubFacade->expects($this->any())
+            ->method('getTranslator')
+            ->will($this->returnValue($stubTranslator));
+        $stubFacade->expects($this->any())
+            ->method('getConditionEvaluator')
+            ->will($this->returnValue(new ConditionEvaluator()));
+
+        $currencies = CurrencyQuery::create();
+        $currencies = $currencies->find();
+        $stubFacade->expects($this->any())
+            ->method('getAvailableCurrencies')
+            ->will($this->returnValue($currencies));
+
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::EQUAL,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 0.00,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+
+        $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Container')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubContainer->expects($this->any())
+            ->method('get')
+            ->will($this->returnValue($condition1));
+
+        $stubContainer->expects($this->any())
+            ->method('has')
+            ->will($this->returnValue(true));
+
+        $stubFacade->expects($this->any())
+            ->method('getContainer')
+            ->will($this->returnValue($stubContainer));
+
+        $conditionFactory = new ConditionFactory($stubContainer);
+
+        $collection = new ConditionCollection();
+        $collection->add($condition1);
+
+        $serialized = $conditionFactory->serializeConditionCollection($collection);
+        $unserialized = $conditionFactory->unserializeConditionCollection($serialized);
+    }
+
+    /**
+     * Generate adapter stub
+     *
+     * @param int    $cartTotalPrice   Cart total price
+     * @param string $checkoutCurrency Checkout currency
+     * @param string $i18nOutput       Output from each translation
+     *
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    public function generateFacadeStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR', $i18nOutput = '')
+    {
+        $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $stubFacade->expects($this->any())
+            ->method('getCartTotalPrice')
+            ->will($this->returnValue($cartTotalPrice));
+
+        $stubFacade->expects($this->any())
+            ->method('getCheckoutCurrency')
+            ->will($this->returnValue($checkoutCurrency));
+
+        $stubFacade->expects($this->any())
+            ->method('getConditionEvaluator')
+            ->will($this->returnValue(new ConditionEvaluator()));
+
+        $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubTranslator->expects($this->any())
+            ->method('trans')
+            ->will($this->returnValue($i18nOutput));
+
+        $stubFacade->expects($this->any())
+            ->method('getTranslator')
+            ->will($this->returnValue($stubTranslator));
+
+        $currency1 = new Currency();
+        $currency1->setCode('EUR');
+        $currency2 = new Currency();
+        $currency2->setCode('USD');
+        $stubFacade->expects($this->any())
+            ->method('getAvailableCurrencies')
+            ->will($this->returnValue(array($currency1, $currency2)));
+
+        return $stubFacade;
+    }
+
+    /**
+     * Check getName i18n
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::getName
+     *
+     */
+    public function testGetName()
+    {
+        $stubFacade = $this->generateFacadeStub(399, 'EUR', 'Cart total amount');
+
+        /** @var FacadeInterface $stubFacade */
+        $condition1 = new MatchForTotalAmount($stubFacade);
+
+        $actual = $condition1->getName();
+        $expected = 'Cart total amount';
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check tooltip i18n
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::getToolTip
+     *
+     */
+    public function testGetToolTip()
+    {
+        $stubFacade = $this->generateFacadeStub(399, 'EUR', 'If cart total amount is <strong>%operator%</strong> %amount% %currency%');
+
+        /** @var FacadeInterface $stubFacade */
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::EQUAL,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $actual = $condition1->getToolTip();
+        $expected = 'If cart total amount is <strong>%operator%</strong> %amount% %currency%';
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check validator
+     *
+     * @covers Thelia\Condition\Implementation\MatchForTotalAmount::generateInputs
+     *
+     */
+    public function testGetValidator()
+    {
+        $stubFacade = $this->generateFacadeStub(399, 'EUR', 'Price');
+
+        /** @var FacadeInterface $stubFacade */
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::EQUAL,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR');
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $actual = $condition1->getValidators();
+
+        $validators = array(
+            'inputs' => array(
+                MatchForTotalAmount::INPUT1 => array(
+                    'title' => 'Price',
+                    'availableOperators' => array(
+                        '<' => 'Price',
+                        '<=' => 'Price',
+                        '==' => 'Price',
+                        '>=' => 'Price',
+                        '>' => 'Price'
+                    ),
+                    'availableValues' => '',
+                    'type' => 'text',
+                    'class' => 'form-control',
+                    'value' => '',
+                    'selectedOperator' => ''
+                ),
+                MatchForTotalAmount::INPUT2 => array(
+                    'title' => 'Price',
+                    'availableOperators' => array('==' => 'Price'),
+                    'availableValues' => array(
+                        'EUR' => '€',
+                        'USD' => '$',
+                        'GBP' => '£',
+                    ),
+                    'type' => 'select',
+                    'class' => 'form-control',
+                    'value' => '',
+                    'selectedOperator' => Operators::EQUAL
+                )
+            ),
+            'setOperators' => array(
+                'price' => '==',
+                'currency' => '=='
+            ),
+            'setValues' => array(
+                'price' => 400,
+                'currency' => 'EUR'
+            )
+        );
+        $expected = $validators;
+
+        $this->assertEquals($expected, $actual);
+
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
+
+}

core/lib/Thelia/Tests/Condition/Implementation/MatchForXArticlesTest.php

@@ -33,13 +33,13 @@ use Thelia\Coupon\FacadeInterface;
  * Date: 8/19/13
  * Time: 3:24 PM
  *
- * Unit Test MatchForXArticlesManager Class
+ * Unit Test MatchForXArticles Class
  *
  * @package Constraint
  * @author  Guillaume MOREL <gmorel@openstudio.fr>
  *
  */
-class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
+class MatchForXArticlesTest extends \PHPUnit_Framework_TestCase
 {
 
     /**
@@ -54,7 +54,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
     /**
      * Check if validity test on BackOffice inputs are working
      *
-     * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::setValidators
+     * @covers Thelia\Condition\Implementation\MatchForXArticles::setValidators
      * @expectedException \Thelia\Exception\InvalidConditionOperatorException
      */
     public function testInValidBackOfficeInputOperator()
@@ -72,12 +72,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getConditionEvaluator')
             ->will($this->returnValue(new ConditionEvaluator()));
 
-        $condition1 = new MatchForXArticlesManager($stubFacade);
+        $condition1 = new MatchForXArticles($stubFacade);
         $operators = array(
-            MatchForXArticlesManager::INPUT1 => Operators::IN
+            MatchForXArticles::INPUT1 => Operators::IN
         );
         $values = array(
-            MatchForXArticlesManager::INPUT1 => 5
+            MatchForXArticles::INPUT1 => 5
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -91,7 +91,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
     /**
      * Check if validity test on BackOffice inputs are working
      *
-     * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::setValidators
+     * @covers Thelia\Condition\Implementation\MatchForXArticles::setValidators
      * @expectedException \Thelia\Exception\InvalidConditionValueException
      */
     public function testInValidBackOfficeInputValue()
@@ -108,12 +108,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getConditionEvaluator')
             ->will($this->returnValue(new ConditionEvaluator()));
 
-        $condition1 = new MatchForXArticlesManager($stubFacade);
+        $condition1 = new MatchForXArticles($stubFacade);
         $operators = array(
-            MatchForXArticlesManager::INPUT1 => Operators::SUPERIOR
+            MatchForXArticles::INPUT1 => Operators::SUPERIOR
         );
         $values = array(
-            MatchForXArticlesManager::INPUT1 => 'X'
+            MatchForXArticles::INPUT1 => 'X'
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -127,7 +127,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
     /**
      * Check if test inferior operator is working
      *
-     * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching
+     * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching
      *
      */
     public function testMatchingRuleInferior()
@@ -144,12 +144,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getConditionEvaluator')
             ->will($this->returnValue(new ConditionEvaluator()));
 
-        $condition1 = new MatchForXArticlesManager($stubFacade);
+        $condition1 = new MatchForXArticles($stubFacade);
         $operators = array(
-            MatchForXArticlesManager::INPUT1 => Operators::INFERIOR
+            MatchForXArticles::INPUT1 => Operators::INFERIOR
         );
         $values = array(
-            MatchForXArticlesManager::INPUT1 => 5
+            MatchForXArticles::INPUT1 => 5
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -163,7 +163,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
     /**
      * Check if test inferior operator is working
      *
-     * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching
+     * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching
      *
      */
     public function testNotMatchingRuleInferior()
@@ -180,12 +180,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getConditionEvaluator')
             ->will($this->returnValue(new ConditionEvaluator()));
 
-        $condition1 = new MatchForXArticlesManager($stubFacade);
+        $condition1 = new MatchForXArticles($stubFacade);
         $operators = array(
-            MatchForXArticlesManager::INPUT1 => Operators::INFERIOR
+            MatchForXArticles::INPUT1 => Operators::INFERIOR
         );
         $values = array(
-            MatchForXArticlesManager::INPUT1 => 4,
+            MatchForXArticles::INPUT1 => 4,
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -199,7 +199,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
     /**
      * Check if test inferior operator is working
      *
-     * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching
+     * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching
      *
      */
     public function testMatchingRuleInferiorEquals()
@@ -216,12 +216,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getConditionEvaluator')
             ->will($this->returnValue(new ConditionEvaluator()));
 
-        $condition1 = new MatchForXArticlesManager($stubFacade);
+        $condition1 = new MatchForXArticles($stubFacade);
         $operators = array(
-            MatchForXArticlesManager::INPUT1 => Operators::INFERIOR_OR_EQUAL,
+            MatchForXArticles::INPUT1 => Operators::INFERIOR_OR_EQUAL,
         );
         $values = array(
-            MatchForXArticlesManager::INPUT1 => 5,
+            MatchForXArticles::INPUT1 => 5,
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -235,7 +235,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
     /**
      * Check if test inferior operator is working
      *
-     * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching
+     * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching
      *
      */
     public function testMatchingRuleInferiorEquals2()
@@ -252,12 +252,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getConditionEvaluator')
             ->will($this->returnValue(new ConditionEvaluator()));
 
-        $condition1 = new MatchForXArticlesManager($stubFacade);
+        $condition1 = new MatchForXArticles($stubFacade);
         $operators = array(
-            MatchForXArticlesManager::INPUT1 => Operators::INFERIOR_OR_EQUAL
+            MatchForXArticles::INPUT1 => Operators::INFERIOR_OR_EQUAL
         );
         $values = array(
-            MatchForXArticlesManager::INPUT1 => 4
+            MatchForXArticles::INPUT1 => 4
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -271,7 +271,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
     /**
      * Check if test inferior operator is working
      *
-     * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching
+     * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching
      *
      */
     public function testNotMatchingRuleInferiorEquals()
@@ -288,12 +288,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getConditionEvaluator')
             ->will($this->returnValue(new ConditionEvaluator()));
 
-        $condition1 = new MatchForXArticlesManager($stubFacade);
+        $condition1 = new MatchForXArticles($stubFacade);
         $operators = array(
-            MatchForXArticlesManager::INPUT1 => Operators::INFERIOR_OR_EQUAL
+            MatchForXArticles::INPUT1 => Operators::INFERIOR_OR_EQUAL
         );
         $values = array(
-            MatchForXArticlesManager::INPUT1 => 3
+            MatchForXArticles::INPUT1 => 3
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -307,7 +307,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
     /**
      * Check if test equals operator is working
      *
-     * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching
+     * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching
      *
      */
     public function testMatchingRuleEqual()
@@ -324,12 +324,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getConditionEvaluator')
             ->will($this->returnValue(new ConditionEvaluator()));
 
-        $condition1 = new MatchForXArticlesManager($stubFacade);
+        $condition1 = new MatchForXArticles($stubFacade);
         $operators = array(
-            MatchForXArticlesManager::INPUT1 => Operators::EQUAL
+            MatchForXArticles::INPUT1 => Operators::EQUAL
         );
         $values = array(
-            MatchForXArticlesManager::INPUT1 => 4
+            MatchForXArticles::INPUT1 => 4
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -343,7 +343,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
     /**
      * Check if test equals operator is working
      *
-     * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching
+     * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching
      *
      */
     public function testNotMatchingRuleEqual()
@@ -360,12 +360,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getConditionEvaluator')
             ->will($this->returnValue(new ConditionEvaluator()));
 
-        $condition1 = new MatchForXArticlesManager($stubFacade);
+        $condition1 = new MatchForXArticles($stubFacade);
         $operators = array(
-            MatchForXArticlesManager::INPUT1 => Operators::EQUAL
+            MatchForXArticles::INPUT1 => Operators::EQUAL
         );
         $values = array(
-            MatchForXArticlesManager::INPUT1 => 5
+            MatchForXArticles::INPUT1 => 5
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -379,7 +379,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
     /**
      * Check if test superior operator is working
      *
-     * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching
+     * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching
      *
      */
     public function testMatchingRuleSuperiorEquals()
@@ -396,12 +396,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getConditionEvaluator')
             ->will($this->returnValue(new ConditionEvaluator()));
 
-        $condition1 = new MatchForXArticlesManager($stubFacade);
+        $condition1 = new MatchForXArticles($stubFacade);
         $operators = array(
-            MatchForXArticlesManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL
+            MatchForXArticles::INPUT1 => Operators::SUPERIOR_OR_EQUAL
         );
         $values = array(
-            MatchForXArticlesManager::INPUT1 => 4
+            MatchForXArticles::INPUT1 => 4
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -415,7 +415,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
     /**
      * Check if test superior operator is working
      *
-     * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching
+     * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching
      *
      */
     public function testMatchingRuleSuperiorEquals2()
@@ -432,12 +432,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getConditionEvaluator')
             ->will($this->returnValue(new ConditionEvaluator()));
 
-        $condition1 = new MatchForXArticlesManager($stubFacade);
+        $condition1 = new MatchForXArticles($stubFacade);
         $operators = array(
-            MatchForXArticlesManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL
+            MatchForXArticles::INPUT1 => Operators::SUPERIOR_OR_EQUAL
         );
         $values = array(
-            MatchForXArticlesManager::INPUT1 => 3
+            MatchForXArticles::INPUT1 => 3
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -451,7 +451,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
     /**
      * Check if test superior operator is working
      *
-     * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching
+     * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching
      *
      */
     public function testNotMatchingRuleSuperiorEquals()
@@ -468,12 +468,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getConditionEvaluator')
             ->will($this->returnValue(new ConditionEvaluator()));
 
-        $condition1 = new MatchForXArticlesManager($stubFacade);
+        $condition1 = new MatchForXArticles($stubFacade);
         $operators = array(
-            MatchForXArticlesManager::INPUT1 => Operators::SUPERIOR_OR_EQUAL
+            MatchForXArticles::INPUT1 => Operators::SUPERIOR_OR_EQUAL
         );
         $values = array(
-            MatchForXArticlesManager::INPUT1 => 5
+            MatchForXArticles::INPUT1 => 5
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -487,7 +487,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
     /**
      * Check if test superior operator is working
      *
-     * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching
+     * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching
      *
      */
     public function testMatchingRuleSuperior()
@@ -504,12 +504,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getConditionEvaluator')
             ->will($this->returnValue(new ConditionEvaluator()));
 
-        $condition1 = new MatchForXArticlesManager($stubFacade);
+        $condition1 = new MatchForXArticles($stubFacade);
         $operators = array(
-            MatchForXArticlesManager::INPUT1 => Operators::SUPERIOR
+            MatchForXArticles::INPUT1 => Operators::SUPERIOR
         );
         $values = array(
-            MatchForXArticlesManager::INPUT1 => 3
+            MatchForXArticles::INPUT1 => 3
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -523,7 +523,7 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
     /**
      * Check if test superior operator is working
      *
-     * @covers Thelia\Condition\Implementation\MatchForXArticlesManager::isMatching
+     * @covers Thelia\Condition\Implementation\MatchForXArticles::isMatching
      *
      */
     public function testNotMatchingRuleSuperior()
@@ -540,12 +540,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getConditionEvaluator')
             ->will($this->returnValue(new ConditionEvaluator()));
 
-        $condition1 = new MatchForXArticlesManager($stubFacade);
+        $condition1 = new MatchForXArticles($stubFacade);
         $operators = array(
-            MatchForXArticlesManager::INPUT1 => Operators::SUPERIOR
+            MatchForXArticles::INPUT1 => Operators::SUPERIOR
         );
         $values = array(
-            MatchForXArticlesManager::INPUT1 => 4
+            MatchForXArticles::INPUT1 => 4
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -570,12 +570,12 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getConditionEvaluator')
             ->will($this->returnValue(new ConditionEvaluator()));
 
-        $condition1 = new MatchForXArticlesManager($stubFacade);
+        $condition1 = new MatchForXArticles($stubFacade);
         $operators = array(
-            MatchForXArticlesManager::INPUT1 => Operators::SUPERIOR
+            MatchForXArticles::INPUT1 => Operators::SUPERIOR
         );
         $values = array(
-            MatchForXArticlesManager::INPUT1 => 4
+            MatchForXArticles::INPUT1 => 4
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
@@ -606,17 +606,17 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getConditionEvaluator')
             ->will($this->returnValue(new ConditionEvaluator()));
 
-        $condition1 = new MatchForXArticlesManager($stubFacade);
+        $condition1 = new MatchForXArticles($stubFacade);
         $operators = array(
-            MatchForXArticlesManager::INPUT1 => Operators::SUPERIOR
+            MatchForXArticles::INPUT1 => Operators::SUPERIOR
         );
         $values = array(
-            MatchForXArticlesManager::INPUT1 => 4
+            MatchForXArticles::INPUT1 => 4
         );
         $condition1->setValidatorsFromForm($operators, $values);
 
         $expected = array(
-            MatchForXArticlesManager::INPUT1 => array(
+            MatchForXArticles::INPUT1 => array(
                 Operators::INFERIOR,
                 Operators::INFERIOR_OR_EQUAL,
                 Operators::EQUAL,
@@ -630,6 +630,142 @@ class MatchForXArticlesManagerTest extends \PHPUnit_Framework_TestCase
 
     }
 
+    /**
+     * Generate adapter stub
+     *
+     * @param int    $cartTotalPrice   Cart total price
+     * @param string $checkoutCurrency Checkout currency
+     * @param string $i18nOutput       Output from each translation
+     *
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    public function generateFacadeStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR', $i18nOutput = '')
+    {
+        $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $stubFacade->expects($this->any())
+            ->method('getCartTotalPrice')
+            ->will($this->returnValue($cartTotalPrice));
+
+        $stubFacade->expects($this->any())
+            ->method('getCheckoutCurrency')
+            ->will($this->returnValue($checkoutCurrency));
+
+        $stubFacade->expects($this->any())
+            ->method('getConditionEvaluator')
+            ->will($this->returnValue(new ConditionEvaluator()));
+
+        $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubTranslator->expects($this->any())
+            ->method('trans')
+            ->will($this->returnValue($i18nOutput));
+
+        $stubFacade->expects($this->any())
+            ->method('getTranslator')
+            ->will($this->returnValue($stubTranslator));
+
+        return $stubFacade;
+    }
+
+    /**
+     * Check getName i18n
+     *
+     * @covers Thelia\Condition\Implementation\MatchForXArticles::getName
+     *
+     */
+    public function testGetName()
+    {
+        $stubFacade = $this->generateFacadeStub(399, 'EUR', 'Number of articles in cart');
+
+        /** @var FacadeInterface $stubFacade */
+        $condition1 = new MatchForXArticles($stubFacade);
+
+        $actual = $condition1->getName();
+        $expected = 'Number of articles in cart';
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check tooltip i18n
+     *
+     * @covers Thelia\Condition\Implementation\MatchForXArticles::getToolTip
+     *
+     */
+    public function testGetToolTip()
+    {
+        $stubFacade = $this->generateFacadeStub(399, 'EUR', 'If cart products quantity is <strong>superior to</strong> 4');
+
+        /** @var FacadeInterface $stubFacade */
+        $condition1 = new MatchForXArticles($stubFacade);
+        $operators = array(
+            MatchForXArticles::INPUT1 => Operators::SUPERIOR
+        );
+        $values = array(
+            MatchForXArticles::INPUT1 => 4
+        );
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $actual = $condition1->getToolTip();
+        $expected = 'If cart products quantity is <strong>superior to</strong> 4';
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Check validator
+     *
+     * @covers Thelia\Condition\Implementation\MatchForXArticles::generateInputs
+     *
+     */
+    public function testGetValidator()
+    {
+        $stubFacade = $this->generateFacadeStub(399, 'EUR', 'Price');
+
+        /** @var FacadeInterface $stubFacade */
+        $condition1 = new MatchForXArticles($stubFacade);
+        $operators = array(
+            MatchForXArticles::INPUT1 => Operators::SUPERIOR
+        );
+        $values = array(
+            MatchForXArticles::INPUT1 => 4
+        );
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $actual = $condition1->getValidators();
+
+        $validators = array(
+            'inputs' => array(
+                MatchForXArticles::INPUT1 => array(
+                    'title' => 'Price',
+                    'availableOperators' => array(
+                        '<' => 'Price',
+                        '<=' => 'Price',
+                        '==' => 'Price',
+                        '>=' => 'Price',
+                        '>' => 'Price'
+                    ),
+                    'type' => 'text',
+                    'class' => 'form-control',
+                    'value' => '',
+                    'selectedOperator' => ''
+                )
+            ),
+            'setOperators' => array(
+                'quantity' => '>'
+            ),
+            'setValues' => array(
+                'quantity' => 4
+            )
+        );
+        $expected = $validators;
+
+        $this->assertEquals($expected, $actual);
+
+    }
+
     /**
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.

core/lib/Thelia/Tests/Coupon/BaseFacadeTest.php

@@ -0,0 +1,272 @@
+<?php
+/**********************************************************************************/
+/*                                                                                */
+/*      Thelia	                                                                  */
+/*                                                                                */
+/*      Copyright (c) OpenStudio                                                  */
+/*      email : info@thelia.net                                                   */
+/*      web : http://www.thelia.net                                               */
+/*                                                                                */
+/*      This program is free software; you can redistribute it and/or modify      */
+/*      it under the terms of the GNU General Public License as published by      */
+/*      the Free Software Foundation; either version 3 of the License             */
+/*                                                                                */
+/*      This program is distributed in the hope that it will be useful,           */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of            */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             */
+/*      GNU General Public License for more details.                              */
+/*                                                                                */
+/*      You should have received a copy of the GNU General Public License         */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.      */
+/*                                                                                */
+/**********************************************************************************/
+
+namespace Thelia\Coupon;
+
+/**
+ * Created by JetBrains PhpStorm.
+ * Date: 8/19/13
+ * Time: 3:24 PM
+ *
+ * Unit Test BaseFacade Class
+ * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-11-17 at 18:59:24.
+ *
+ * @package Coupon
+ * @author  Guillaume MOREL <gmorel@openstudio.fr>
+ *
+ */
+class BaseFacadeTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
+
+    /**
+     * @covers Thelia\Coupon\BaseFacade::getCart
+     * @todo   Implement testGetCart().
+     */
+    public function testGetCart()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Thelia\Coupon\BaseFacade::getDeliveryAddress
+     * @todo   Implement testGetDeliveryAddress().
+     */
+    public function testGetDeliveryAddress()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Thelia\Coupon\BaseFacade::getCustomer
+     * @todo   Implement testGetCustomer().
+     */
+    public function testGetCustomer()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Thelia\Coupon\BaseFacade::getCheckoutTotalPrice
+     * @todo   Implement testGetCheckoutTotalPrice().
+     */
+    public function testGetCheckoutTotalPrice()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Thelia\Coupon\BaseFacade::getCheckoutPostagePrice
+     * @todo   Implement testGetCheckoutPostagePrice().
+     */
+    public function testGetCheckoutPostagePrice()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Thelia\Coupon\BaseFacade::getCartTotalPrice
+     * @todo   Implement testGetCartTotalPrice().
+     */
+    public function testGetCartTotalPrice()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Thelia\Coupon\BaseFacade::getCheckoutCurrency
+     * @todo   Implement testGetCheckoutCurrency().
+     */
+    public function testGetCheckoutCurrency()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Thelia\Coupon\BaseFacade::getNbArticlesInCart
+     * @todo   Implement testGetNbArticlesInCart().
+     */
+    public function testGetNbArticlesInCart()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Thelia\Coupon\BaseFacade::getCurrentCoupons
+     * @todo   Implement testGetCurrentCoupons().
+     */
+    public function testGetCurrentCoupons()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Thelia\Coupon\BaseFacade::findOneCouponByCode
+     * @todo   Implement testFindOneCouponByCode().
+     */
+    public function testFindOneCouponByCode()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Thelia\Coupon\BaseFacade::getContainer
+     * @todo   Implement testGetContainer().
+     */
+    public function testGetContainer()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Thelia\Coupon\BaseFacade::getTranslator
+     * @todo   Implement testGetTranslator().
+     */
+    public function testGetTranslator()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Thelia\Coupon\BaseFacade::getMainCurrency
+     * @todo   Implement testGetMainCurrency().
+     */
+    public function testGetMainCurrency()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Thelia\Coupon\BaseFacade::getRequest
+     * @todo   Implement testGetRequest().
+     */
+    public function testGetRequest()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Thelia\Coupon\BaseFacade::getConditionEvaluator
+     * @todo   Implement testGetConditionEvaluator().
+     */
+    public function testGetConditionEvaluator()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Thelia\Coupon\BaseFacade::getAvailableCurrencies
+     * @todo   Implement testGetAvailableCurrencies().
+     */
+    public function testGetAvailableCurrencies()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Thelia\Coupon\BaseFacade::getDispatcher
+     * @todo   Implement testGetDispatcher().
+     */
+    public function testGetDispatcher()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Thelia\Coupon\BaseFacade::getCartFromTrait
+     * @todo   Implement testGetCartFromTrait().
+     */
+    public function testGetCartFromTrait()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+}

core/lib/Thelia/Tests/Coupon/CouponFactoryTest.php

@@ -0,0 +1,405 @@
+<?php
+/**********************************************************************************/
+/*                                                                                */
+/*      Thelia	                                                                  */
+/*                                                                                */
+/*      Copyright (c) OpenStudio                                                  */
+/*      email : info@thelia.net                                                   */
+/*      web : http://www.thelia.net                                               */
+/*                                                                                */
+/*      This program is free software; you can redistribute it and/or modify      */
+/*      it under the terms of the GNU General Public License as published by      */
+/*      the Free Software Foundation; either version 3 of the License             */
+/*                                                                                */
+/*      This program is distributed in the hope that it will be useful,           */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of            */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             */
+/*      GNU General Public License for more details.                              */
+/*                                                                                */
+/*      You should have received a copy of the GNU General Public License         */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.      */
+/*                                                                                */
+/**********************************************************************************/
+
+namespace Thelia\Coupon;
+use Thelia\Condition\ConditionCollection;
+use Thelia\Condition\ConditionEvaluator;
+use Thelia\Condition\ConditionFactory;
+use Thelia\Condition\Implementation\MatchForTotalAmount;
+use Thelia\Condition\Operators;
+use Thelia\Coupon\Type\RemoveXAmount;
+use Thelia\Model\Coupon;
+use Thelia\Model\CurrencyQuery;
+
+/**
+ * Created by JetBrains PhpStorm.
+ * Date: 8/19/13
+ * Time: 3:24 PM
+ *
+ * Unit Test CouponFactory Class
+ * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-11-17 at 18:59:24.
+ *
+ * @package Coupon
+ * @author  Guillaume MOREL <gmorel@openstudio.fr>
+ *
+ */
+class CouponFactoryTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+    }
+
+    /**
+     * Generate adapter stub
+     *
+     * @param int    $cartTotalPrice   Cart total price
+     * @param string $checkoutCurrency Checkout currency
+     * @param string $i18nOutput       Output from each translation
+     *
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    public function generateFacadeStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR', $i18nOutput = '')
+    {
+        $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $currencies = CurrencyQuery::create();
+        $currencies = $currencies->find();
+        $stubFacade->expects($this->any())
+            ->method('getAvailableCurrencies')
+            ->will($this->returnValue($currencies));
+
+        $stubFacade->expects($this->any())
+            ->method('getCartTotalPrice')
+            ->will($this->returnValue($cartTotalPrice));
+
+        $stubFacade->expects($this->any())
+            ->method('getCheckoutCurrency')
+            ->will($this->returnValue($checkoutCurrency));
+
+        $stubFacade->expects($this->any())
+            ->method('getConditionEvaluator')
+            ->will($this->returnValue(new ConditionEvaluator()));
+
+        $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubTranslator->expects($this->any())
+            ->method('trans')
+            ->will($this->returnValue($i18nOutput));
+
+        $stubFacade->expects($this->any())
+            ->method('getTranslator')
+            ->will($this->returnValue($stubTranslator));
+
+        return $stubFacade;
+    }
+
+    /**
+     * Generate a valid Coupon model
+     */
+    public function generateCouponModel($facade, ConditionFactory $conditionFactory)
+    {
+        // Coupons
+        $coupon1 = new Coupon();
+        $coupon1->setCode('XMAS');
+        $coupon1->setType('thelia.coupon.type.remove_x_amount');
+        $coupon1->setTitle('Christmas coupon');
+        $coupon1->setShortDescription('Coupon for Christmas removing 10€ if your total checkout is more than 40€');
+        $coupon1->setDescription('Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras at luctus tellus. Integer turpis mauris, aliquet vitae risus tristique, pellentesque vestibulum urna. Vestibulum sodales laoreet lectus dictum suscipit. Praesent vulputate, sem id varius condimentum, quam magna tempor elit, quis venenatis ligula nulla eget libero. Cras egestas euismod tellus, id pharetra leo suscipit quis. Donec lacinia ac lacus et ultricies. Nunc in porttitor neque. Proin at quam congue, consectetur orci sed, congue nulla. Nulla eleifend nunc ligula, nec pharetra elit tempus quis. Vivamus vel mauris sed est dictum blandit. Maecenas blandit dapibus velit ut sollicitudin. In in euismod mauris, consequat viverra magna. Cras velit velit, sollicitudin commodo tortor gravida, tempus varius nulla.
+
+Donec rhoncus leo mauris, id porttitor ante luctus tempus. Curabitur quis augue feugiat, ullamcorper mauris ac, interdum mi. Quisque aliquam lorem vitae felis lobortis, id interdum turpis mattis. Vestibulum diam massa, ornare congue blandit quis, facilisis at nisl. In tortor metus, venenatis non arcu nec, sollicitudin ornare nisl. Nunc erat risus, varius nec urna at, iaculis lacinia elit. Aenean ut felis tempus, tincidunt odio non, sagittis nisl. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec vitae hendrerit elit. Nunc sit amet gravida risus, euismod lobortis massa. Nam a erat mauris. Nam a malesuada lorem. Nulla id accumsan dolor, sed rhoncus tellus. Quisque dictum felis sed leo auctor, at volutpat lectus viverra. Morbi rutrum, est ac aliquam imperdiet, nibh sem sagittis justo, ac mattis magna lacus eu nulla.
+
+Duis interdum lectus nulla, nec pellentesque sapien condimentum at. Suspendisse potenti. Sed eu purus tellus. Nunc quis rhoncus metus. Fusce vitae tellus enim. Interdum et malesuada fames ac ante ipsum primis in faucibus. Etiam tempor porttitor erat vitae iaculis. Sed est elit, consequat non ornare vitae, vehicula eget lectus. Etiam consequat sapien mauris, eget consectetur magna imperdiet eget. Nunc sollicitudin luctus velit, in commodo nulla adipiscing fermentum. Fusce nisi sapien, posuere vitae metus sit amet, facilisis sollicitudin dui. Fusce ultricies auctor enim sit amet iaculis. Morbi at vestibulum enim, eget adipiscing eros.
+
+Praesent ligula lorem, faucibus ut metus quis, fermentum iaculis erat. Pellentesque elit erat, lacinia sed semper ac, sagittis vel elit. Nam eu convallis est. Curabitur rhoncus odio vitae consectetur pellentesque. Nam vitae arcu nec ante scelerisque dignissim vel nec neque. Suspendisse augue nulla, mollis eget dui et, tempor facilisis erat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ac diam ipsum. Donec convallis dui ultricies velit auctor, non lobortis nulla ultrices. Morbi vitae dignissim ante, sit amet lobortis tortor. Nunc dapibus condimentum augue, in molestie neque congue non.
+
+Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesuada tortor vel erat volutpat tincidunt. In vehicula diam est, a convallis eros scelerisque ut. Donec aliquet venenatis iaculis. Ut a arcu gravida, placerat dui eu, iaculis nisl. Quisque adipiscing orci sit amet dui dignissim lacinia. Sed vulputate lorem non dolor adipiscing ornare. Morbi ornare id nisl id aliquam. Ut fringilla elit ante, nec lacinia enim fermentum sit amet. Aenean rutrum lorem eu convallis pharetra. Cras malesuada varius metus, vitae gravida velit. Nam a varius ipsum, ac commodo dolor. Phasellus nec elementum elit. Etiam vel adipiscing leo.');
+        $coupon1->setAmount(10.00);
+        $coupon1->setIsUsed(true);
+        $coupon1->setIsEnabled(true);
+        $date = new \DateTime();
+        $coupon1->setExpirationDate($date->setTimestamp(strtotime("today + 3 months")));
+
+        $condition1 = new MatchForTotalAmount($facade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 40.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $condition2 = new MatchForTotalAmount($facade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::INFERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition2->setValidatorsFromForm($operators, $values);
+
+        $conditions = new ConditionCollection();
+        $conditions->add($condition1);
+        $conditions->add($condition2);
+
+        $serializedConditions = $conditionFactory->serializeConditionCollection($conditions);
+        $coupon1->setSerializedConditions($serializedConditions);
+
+
+        $coupon1->setMaxUsage(40);
+        $coupon1->setIsCumulative(true);
+        $coupon1->setIsRemovingPostage(false);
+        $coupon1->setIsAvailableOnSpecialOffers(true);
+
+        return $coupon1;
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
+
+    /**
+     * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode
+     */
+    public function testBuildCouponFromCode()
+    {
+        $stubFacade = $this->generateFacadeStub();
+
+        $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container');
+
+        $conditionFactory = new ConditionFactory($stubContainer);
+        $couponModel = $this->generateCouponModel($stubFacade, $conditionFactory);
+        $stubFacade->expects($this->any())
+            ->method('findOneCouponByCode')
+            ->will($this->returnValue($couponModel));
+
+        $couponManager = new RemoveXAmount($stubFacade);
+
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 40.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $condition2 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::INFERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition2->setValidatorsFromForm($operators, $values);
+
+        $conditions = new ConditionCollection();
+        $conditions->add($condition1);
+        $conditions->add($condition2);
+        $stubConditionFactory = $this->getMockBuilder('\Thelia\Condition\ConditionFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubConditionFactory->expects($this->any())
+            ->method('unserializeConditionCollection')
+            ->will($this->returnValue($conditions));
+
+
+        $stubContainer->expects($this->any())
+            ->method('get')
+            ->will($this->onConsecutiveCalls($stubFacade, $couponManager, $stubConditionFactory));
+
+        $stubContainer->expects($this->any())
+            ->method('has')
+            ->will($this->returnValue(true));
+
+        $factory = new CouponFactory($stubContainer);
+        $expected = $couponManager;
+        $actual = $factory->buildCouponFromCode('XMAS');
+
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode
+     */
+    public function testBuildCouponFromCodeUnknownCode()
+    {
+        $stubFacade = $this->generateFacadeStub();
+
+        $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container');
+
+        $conditionFactory = new ConditionFactory($stubContainer);
+        $stubFacade->expects($this->any())
+            ->method('findOneCouponByCode')
+            ->will($this->returnValue(null));
+
+        $couponManager = new RemoveXAmount($stubFacade);
+
+
+
+        $stubContainer->expects($this->any())
+            ->method('get')
+            ->will($this->onConsecutiveCalls($stubFacade, $couponManager));
+
+        $stubContainer->expects($this->any())
+            ->method('has')
+            ->will($this->returnValue(true));
+
+        $factory = new CouponFactory($stubContainer);
+        $actual = $factory->buildCouponFromCode('XMAS');
+        $expected = false;
+
+        $this->assertEquals($expected, $actual, 'CouponFactory->buildCouponFromCode should return false if the given code is unknown');
+
+    }
+
+    /**
+     * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode
+     * @expectedException \Thelia\Exception\CouponExpiredException
+     */
+    public function testBuildCouponFromCodeExpiredCoupon()
+    {
+        $stubFacade = $this->generateFacadeStub();
+
+        $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container');
+
+        $conditionFactory = new ConditionFactory($stubContainer);
+        $couponModel = $this->generateCouponModel($stubFacade, $conditionFactory);
+        $date = new \DateTime();
+        $couponModel->setExpirationDate($date->setTimestamp(strtotime("today - 3 months")));
+        $stubFacade->expects($this->any())
+            ->method('findOneCouponByCode')
+            ->will($this->returnValue($couponModel));
+
+        $couponManager = new RemoveXAmount($stubFacade);
+
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 40.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $condition2 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::INFERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition2->setValidatorsFromForm($operators, $values);
+
+        $conditions = new ConditionCollection();
+        $conditions->add($condition1);
+        $conditions->add($condition2);
+        $stubConditionFactory = $this->getMockBuilder('\Thelia\Condition\ConditionFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubConditionFactory->expects($this->any())
+            ->method('unserializeConditionCollection')
+            ->will($this->returnValue($conditions));
+
+
+        $stubContainer->expects($this->any())
+            ->method('get')
+            ->will($this->onConsecutiveCalls($stubFacade, $couponManager, $stubConditionFactory));
+
+        $stubContainer->expects($this->any())
+            ->method('has')
+            ->will($this->returnValue(true));
+
+        $factory = new CouponFactory($stubContainer);
+        $actual = $factory->buildCouponFromCode('XMAS');
+
+    }
+
+    /**
+     * @covers Thelia\Coupon\CouponFactory::buildCouponFromCode
+     * @expectedException \Thelia\Exception\InvalidConditionException
+     */
+    public function testBuildCouponFromCodeNoConditionCoupon()
+    {
+        $stubFacade = $this->generateFacadeStub();
+
+        $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container');
+
+        $conditionFactory = new ConditionFactory($stubContainer);
+        $couponModel = $this->generateCouponModel($stubFacade, $conditionFactory);
+        $stubFacade->expects($this->any())
+            ->method('findOneCouponByCode')
+            ->will($this->returnValue($couponModel));
+
+        $couponManager = new RemoveXAmount($stubFacade);
+
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 40.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $condition2 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::INFERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition2->setValidatorsFromForm($operators, $values);
+
+        $conditions = new ConditionCollection();
+        $stubConditionFactory = $this->getMockBuilder('\Thelia\Condition\ConditionFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubConditionFactory->expects($this->any())
+            ->method('unserializeConditionCollection')
+            ->will($this->returnValue($conditions));
+
+
+        $stubContainer->expects($this->any())
+            ->method('get')
+            ->will($this->onConsecutiveCalls($stubFacade, $couponManager, $stubConditionFactory));
+
+        $stubContainer->expects($this->any())
+            ->method('has')
+            ->will($this->returnValue(true));
+
+        $factory = new CouponFactory($stubContainer);
+        $actual = $factory->buildCouponFromCode('XMAS');
+
+    }
+}

core/lib/Thelia/Tests/Coupon/CouponManagerTest.php

@@ -0,0 +1,580 @@
+<?php
+/**********************************************************************************/
+/*                                                                                */
+/*      Thelia	                                                                  */
+/*                                                                                */
+/*      Copyright (c) OpenStudio                                                  */
+/*      email : info@thelia.net                                                   */
+/*      web : http://www.thelia.net                                               */
+/*                                                                                */
+/*      This program is free software; you can redistribute it and/or modify      */
+/*      it under the terms of the GNU General Public License as published by      */
+/*      the Free Software Foundation; either version 3 of the License             */
+/*                                                                                */
+/*      This program is distributed in the hope that it will be useful,           */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of            */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             */
+/*      GNU General Public License for more details.                              */
+/*                                                                                */
+/*      You should have received a copy of the GNU General Public License         */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.      */
+/*                                                                                */
+/**********************************************************************************/
+
+namespace Thelia\Coupon;
+use Thelia\Condition\ConditionCollection;
+use Thelia\Condition\ConditionEvaluator;
+use Thelia\Condition\ConditionFactory;
+use Thelia\Condition\Implementation\MatchForTotalAmount;
+use Thelia\Condition\Operators;
+use Thelia\Coupon\Type\RemoveXAmount;
+use Thelia\Model\Coupon;
+use Thelia\Model\CurrencyQuery;
+
+/**
+ * Created by JetBrains PhpStorm.
+ * Date: 8/19/13
+ * Time: 3:24 PM
+ *
+ * Unit Test CouponManager Class
+ * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-11-17 at 18:59:24.
+ *
+ * @package Coupon
+ * @author  Guillaume MOREL <gmorel@openstudio.fr>
+ *
+ */
+class CouponManagerTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
+
+
+    /**
+     * Generate a valid Coupon model
+     */
+    public function generateCouponModel($facade, ConditionFactory $conditionFactory)
+    {
+        // Coupons
+        $coupon1 = new Coupon();
+        $coupon1->setCode('XMAS');
+        $coupon1->setType('thelia.coupon.type.remove_x_amount');
+        $coupon1->setTitle('Christmas coupon');
+        $coupon1->setShortDescription('Coupon for Christmas removing 10€ if your total checkout is more than 40€');
+        $coupon1->setDescription('Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras at luctus tellus. Integer turpis mauris, aliquet vitae risus tristique, pellentesque vestibulum urna. Vestibulum sodales laoreet lectus dictum suscipit. Praesent vulputate, sem id varius condimentum, quam magna tempor elit, quis venenatis ligula nulla eget libero. Cras egestas euismod tellus, id pharetra leo suscipit quis. Donec lacinia ac lacus et ultricies. Nunc in porttitor neque. Proin at quam congue, consectetur orci sed, congue nulla. Nulla eleifend nunc ligula, nec pharetra elit tempus quis. Vivamus vel mauris sed est dictum blandit. Maecenas blandit dapibus velit ut sollicitudin. In in euismod mauris, consequat viverra magna. Cras velit velit, sollicitudin commodo tortor gravida, tempus varius nulla.
+
+Donec rhoncus leo mauris, id porttitor ante luctus tempus. Curabitur quis augue feugiat, ullamcorper mauris ac, interdum mi. Quisque aliquam lorem vitae felis lobortis, id interdum turpis mattis. Vestibulum diam massa, ornare congue blandit quis, facilisis at nisl. In tortor metus, venenatis non arcu nec, sollicitudin ornare nisl. Nunc erat risus, varius nec urna at, iaculis lacinia elit. Aenean ut felis tempus, tincidunt odio non, sagittis nisl. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec vitae hendrerit elit. Nunc sit amet gravida risus, euismod lobortis massa. Nam a erat mauris. Nam a malesuada lorem. Nulla id accumsan dolor, sed rhoncus tellus. Quisque dictum felis sed leo auctor, at volutpat lectus viverra. Morbi rutrum, est ac aliquam imperdiet, nibh sem sagittis justo, ac mattis magna lacus eu nulla.
+
+Duis interdum lectus nulla, nec pellentesque sapien condimentum at. Suspendisse potenti. Sed eu purus tellus. Nunc quis rhoncus metus. Fusce vitae tellus enim. Interdum et malesuada fames ac ante ipsum primis in faucibus. Etiam tempor porttitor erat vitae iaculis. Sed est elit, consequat non ornare vitae, vehicula eget lectus. Etiam consequat sapien mauris, eget consectetur magna imperdiet eget. Nunc sollicitudin luctus velit, in commodo nulla adipiscing fermentum. Fusce nisi sapien, posuere vitae metus sit amet, facilisis sollicitudin dui. Fusce ultricies auctor enim sit amet iaculis. Morbi at vestibulum enim, eget adipiscing eros.
+
+Praesent ligula lorem, faucibus ut metus quis, fermentum iaculis erat. Pellentesque elit erat, lacinia sed semper ac, sagittis vel elit. Nam eu convallis est. Curabitur rhoncus odio vitae consectetur pellentesque. Nam vitae arcu nec ante scelerisque dignissim vel nec neque. Suspendisse augue nulla, mollis eget dui et, tempor facilisis erat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ac diam ipsum. Donec convallis dui ultricies velit auctor, non lobortis nulla ultrices. Morbi vitae dignissim ante, sit amet lobortis tortor. Nunc dapibus condimentum augue, in molestie neque congue non.
+
+Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesuada tortor vel erat volutpat tincidunt. In vehicula diam est, a convallis eros scelerisque ut. Donec aliquet venenatis iaculis. Ut a arcu gravida, placerat dui eu, iaculis nisl. Quisque adipiscing orci sit amet dui dignissim lacinia. Sed vulputate lorem non dolor adipiscing ornare. Morbi ornare id nisl id aliquam. Ut fringilla elit ante, nec lacinia enim fermentum sit amet. Aenean rutrum lorem eu convallis pharetra. Cras malesuada varius metus, vitae gravida velit. Nam a varius ipsum, ac commodo dolor. Phasellus nec elementum elit. Etiam vel adipiscing leo.');
+        $coupon1->setAmount(10.00);
+        $coupon1->setIsUsed(true);
+        $coupon1->setIsEnabled(true);
+        $date = new \DateTime();
+        $coupon1->setExpirationDate($date->setTimestamp(strtotime("today + 3 months")));
+
+        $condition1 = new MatchForTotalAmount($facade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 40.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $condition2 = new MatchForTotalAmount($facade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::INFERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition2->setValidatorsFromForm($operators, $values);
+
+        $conditions = new ConditionCollection();
+        $conditions->add($condition1);
+        $conditions->add($condition2);
+
+        $serializedConditions = $conditionFactory->serializeConditionCollection($conditions);
+        $coupon1->setSerializedConditions($serializedConditions);
+
+
+        $coupon1->setMaxUsage(40);
+        $coupon1->setIsCumulative(true);
+        $coupon1->setIsRemovingPostage(true);
+        $coupon1->setIsAvailableOnSpecialOffers(true);
+
+        return $coupon1;
+    }
+
+    /**
+     * @covers Thelia\Coupon\CouponManager::getDiscount
+     * @covers Thelia\Coupon\CouponManager::isCouponRemovingPostage
+     * @covers Thelia\Coupon\CouponManager::sortCoupons
+     * @covers Thelia\Coupon\CouponManager::getEffect
+     */
+    public function testGetDiscountCumulativeRemovingPostage()
+    {
+        $stubFacade = $this->generateFacadeStub();
+        $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container');
+
+        $conditionFactory = new ConditionFactory($stubContainer);
+
+        $conditions = new ConditionCollection();
+        $stubConditionFactory = $this->getMockBuilder('\Thelia\Condition\ConditionFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubConditionFactory->expects($this->any())
+            ->method('unserializeConditionCollection')
+            ->will($this->returnValue($conditions));
+
+        $couponManager = new RemoveXAmount($stubFacade);
+        $stubContainer->expects($this->any())
+            ->method('get')
+            ->will($this->onConsecutiveCalls($stubFacade, $couponManager, $stubConditionFactory, clone $couponManager, $stubConditionFactory, $stubFacade));
+        $stubContainer->expects($this->any())
+            ->method('has')
+            ->will($this->returnValue(true));
+
+        $couponFactory = new CouponFactory($stubContainer);
+        $model1 = $this->generateCouponModel($stubFacade, $conditionFactory);
+        $model1->setAmount(21.00);
+        $coupon1 = $couponFactory->buildCouponFromModel($model1);
+
+        $model2 = $this->generateCouponModel($stubFacade, $conditionFactory);
+        $model2->setCode('XMAS2')->setIsRemovingPostage(true)->setAmount(21.50);
+        $coupon2 = $couponFactory->buildCouponFromModel($model2);
+
+        $stubFacade->expects($this->any())
+            ->method('getCurrentCoupons')
+            ->will($this->returnValue(array($coupon1, $coupon2)));
+        $stubFacade->expects($this->any())
+            ->method('getCheckoutPostagePrice')
+            ->will($this->returnValue(8.30));
+        $stubFacade->expects($this->any())
+            ->method('getCartTotalPrice')
+            ->will($this->returnValue(122.53));
+
+        $couponManager = new CouponManager($stubContainer);
+        $couponManager->addAvailableCoupon($coupon1);
+        $couponManager->addAvailableCoupon($coupon2);
+        $actual = $couponManager->getDiscount();
+        $expected = 50.80;
+
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * @covers Thelia\Coupon\CouponManager::getDiscount
+     * @covers Thelia\Coupon\CouponManager::isCouponRemovingPostage
+     * @covers Thelia\Coupon\CouponManager::sortCoupons
+     * @covers Thelia\Coupon\CouponManager::getEffect
+     */
+    public function testGetDiscountNonCumulativeNotRemovingPostage()
+    {
+        $stubFacade = $this->generateFacadeStub();
+        $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container');
+
+        $conditionFactory = new ConditionFactory($stubContainer);
+
+        $conditions = new ConditionCollection();
+        $stubConditionFactory = $this->getMockBuilder('\Thelia\Condition\ConditionFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubConditionFactory->expects($this->any())
+            ->method('unserializeConditionCollection')
+            ->will($this->returnValue($conditions));
+
+        $couponManager = new RemoveXAmount($stubFacade);
+        $stubContainer->expects($this->any())
+            ->method('get')
+            ->will($this->onConsecutiveCalls($stubFacade, $couponManager, $stubConditionFactory, clone $couponManager, $stubConditionFactory, $stubFacade));
+        $stubContainer->expects($this->any())
+            ->method('has')
+            ->will($this->returnValue(true));
+
+        $couponFactory = new CouponFactory($stubContainer);
+        $model1 = $this->generateCouponModel($stubFacade, $conditionFactory);
+        $model1->setAmount(21.00);
+        $coupon1 = $couponFactory->buildCouponFromModel($model1);
+
+        $model2 = $this->generateCouponModel($stubFacade, $conditionFactory);
+        $model2->setCode('XMAS2')->setIsRemovingPostage(false)->setAmount(21.50)->setIsCumulative(false);
+        $coupon2 = $couponFactory->buildCouponFromModel($model2);
+
+        $stubFacade->expects($this->any())
+            ->method('getCurrentCoupons')
+            ->will($this->returnValue(array($coupon1, $coupon2)));
+        $stubFacade->expects($this->any())
+            ->method('getCheckoutPostagePrice')
+            ->will($this->returnValue(8.30));
+        $stubFacade->expects($this->any())
+            ->method('getCartTotalPrice')
+            ->will($this->returnValue(122.53));
+
+        $couponManager = new CouponManager($stubContainer);
+        $couponManager->addAvailableCoupon($coupon1);
+        $couponManager->addAvailableCoupon($coupon2);
+        $actual = $couponManager->getDiscount();
+        $expected = 21.50;
+
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * @covers Thelia\Coupon\CouponManager::getDiscount
+     * @covers Thelia\Coupon\CouponManager::isCouponRemovingPostage
+     * @covers Thelia\Coupon\CouponManager::sortCoupons
+     * @covers Thelia\Coupon\CouponManager::getEffect
+     */
+    public function testGetDiscountGreaterThanCartAmount()
+    {
+        $stubFacade = $this->generateFacadeStub(12.25);
+        $stubFacade->expects($this->any())
+            ->method('getCheckoutPostagePrice')
+            ->will($this->returnValue(8.30));
+
+        $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container');
+
+        $conditionFactory = new ConditionFactory($stubContainer);
+
+        $conditions = new ConditionCollection();
+        $stubConditionFactory = $this->getMockBuilder('\Thelia\Condition\ConditionFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubConditionFactory->expects($this->any())
+            ->method('unserializeConditionCollection')
+            ->will($this->returnValue($conditions));
+
+        $couponManager = new RemoveXAmount($stubFacade);
+        $stubContainer->expects($this->any())
+            ->method('get')
+            ->will($this->onConsecutiveCalls($stubFacade, $couponManager, $stubConditionFactory, clone $couponManager, $stubConditionFactory, $stubFacade));
+        $stubContainer->expects($this->any())
+            ->method('has')
+            ->will($this->returnValue(true));
+
+        $couponFactory = new CouponFactory($stubContainer);
+        $model1 = $this->generateCouponModel($stubFacade, $conditionFactory);
+        $model1->setAmount(21.00);
+        $coupon1 = $couponFactory->buildCouponFromModel($model1);
+
+        $model2 = $this->generateCouponModel($stubFacade, $conditionFactory);
+        $model2->setCode('XMAS2')->setIsRemovingPostage(false)->setAmount(21.50)->setIsCumulative(false);
+        $coupon2 = $couponFactory->buildCouponFromModel($model2);
+
+        $stubFacade->expects($this->any())
+            ->method('getCurrentCoupons')
+            ->will($this->returnValue(array($coupon1, $coupon2)));
+
+        $couponManager = new CouponManager($stubContainer);
+        $couponManager->addAvailableCoupon($coupon1);
+        $couponManager->addAvailableCoupon($coupon2);
+        $actual = $couponManager->getDiscount();
+        $expected = 12.25;
+
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * @covers Thelia\Coupon\CouponManager::addAvailableCoupon
+     * @covers Thelia\Coupon\CouponManager::getAvailableCoupons
+     */
+    public function testGetAvailableCoupons()
+    {
+        $stubFacade = $this->generateFacadeStub();
+        $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container');
+
+        $conditionFactory = new ConditionFactory($stubContainer);
+
+
+
+        $stubFacade->expects($this->any())
+            ->method('getCurrentCoupons')
+            ->will($this->returnValue(array()));
+
+        $conditions = new ConditionCollection();
+        $stubConditionFactory = $this->getMockBuilder('\Thelia\Condition\ConditionFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubConditionFactory->expects($this->any())
+            ->method('unserializeConditionCollection')
+            ->will($this->returnValue($conditions));
+
+        $couponManager = new RemoveXAmount($stubFacade);
+        $stubContainer->expects($this->any())
+            ->method('get')
+            ->will($this->onConsecutiveCalls($stubFacade, $couponManager, $stubConditionFactory, $stubFacade));
+        $stubContainer->expects($this->any())
+            ->method('has')
+            ->will($this->returnValue(true));
+
+        $couponFactory = new CouponFactory($stubContainer);
+        $model1 = $this->generateCouponModel($stubFacade, $conditionFactory);
+        $coupon1 = $couponFactory->buildCouponFromModel($model1);
+        $coupon2 = clone $coupon1;
+
+
+        $couponManager = new CouponManager($stubContainer);
+        $couponManager->addAvailableCoupon($coupon1);
+        $couponManager->addAvailableCoupon($coupon2);
+        $actual = $couponManager->getAvailableCoupons();
+        $expected = array($coupon1, $coupon2);
+
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * @covers Thelia\Coupon\CouponManager::addAvailableCondition
+     * @covers Thelia\Coupon\CouponManager::getAvailableConditions
+     */
+    public function testGetAvailableConditions()
+    {
+        $stubFacade = $this->generateFacadeStub();
+        $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container');
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 40.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $condition2 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::INFERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition2->setValidatorsFromForm($operators, $values);
+
+        $conditions = new ConditionCollection();
+        $conditions->add($condition1);
+        $conditions->add($condition2);
+
+        $stubFacade->expects($this->any())
+            ->method('getCurrentCoupons')
+            ->will($this->returnValue(array()));
+
+        $stubContainer->expects($this->any())
+            ->method('get')
+            ->will($this->onConsecutiveCalls($stubFacade));
+
+
+        $couponManager = new CouponManager($stubContainer);
+        $couponManager->addAvailableCondition($condition1);
+        $couponManager->addAvailableCondition($condition2);
+        $actual = $couponManager->getAvailableConditions();
+        $expected = array($condition1, $condition2);
+
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * @covers Thelia\Coupon\CouponManager::decrementQuantity
+     */
+    public function testDecrementeQuantity()
+    {
+        $stubFacade = $this->generateFacadeStub();
+        $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container');
+
+        $coupon = new RemoveXAmount($stubFacade);
+        $date = new \DateTime();
+        $coupon->set($stubFacade, 'XMAS', '', '', '', 21.00, true, true, true, true, 254, $date->setTimestamp(strtotime("today + 3 months")) );
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 40.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $condition2 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::INFERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition2->setValidatorsFromForm($operators, $values);
+
+        $conditions = new ConditionCollection();
+        $conditions->add($condition1);
+        $conditions->add($condition2);
+        $coupon->setConditions($conditions);
+
+        $stubFacade->expects($this->any())
+            ->method('getCurrentCoupons')
+            ->will($this->returnValue(array($coupon)));
+
+        $stubContainer->expects($this->any())
+            ->method('get')
+            ->will($this->onConsecutiveCalls($stubFacade));
+
+
+        $couponManager = new CouponManager($stubContainer);
+
+
+        $stubModel = $this->getMockBuilder('\Thelia\Model\Coupon')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubModel->expects($this->any())
+            ->method('getMaxUsage')
+            ->will($this->returnValue(21));
+        $stubModel->expects($this->any())
+            ->method('setMaxUsage')
+            ->will($this->returnValue(true));
+
+        $actual = $couponManager->decrementQuantity($stubModel);
+        $expected = 20;
+
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * @covers Thelia\Coupon\CouponManager::decrementQuantity
+     */
+    public function testDecrementeQuantityIllimited()
+    {
+        $stubFacade = $this->generateFacadeStub();
+        $stubContainer = $this->getMock('\Symfony\Component\DependencyInjection\Container');
+
+        $coupon = new RemoveXAmount($stubFacade);
+        $date = new \DateTime();
+        $coupon->set($stubFacade, 'XMAS', '', '', '', 21.00, true, true, true, true, 254, $date->setTimestamp(strtotime("today + 3 months")) );
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 40.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $condition2 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::INFERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition2->setValidatorsFromForm($operators, $values);
+
+        $conditions = new ConditionCollection();
+        $conditions->add($condition1);
+        $conditions->add($condition2);
+        $coupon->setConditions($conditions);
+
+        $stubFacade->expects($this->any())
+            ->method('getCurrentCoupons')
+            ->will($this->returnValue(array($coupon)));
+
+        $stubContainer->expects($this->any())
+            ->method('get')
+            ->will($this->onConsecutiveCalls($stubFacade));
+
+
+        $couponManager = new CouponManager($stubContainer);
+
+
+        $stubModel = $this->getMockBuilder('\Thelia\Model\Coupon')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubModel->expects($this->any())
+            ->method('getMaxUsage')
+            ->will($this->returnValue(-1));
+        $stubModel->expects($this->any())
+            ->method('setMaxUsage')
+            ->will($this->returnValue(true));
+
+        $actual = $couponManager->decrementQuantity($stubModel);
+        $expected = -1;
+
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Generate adapter stub
+     *
+     * @param int    $cartTotalPrice   Cart total price
+     * @param string $checkoutCurrency Checkout currency
+     * @param string $i18nOutput       Output from each translation
+     *
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    public function generateFacadeStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR', $i18nOutput = '')
+    {
+        $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $currencies = CurrencyQuery::create();
+        $currencies = $currencies->find();
+        $stubFacade->expects($this->any())
+            ->method('getAvailableCurrencies')
+            ->will($this->returnValue($currencies));
+
+        $stubFacade->expects($this->any())
+            ->method('getCartTotalPrice')
+            ->will($this->returnValue($cartTotalPrice));
+
+        $stubFacade->expects($this->any())
+            ->method('getCheckoutCurrency')
+            ->will($this->returnValue($checkoutCurrency));
+
+        $stubFacade->expects($this->any())
+            ->method('getConditionEvaluator')
+            ->will($this->returnValue(new ConditionEvaluator()));
+
+        $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubTranslator->expects($this->any())
+            ->method('trans')
+            ->will($this->returnValue($i18nOutput));
+
+        $stubFacade->expects($this->any())
+            ->method('getTranslator')
+            ->will($this->returnValue($stubTranslator));
+
+        return $stubFacade;
+    }
+}

core/lib/Thelia/Tests/Coupon/Type/RemoveXAmountTest.php

@@ -0,0 +1,214 @@
+<?php
+/**********************************************************************************/
+/*                                                                                */
+/*      Thelia	                                                                  */
+/*                                                                                */
+/*      Copyright (c) OpenStudio                                                  */
+/*      email : info@thelia.net                                                   */
+/*      web : http://www.thelia.net                                               */
+/*                                                                                */
+/*      This program is free software; you can redistribute it and/or modify      */
+/*      it under the terms of the GNU General Public License as published by      */
+/*      the Free Software Foundation; either version 3 of the License             */
+/*                                                                                */
+/*      This program is distributed in the hope that it will be useful,           */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of            */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             */
+/*      GNU General Public License for more details.                              */
+/*                                                                                */
+/*      You should have received a copy of the GNU General Public License         */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.      */
+/*                                                                                */
+/**********************************************************************************/
+
+namespace Thelia\Coupon\Type;
+use Thelia\Condition\ConditionCollection;
+use Thelia\Condition\ConditionEvaluator;
+use Thelia\Condition\Implementation\MatchForTotalAmount;
+use Thelia\Condition\Operators;
+use Thelia\Coupon\FacadeInterface;
+use Thelia\Model\CurrencyQuery;
+
+/**
+ * Created by JetBrains PhpStorm.
+ * Date: 8/19/13
+ * Time: 3:24 PM
+ *
+ * Unit Test RemoveXAmount Class
+ * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-11-17 at 18:59:24.
+ *
+ * @package Coupon
+ * @author  Guillaume MOREL <gmorel@openstudio.fr>
+ *
+ */
+class RemoveXAmountTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+    }
+
+    /**
+     * Generate adapter stub
+     *
+     * @param int    $cartTotalPrice   Cart total price
+     * @param string $checkoutCurrency Checkout currency
+     * @param string $i18nOutput       Output from each translation
+     *
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    public function generateFacadeStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR', $i18nOutput = '')
+    {
+        $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $currencies = CurrencyQuery::create();
+        $currencies = $currencies->find();
+        $stubFacade->expects($this->any())
+            ->method('getAvailableCurrencies')
+            ->will($this->returnValue($currencies));
+
+        $stubFacade->expects($this->any())
+            ->method('getCartTotalPrice')
+            ->will($this->returnValue($cartTotalPrice));
+
+        $stubFacade->expects($this->any())
+            ->method('getCheckoutCurrency')
+            ->will($this->returnValue($checkoutCurrency));
+
+        $stubFacade->expects($this->any())
+            ->method('getConditionEvaluator')
+            ->will($this->returnValue(new ConditionEvaluator()));
+
+        $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubTranslator->expects($this->any())
+            ->method('trans')
+            ->will($this->returnValue($i18nOutput));
+
+        $stubFacade->expects($this->any())
+            ->method('getTranslator')
+            ->will($this->returnValue($stubTranslator));
+
+        return $stubFacade;
+    }
+
+    /**
+     * @covers Thelia\Coupon\Type\RemoveXAmount::set
+     * @covers Thelia\Coupon\Type\CouponAbstract::getCode
+     * @covers Thelia\Coupon\Type\RemoveXAmount::getTitle
+     * @covers Thelia\Coupon\Type\RemoveXAmount::getShortDescription
+     * @covers Thelia\Coupon\Type\RemoveXAmount::getDescription
+     * @covers Thelia\Coupon\Type\RemoveXAmount::isCumulative
+     * @covers Thelia\Coupon\Type\RemoveXAmount::isRemovingPostage
+     * @covers Thelia\Coupon\Type\RemoveXAmount::isAvailableOnSpecialOffers
+     * @covers Thelia\Coupon\Type\RemoveXAmount::isEnabled
+     * @covers Thelia\Coupon\Type\RemoveXAmount::getMaxUsage
+     * @covers Thelia\Coupon\Type\RemoveXAmount::getExpirationDate
+     * @covers Thelia\Coupon\Type\RemoveXAmount::setConditions
+     */
+    public function testSet()
+    {
+        $stubFacade = $this->generateFacadeStub();
+
+        $coupon = new RemoveXAmount($stubFacade);
+        $date = new \DateTime();
+        $description = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras at luctus tellus. Integer turpis mauris, aliquet vitae risus tristique, pellentesque vestibulum urna. Vestibulum sodales laoreet lectus dictum suscipit. Praesent vulputate, sem id varius condimentum, quam magna tempor elit, quis venenatis ligula nulla eget libero. Cras egestas euismod tellus, id pharetra leo suscipit quis. Donec lacinia ac lacus et ultricies. Nunc in porttitor neque. Proin at quam congue, consectetur orci sed, congue nulla. Nulla eleifend nunc ligula, nec pharetra elit tempus quis. Vivamus vel mauris sed est dictum blandit. Maecenas blandit dapibus velit ut sollicitudin. In in euismod mauris, consequat viverra magna. Cras velit velit, sollicitudin commodo tortor gravida, tempus varius nulla.
+
+    Donec rhoncus leo mauris, id porttitor ante luctus tempus. Curabitur quis augue feugiat, ullamcorper mauris ac, interdum mi. Quisque aliquam lorem vitae felis lobortis, id interdum turpis mattis. Vestibulum diam massa, ornare congue blandit quis, facilisis at nisl. In tortor metus, venenatis non arcu nec, sollicitudin ornare nisl. Nunc erat risus, varius nec urna at, iaculis lacinia elit. Aenean ut felis tempus, tincidunt odio non, sagittis nisl. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec vitae hendrerit elit. Nunc sit amet gravida risus, euismod lobortis massa. Nam a erat mauris. Nam a malesuada lorem. Nulla id accumsan dolor, sed rhoncus tellus. Quisque dictum felis sed leo auctor, at volutpat lectus viverra. Morbi rutrum, est ac aliquam imperdiet, nibh sem sagittis justo, ac mattis magna lacus eu nulla.
+
+    Duis interdum lectus nulla, nec pellentesque sapien condimentum at. Suspendisse potenti. Sed eu purus tellus. Nunc quis rhoncus metus. Fusce vitae tellus enim. Interdum et malesuada fames ac ante ipsum primis in faucibus. Etiam tempor porttitor erat vitae iaculis. Sed est elit, consequat non ornare vitae, vehicula eget lectus. Etiam consequat sapien mauris, eget consectetur magna imperdiet eget. Nunc sollicitudin luctus velit, in commodo nulla adipiscing fermentum. Fusce nisi sapien, posuere vitae metus sit amet, facilisis sollicitudin dui. Fusce ultricies auctor enim sit amet iaculis. Morbi at vestibulum enim, eget adipiscing eros.
+
+    Praesent ligula lorem, faucibus ut metus quis, fermentum iaculis erat. Pellentesque elit erat, lacinia sed semper ac, sagittis vel elit. Nam eu convallis est. Curabitur rhoncus odio vitae consectetur pellentesque. Nam vitae arcu nec ante scelerisque dignissim vel nec neque. Suspendisse augue nulla, mollis eget dui et, tempor facilisis erat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ac diam ipsum. Donec convallis dui ultricies velit auctor, non lobortis nulla ultrices. Morbi vitae dignissim ante, sit amet lobortis tortor. Nunc dapibus condimentum augue, in molestie neque congue non.
+
+    Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesuada tortor vel erat volutpat tincidunt. In vehicula diam est, a convallis eros scelerisque ut. Donec aliquet venenatis iaculis. Ut a arcu gravida, placerat dui eu, iaculis nisl. Quisque adipiscing orci sit amet dui dignissim lacinia. Sed vulputate lorem non dolor adipiscing ornare. Morbi ornare id nisl id aliquam. Ut fringilla elit ante, nec lacinia enim fermentum sit amet. Aenean rutrum lorem eu convallis pharetra. Cras malesuada varius metus, vitae gravida velit. Nam a varius ipsum, ac commodo dolor. Phasellus nec elementum elit. Etiam vel adipiscing leo.';
+
+        $coupon->set($stubFacade, 'XMAS', 'XMAS Coupon', 'Coupon for Springbreak removing 10€ if you have a cart between 40.00€ and 400.00€ (excluded)', $description, 10.00, true, true, true, true, 254, $date->setTimestamp(strtotime("today + 3 months")) );
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 40.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $condition2 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::INFERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition2->setValidatorsFromForm($operators, $values);
+
+        $conditions = new ConditionCollection();
+        $conditions->add($condition1);
+        $conditions->add($condition2);
+        $coupon->setConditions($conditions);
+
+        $this->assertEquals('XMAS', $coupon->getCode());
+        $this->assertEquals('XMAS Coupon', $coupon->getTitle());
+        $this->assertEquals('Coupon for Springbreak removing 10€ if you have a cart between 40.00€ and 400.00€ (excluded)', $coupon->getShortDescription());
+        $this->assertEquals($description, $coupon->getDescription());
+        $this->assertEquals(true, $coupon->isCumulative());
+        $this->assertEquals(true, $coupon->isRemovingPostage());
+        $this->assertEquals(true, $coupon->isAvailableOnSpecialOffers());
+        $this->assertEquals(true, $coupon->isEnabled());
+
+        $this->assertEquals(254, $coupon->getMaxUsage());
+        $this->assertEquals($date, $coupon->getExpirationDate());
+
+        $this->assertEquals(10.00, $coupon->exec());
+    }
+
+    /**
+     * @covers Thelia\Coupon\Type\RemoveXAmount::getName
+     */
+    public function testGetName()
+    {
+        $stubFacade = $this->generateFacadeStub(399, 'EUR', 'Remove X amount to total cart');
+
+        /** @var FacadeInterface $stubFacade */
+        $coupon = new RemoveXAmount($stubFacade);
+
+        $actual = $coupon->getName();
+        $expected = 'Remove X amount to total cart';
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * @covers Thelia\Coupon\Type\RemoveXAmount::getToolTip
+     */
+    public function testGetToolTip()
+    {
+        $tooltip = 'This coupon will remove the entered amount to the customer total checkout. If the discount is superior to the total checkout price the customer will only pay the postage. Unless if the coupon is set to remove postage too.';
+        $stubFacade = $this->generateFacadeStub(399, 'EUR', $tooltip);
+
+        /** @var FacadeInterface $stubFacade */
+        $coupon = new RemoveXAmount($stubFacade);
+
+        $actual = $coupon->getToolTip();
+        $expected = $tooltip;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
+}

core/lib/Thelia/Tests/Coupon/Type/RemoveXPercentTest.php

@@ -0,0 +1,204 @@
+<?php
+/**********************************************************************************/
+/*                                                                                */
+/*      Thelia	                                                                  */
+/*                                                                                */
+/*      Copyright (c) OpenStudio                                                  */
+/*      email : info@thelia.net                                                   */
+/*      web : http://www.thelia.net                                               */
+/*                                                                                */
+/*      This program is free software; you can redistribute it and/or modify      */
+/*      it under the terms of the GNU General Public License as published by      */
+/*      the Free Software Foundation; either version 3 of the License             */
+/*                                                                                */
+/*      This program is distributed in the hope that it will be useful,           */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of            */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             */
+/*      GNU General Public License for more details.                              */
+/*                                                                                */
+/*      You should have received a copy of the GNU General Public License         */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.      */
+/*                                                                                */
+/**********************************************************************************/
+
+namespace Thelia\Coupon\Type;
+use Thelia\Condition\ConditionCollection;
+use Thelia\Condition\ConditionEvaluator;
+use Thelia\Condition\Implementation\MatchForTotalAmount;
+use Thelia\Condition\Operators;
+use Thelia\Coupon\FacadeInterface;
+use Thelia\Model\CurrencyQuery;
+
+/**
+ * Created by JetBrains PhpStorm.
+ * Date: 8/19/13
+ * Time: 3:24 PM
+ *
+ * Unit Test RemoveXPercent Class
+ * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-11-17 at 18:59:24.
+ *
+ * @package Coupon
+ * @author  Guillaume MOREL <gmorel@openstudio.fr>
+ *
+ */
+class RemoveXPercentTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+    }
+
+    /**
+     * Generate adapter stub
+     *
+     * @param int    $cartTotalPrice   Cart total price
+     * @param string $checkoutCurrency Checkout currency
+     * @param string $i18nOutput       Output from each translation
+     *
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    public function generateFacadeStub($cartTotalPrice = 400, $checkoutCurrency = 'EUR', $i18nOutput = '')
+    {
+        $stubFacade = $this->getMockBuilder('\Thelia\Coupon\BaseFacade')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $currencies = CurrencyQuery::create();
+        $currencies = $currencies->find();
+        $stubFacade->expects($this->any())
+            ->method('getAvailableCurrencies')
+            ->will($this->returnValue($currencies));
+
+        $stubFacade->expects($this->any())
+            ->method('getCartTotalPrice')
+            ->will($this->returnValue($cartTotalPrice));
+
+        $stubFacade->expects($this->any())
+            ->method('getCheckoutCurrency')
+            ->will($this->returnValue($checkoutCurrency));
+
+        $stubFacade->expects($this->any())
+            ->method('getConditionEvaluator')
+            ->will($this->returnValue(new ConditionEvaluator()));
+
+        $stubTranslator = $this->getMockBuilder('\Thelia\Core\Translation\Translator')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $stubTranslator->expects($this->any())
+            ->method('trans')
+            ->will($this->returnValue($i18nOutput));
+
+        $stubFacade->expects($this->any())
+            ->method('getTranslator')
+            ->will($this->returnValue($stubTranslator));
+
+        return $stubFacade;
+    }
+
+    /**
+     * @covers Thelia\Coupon\Type\RemoveXPercent::set
+     * @covers Thelia\Coupon\Type\RemoveXPercent::exec
+     */
+    public function testSet()
+    {
+        $stubFacade = $this->generateFacadeStub();
+
+        $coupon = new RemoveXPercent($stubFacade);
+        $date = new \DateTime();
+        $description = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras at luctus tellus. Integer turpis mauris, aliquet vitae risus tristique, pellentesque vestibulum urna. Vestibulum sodales laoreet lectus dictum suscipit. Praesent vulputate, sem id varius condimentum, quam magna tempor elit, quis venenatis ligula nulla eget libero. Cras egestas euismod tellus, id pharetra leo suscipit quis. Donec lacinia ac lacus et ultricies. Nunc in porttitor neque. Proin at quam congue, consectetur orci sed, congue nulla. Nulla eleifend nunc ligula, nec pharetra elit tempus quis. Vivamus vel mauris sed est dictum blandit. Maecenas blandit dapibus velit ut sollicitudin. In in euismod mauris, consequat viverra magna. Cras velit velit, sollicitudin commodo tortor gravida, tempus varius nulla.
+
+    Donec rhoncus leo mauris, id porttitor ante luctus tempus. Curabitur quis augue feugiat, ullamcorper mauris ac, interdum mi. Quisque aliquam lorem vitae felis lobortis, id interdum turpis mattis. Vestibulum diam massa, ornare congue blandit quis, facilisis at nisl. In tortor metus, venenatis non arcu nec, sollicitudin ornare nisl. Nunc erat risus, varius nec urna at, iaculis lacinia elit. Aenean ut felis tempus, tincidunt odio non, sagittis nisl. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec vitae hendrerit elit. Nunc sit amet gravida risus, euismod lobortis massa. Nam a erat mauris. Nam a malesuada lorem. Nulla id accumsan dolor, sed rhoncus tellus. Quisque dictum felis sed leo auctor, at volutpat lectus viverra. Morbi rutrum, est ac aliquam imperdiet, nibh sem sagittis justo, ac mattis magna lacus eu nulla.
+
+    Duis interdum lectus nulla, nec pellentesque sapien condimentum at. Suspendisse potenti. Sed eu purus tellus. Nunc quis rhoncus metus. Fusce vitae tellus enim. Interdum et malesuada fames ac ante ipsum primis in faucibus. Etiam tempor porttitor erat vitae iaculis. Sed est elit, consequat non ornare vitae, vehicula eget lectus. Etiam consequat sapien mauris, eget consectetur magna imperdiet eget. Nunc sollicitudin luctus velit, in commodo nulla adipiscing fermentum. Fusce nisi sapien, posuere vitae metus sit amet, facilisis sollicitudin dui. Fusce ultricies auctor enim sit amet iaculis. Morbi at vestibulum enim, eget adipiscing eros.
+
+    Praesent ligula lorem, faucibus ut metus quis, fermentum iaculis erat. Pellentesque elit erat, lacinia sed semper ac, sagittis vel elit. Nam eu convallis est. Curabitur rhoncus odio vitae consectetur pellentesque. Nam vitae arcu nec ante scelerisque dignissim vel nec neque. Suspendisse augue nulla, mollis eget dui et, tempor facilisis erat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ac diam ipsum. Donec convallis dui ultricies velit auctor, non lobortis nulla ultrices. Morbi vitae dignissim ante, sit amet lobortis tortor. Nunc dapibus condimentum augue, in molestie neque congue non.
+
+    Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesuada tortor vel erat volutpat tincidunt. In vehicula diam est, a convallis eros scelerisque ut. Donec aliquet venenatis iaculis. Ut a arcu gravida, placerat dui eu, iaculis nisl. Quisque adipiscing orci sit amet dui dignissim lacinia. Sed vulputate lorem non dolor adipiscing ornare. Morbi ornare id nisl id aliquam. Ut fringilla elit ante, nec lacinia enim fermentum sit amet. Aenean rutrum lorem eu convallis pharetra. Cras malesuada varius metus, vitae gravida velit. Nam a varius ipsum, ac commodo dolor. Phasellus nec elementum elit. Etiam vel adipiscing leo.';
+
+        $coupon->set($stubFacade, 'XMAS', 'XMAS Coupon', 'Coupon for Springbreak removing 10% if you have a cart between 40.00€ and 400.00€ (excluded)', $description, 10.00, true, true, true, true, 254, $date->setTimestamp(strtotime("today + 3 months")) );
+
+        $condition1 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 40.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition1->setValidatorsFromForm($operators, $values);
+
+        $condition2 = new MatchForTotalAmount($stubFacade);
+        $operators = array(
+            MatchForTotalAmount::INPUT1 => Operators::INFERIOR,
+            MatchForTotalAmount::INPUT2 => Operators::EQUAL
+        );
+        $values = array(
+            MatchForTotalAmount::INPUT1 => 400.00,
+            MatchForTotalAmount::INPUT2 => 'EUR'
+        );
+        $condition2->setValidatorsFromForm($operators, $values);
+
+        $conditions = new ConditionCollection();
+        $conditions->add($condition1);
+        $conditions->add($condition2);
+        $coupon->setConditions($conditions);
+
+        $this->assertEquals('XMAS', $coupon->getCode());
+        $this->assertEquals('XMAS Coupon', $coupon->getTitle());
+        $this->assertEquals('Coupon for Springbreak removing 10% if you have a cart between 40.00€ and 400.00€ (excluded)', $coupon->getShortDescription());
+        $this->assertEquals($description, $coupon->getDescription());
+        $this->assertEquals(true, $coupon->isCumulative());
+        $this->assertEquals(true, $coupon->isRemovingPostage());
+        $this->assertEquals(true, $coupon->isAvailableOnSpecialOffers());
+        $this->assertEquals(true, $coupon->isEnabled());
+
+        $this->assertEquals(254, $coupon->getMaxUsage());
+        $this->assertEquals($date, $coupon->getExpirationDate());
+
+        $this->assertEquals(40.00, $coupon->exec());
+    }
+
+    /**
+     * @covers Thelia\Coupon\Type\RemoveXPercent::getName
+     */
+    public function testGetName()
+    {
+        $stubFacade = $this->generateFacadeStub(399, 'EUR', 'Remove X percent to total cart');
+
+        /** @var FacadeInterface $stubFacade */
+        $coupon = new RemoveXPercent($stubFacade);
+
+        $actual = $coupon->getName();
+        $expected = 'Remove X percent to total cart';
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * @covers Thelia\Coupon\Type\RemoveXPercent::getToolTip
+     */
+    public function testGetToolTip()
+    {
+        $tooltip = 'This coupon will remove the entered percentage to the customer total checkout. If the discount is superior to the total checkout price the customer will only pay the postage. Unless if the coupon is set to remove postage too.';
+        $stubFacade = $this->generateFacadeStub(399, 'EUR', $tooltip);
+
+        /** @var FacadeInterface $stubFacade */
+        $coupon = new RemoveXPercent($stubFacade);
+
+        $actual = $coupon->getToolTip();
+        $expected = $tooltip;
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
+}

install/faker.php

@@ -1,12 +1,12 @@
 <?php
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Thelia\Condition\ConditionFactory;
-use Thelia\Condition\Implementation\MatchForEveryoneManager;
-use Thelia\Condition\Implementation\MatchForTotalAmountManager;
-use Thelia\Condition\Implementation\MatchForXArticlesManager;
+use Thelia\Condition\Implementation\MatchForEveryone;
+use Thelia\Condition\Implementation\MatchForTotalAmount;
+use Thelia\Condition\Implementation\MatchForXArticles;
 use Thelia\Condition\Operators;
 use Thelia\Coupon\FacadeInterface;
-use Thelia\Coupon\ConditionCollection;
+use Thelia\Condition\ConditionCollection;
 
 
 require __DIR__ . '/../core/bootstrap.php';
@@ -646,7 +646,7 @@ function generateCouponFixtures(\Thelia\Core\Thelia $thelia)
     /** @var $container ContainerInterface Service Container */
     $container = $thelia->getContainer();
     /** @var FacadeInterface $adapter */
-    $adapter = $container->get('thelia.adapter');
+    $adapter = $container->get('thelia.facade');
 
     // Coupons
     $coupon1 = new Thelia\Model\Coupon();
@@ -669,25 +669,25 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua
     $date = new \DateTime();
     $coupon1->setExpirationDate($date->setTimestamp(strtotime("today + 3 months")));
 
-    $condition1 = new MatchForTotalAmountManager($adapter);
+    $condition1 = new MatchForTotalAmount($adapter);
     $operators = array(
-        MatchForTotalAmountManager::INPUT1 => Operators::SUPERIOR,
-        MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
+        MatchForTotalAmount::INPUT1 => Operators::SUPERIOR,
+        MatchForTotalAmount::INPUT2 => Operators::EQUAL
     );
     $values = array(
-        MatchForTotalAmountManager::INPUT1 => 40.00,
-        MatchForTotalAmountManager::INPUT2 => 'EUR'
+        MatchForTotalAmount::INPUT1 => 40.00,
+        MatchForTotalAmount::INPUT2 => 'EUR'
     );
     $condition1->setValidatorsFromForm($operators, $values);
 
-    $condition2 = new MatchForTotalAmountManager($adapter);
+    $condition2 = new MatchForTotalAmount($adapter);
     $operators = array(
-        MatchForTotalAmountManager::INPUT1 => Operators::INFERIOR,
-        MatchForTotalAmountManager::INPUT2 => Operators::EQUAL
+        MatchForTotalAmount::INPUT1 => Operators::INFERIOR,
+        MatchForTotalAmount::INPUT2 => Operators::EQUAL
     );
     $values = array(
-        MatchForTotalAmountManager::INPUT1 => 400.00,
-        MatchForTotalAmountManager::INPUT2 => 'EUR'
+        MatchForTotalAmount::INPUT1 => 400.00,
+        MatchForTotalAmount::INPUT2 => 'EUR'
     );
     $condition2->setValidatorsFromForm($operators, $values);
 
@@ -727,12 +727,12 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua
     $date = new \DateTime();
     $coupon2->setExpirationDate($date->setTimestamp(strtotime("today + 1 months")));
 
-    $condition1 = new MatchForXArticlesManager($adapter);
+    $condition1 = new MatchForXArticles($adapter);
     $operators = array(
-        MatchForXArticlesManager::INPUT1 => Operators::SUPERIOR,
+        MatchForXArticles::INPUT1 => Operators::SUPERIOR,
     );
     $values = array(
-        MatchForXArticlesManager::INPUT1 => 4,
+        MatchForXArticles::INPUT1 => 4,
     );
     $condition1->setValidatorsFromForm($operators, $values);
     $conditions = new ConditionCollection();
@@ -771,7 +771,7 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua
     $date = new \DateTime();
     $coupon3->setExpirationDate($date->setTimestamp(strtotime("today + 2 months")));
 
-    $condition1 = new MatchForEveryoneManager($adapter);
+    $condition1 = new MatchForEveryone($adapter);
     $operators = array();
     $values = array();
     $condition1->setValidatorsFromForm($operators, $values);

install/faker_add_ecotax.php

@@ -1,12 +1,8 @@
 <?php
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Thelia\Condition\ConditionFactory;
-use Thelia\Condition\Implementation\MatchForEveryoneManager;
-use Thelia\Condition\Implementation\MatchForTotalAmountManager;
-use Thelia\Condition\Implementation\MatchForXArticlesManager;
+use Thelia\Condition\Implementation\MatchForTotalAmount;
+use Thelia\Condition\Implementation\MatchForXArticles;
 use Thelia\Condition\Operators;
-use Thelia\Coupon\AdapterInterface;
-use Thelia\Coupon\ConditionCollection;
 
 
 require __DIR__ . '/../core/bootstrap.php';

install/import.php

@@ -21,8 +21,8 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-use Thelia\Condition\Implementation\MatchForTotalAmountManager;
-use Thelia\Condition\Implementation\MatchForXArticlesManager;
+use Thelia\Condition\Implementation\MatchForTotalAmount;
+use Thelia\Condition\Implementation\MatchForXArticles;
 
 
 require __DIR__ . '/../core/bootstrap.php';

install/tax_faker.php

@@ -1,6 +1,6 @@
 <?php
-use Thelia\Condition\Implementation\MatchForTotalAmountManager;
-use Thelia\Condition\Implementation\MatchForXArticlesManager;
+use Thelia\Condition\Implementation\MatchForTotalAmount;
+use Thelia\Condition\Implementation\MatchForXArticles;
 use Imagine\Image\Point;
 
 require __DIR__ . '/../core/bootstrap.php';