BroadleafCommerce#1108 - Updated tests to better utilize groovy syntax and practices

Author: AustinMRooke

core/broadleaf-framework/src/test/groovy/org/broadleafcommerce/core/spec/pricing/service/workflow/BasePricingActivitySpec.groovy

@@ -17,14 +17,16 @@
  * limitations under the License.
  * #L%
  */
+/**
+ * @author Austin Rooke (austinrooke)
+ */
 package org.broadleafcommerce.core.spec.pricing.service.workflow
 
 import org.broadleafcommerce.core.order.domain.Order
 import org.broadleafcommerce.core.order.domain.OrderImpl
 import org.broadleafcommerce.core.workflow.BaseActivity
 import org.broadleafcommerce.core.workflow.DefaultProcessContextImpl
 import org.broadleafcommerce.core.workflow.ProcessContext
-import org.broadleafcommerce.profile.core.domain.Customer
 import org.broadleafcommerce.profile.core.domain.CustomerImpl
 
 import spock.lang.Specification
@@ -36,13 +38,15 @@ class BasePricingActivitySpec extends Specification {
 
     def setup() {
 
-        Customer customer = new CustomerImpl()
-        customer.id = 1
-        Order order = new OrderImpl()
-        order.id = 1
-        order.customer = customer
         context = new DefaultProcessContextImpl<Order>().with() {
-            seedData = order
+            seedData = new OrderImpl().with() {
+                id = 1
+                customer = new CustomerImpl().with() {
+                    id = 1
+                    it
+                }
+                it
+            }
             it
         }
     }

core/broadleaf-framework/src/test/groovy/org/broadleafcommerce/core/spec/pricing/service/workflow/ConsolidateFulfillmentFeesActivitySpec.groovy

@@ -17,53 +17,66 @@
  * limitations under the License.
  * #L%
  */
+/**
+ * @author Austin Rooke (austinrooke)
+ */
 package org.broadleafcommerce.core.spec.pricing.service.workflow
 
 import org.broadleafcommerce.common.money.Money
-import org.broadleafcommerce.core.catalog.domain.Sku
-import org.broadleafcommerce.core.catalog.domain.SkuFee
 import org.broadleafcommerce.core.catalog.domain.SkuFeeImpl
 import org.broadleafcommerce.core.catalog.domain.SkuImpl
 import org.broadleafcommerce.core.catalog.service.type.SkuFeeType
-import org.broadleafcommerce.core.order.domain.BundleOrderItem
 import org.broadleafcommerce.core.order.domain.BundleOrderItemImpl
-import org.broadleafcommerce.core.order.domain.FulfillmentGroup
 import org.broadleafcommerce.core.order.domain.FulfillmentGroupFeeImpl
 import org.broadleafcommerce.core.order.domain.FulfillmentGroupImpl
-import org.broadleafcommerce.core.order.domain.FulfillmentGroupItem
 import org.broadleafcommerce.core.order.domain.FulfillmentGroupItemImpl
 import org.broadleafcommerce.core.order.domain.Order
 import org.broadleafcommerce.core.order.service.FulfillmentGroupService
 import org.broadleafcommerce.core.pricing.service.workflow.ConsolidateFulfillmentFeesActivity
 
 class ConsolidateFulfillmentFeesActivitySpec extends BasePricingActivitySpec {
 
+    /*
+     * The code coverage on this spec is only 69.4% due to not knowing what the format of
+     * SkuFee expression statements are for the method shouldApplyFeeToFulfillmentGroup
+     * to be further tested.
+     * 
+     * If someone, whom knows this information, would like to write a test to up the code
+     * coverage, please do so.
+     */
     FulfillmentGroupService mockFulfillmentGroupService
     Order order
     def setup() {
         //Setup a valid FulfillmentGroup with a FulfillmentItem inside
         // and place it inside the context.seedData order object
-        FulfillmentGroup fulfillmentGroup = new FulfillmentGroupImpl()
-        FulfillmentGroupItem fulfillmentGroupItem = new FulfillmentGroupItemImpl()
-        SkuFee skuFee = new SkuFeeImpl()
-        skuFee.feeType = SkuFeeType.FULFILLMENT
-        skuFee.name = "Test"
-        skuFee.taxable = true
-        skuFee.amount = new Money(1.00)
-        BundleOrderItem bundleOrderItem = new BundleOrderItemImpl()
-        Sku sku = new SkuImpl()
-        sku.id = 1
-        sku.retailPrice = new Money(1.00)
-        sku.fees = new ArrayList()
-        sku.fees.add(skuFee)
-        bundleOrderItem.sku = sku
-        fulfillmentGroupItem.orderItem = bundleOrderItem
-        List<FulfillmentGroupItem> fulfillmentGroupItems = new ArrayList()
-        fulfillmentGroupItems.add(fulfillmentGroupItem)
-        fulfillmentGroup.fulfillmentGroupItems = fulfillmentGroupItems
-        context.seedData.fulfillmentGroups = new ArrayList<FulfillmentGroup>()
-        context.seedData.fulfillmentGroups.add(fulfillmentGroup)
         order = context.seedData
+        context.seedData.fulfillmentGroups = [
+            new FulfillmentGroupImpl().with() {
+                fulfillmentGroupItems = [
+                    new FulfillmentGroupItemImpl().with() {
+                        orderItem = new BundleOrderItemImpl().with() {
+                            sku = new SkuImpl().with() {
+                                id = 1
+                                retailPrice = new Money('1.00')
+                                fees = [
+                                    new SkuFeeImpl().with() {
+                                        feeType = SkuFeeType.FULFILLMENT
+                                        name = 'Test'
+                                        taxable = true
+                                        amount = new Money('1.00')
+                                        it
+                                    }
+                                ] as List
+                                it
+                            }
+                            it
+                        }
+                        it
+                    }
+                ]
+                it
+            }
+        ]
     }
 
     def "Test a valid run with valid data"() {

core/broadleaf-framework/src/test/groovy/org/broadleafcommerce/core/spec/pricing/service/workflow/FulfillmentGroupMerchandiseTotalActivitySpec.groovy

@@ -23,9 +23,7 @@
 package org.broadleafcommerce.core.spec.pricing.service.workflow
 
 import org.broadleafcommerce.common.money.Money
-import org.broadleafcommerce.core.order.domain.FulfillmentGroup
 import org.broadleafcommerce.core.order.domain.FulfillmentGroupImpl
-import org.broadleafcommerce.core.order.domain.FulfillmentGroupItem
 import org.broadleafcommerce.core.order.domain.FulfillmentGroupItemImpl
 import org.broadleafcommerce.core.order.domain.OrderItem
 import org.broadleafcommerce.core.order.domain.OrderItemImpl
@@ -56,35 +54,30 @@ class FulfillmentGroupMerchandiseTotalActivitySpec extends BasePricingActivitySp
             order = context.seedData
             it
         }
-        FulfillmentGroupItem fulfillmentGroupItem1 = new FulfillmentGroupItemImpl().with() {
-            orderItem = orderItem1
-            quantity = 1
-            it
-        }
-        FulfillmentGroupItem fulfillmentGroupItem2 = new FulfillmentGroupItemImpl().with() {
-            orderItem = orderItem2
-            quantity = 2
-            it
-        }
-        FulfillmentGroupItem fulfillmentGroupItem3 = new FulfillmentGroupItemImpl().with() {
-            orderItem = orderItem2
-            quantity = 3
-            it
-        }
-        FulfillmentGroup fulfillmentGroup1 = new FulfillmentGroupImpl().with() {
-            fulfillmentGroupItems << fulfillmentGroupItem1
-            fulfillmentGroupItems << fulfillmentGroupItem2
-            order = context.seedData
-            it
-        }
-        FulfillmentGroup fulfillmentGroup2 = new FulfillmentGroupImpl().with() {
-            fulfillmentGroupItems << fulfillmentGroupItem3
-            order = context.seedData
-            it
-        }
         context.seedData.fulfillmentGroups = [
-            fulfillmentGroup1,
-            fulfillmentGroup2
+            new FulfillmentGroupImpl().with() {
+                fulfillmentGroupItems << new FulfillmentGroupItemImpl().with() {
+                    orderItem = orderItem1
+                    quantity = 1
+                    it
+                }
+                fulfillmentGroupItems << new FulfillmentGroupItemImpl().with() {
+                    orderItem = orderItem2
+                    quantity = 2
+                    it
+                }
+                order = context.seedData
+                it
+            },
+            new FulfillmentGroupImpl().with() {
+                fulfillmentGroupItems << new FulfillmentGroupItemImpl().with() {
+                    orderItem = orderItem2
+                    quantity = 3
+                    it
+                }
+                order = context.seedData
+                it
+            }
         ]
     }
 

core/broadleaf-framework/src/test/groovy/org/broadleafcommerce/core/spec/pricing/service/workflow/FulfillmentGroupPricingActivitySpec.groovy

@@ -44,21 +44,19 @@ class FulfillmentGroupPricingActivitySpec extends BasePricingActivitySpec {
      */
     FulfillmentPricingService mockFulfillmentPricingService
     def setup() {
-        FulfillmentGroup fulfillmentGroup1 = new FulfillmentGroupImpl().with {
-            shippingOverride = false
-            order = context.seedData
-            it
-        }
-        FulfillmentGroup fulfillmentGroup2 = new FulfillmentGroupImpl().with {
-            shippingOverride = true
-            fulfillmentPrice = new Money('1.00')
-            order = context.seedData
-            it
-        }
         context.seedData.fulfillmentGroups = [
             null,
-            fulfillmentGroup1,
-            fulfillmentGroup2
+            new FulfillmentGroupImpl().with {
+                shippingOverride = false
+                order = context.seedData
+                it
+            },
+            new FulfillmentGroupImpl().with {
+                shippingOverride = true
+                fulfillmentPrice = new Money('1.00')
+                order = context.seedData
+                it
+            }
         ]
         mockFulfillmentPricingService = Mock()
     }

core/broadleaf-framework/src/test/groovy/org/broadleafcommerce/core/spec/pricing/service/workflow/OfferActivitySpec.groovy

@@ -17,9 +17,11 @@
  * limitations under the License.
  * #L%
  */
+/**
+ * @author Austin Rooke (austinrooke)
+ */
 package org.broadleafcommerce.core.spec.pricing.service.workflow
 
-import org.broadleafcommerce.core.offer.domain.OfferCode
 import org.broadleafcommerce.core.offer.domain.OfferCodeImpl
 import org.broadleafcommerce.core.offer.service.OfferService
 import org.broadleafcommerce.core.order.service.OrderService
@@ -36,9 +38,6 @@ class OfferActivitySpec extends BasePricingActivitySpec {
     }
 
     def"Test a valid run with valid data"() {
-        setup: "Prepare a List of OfferCode's"
-        List<OfferCode> offerCodes = new ArrayList<OfferCode>()
-        offerCodes.add(new OfferCodeImpl())
 
         activity = new OfferActivity().with {
             offerService = mockOfferService
@@ -50,7 +49,7 @@ class OfferActivitySpec extends BasePricingActivitySpec {
         context = activity.execute(context)
 
         then: "orderService's addOfferCodes should have run and offerService's buildOfferListForOrder as well as applyAndSaveOffersToOrder should have run"
-        1 * mockOfferService.buildOfferCodeListForCustomer(_) >> offerCodes
+        1 * mockOfferService.buildOfferCodeListForCustomer(_) >> [new OfferCodeImpl()]
         1 * mockOfferService.applyAndSaveOffersToOrder(_, _) >> context.seedData
         1 * mockOrderService.addOfferCodes(_, _, _) >> context.seedData
         context.seedData != null