Add fluent API for order placement and verification; introduce EmptyGivenClause and ViewOrderBuilder

Author: valentinajemuovic

core/src/main/java/com/optivem/eshop/systemtest/core/gherkin/given/EmptyGivenClause.java

@@ -0,0 +1,16 @@
+package com.optivem.eshop.systemtest.core.gherkin.given;
+
+import com.optivem.eshop.systemtest.core.SystemDsl;
+import com.optivem.eshop.systemtest.core.gherkin.when.WhenClause;
+
+public class EmptyGivenClause {
+    private final SystemDsl app;
+
+    public EmptyGivenClause(SystemDsl app) {
+        this.app = app;
+    }
+
+    public WhenClause when() {
+        return new WhenClause(app);
+    }
+}

core/src/main/java/com/optivem/eshop/systemtest/core/gherkin/given/GivenClause.java

@@ -27,6 +27,11 @@ public OrderBuilder order() {
         return orderBuilder;
     }
 
+    public EmptyGivenClause noProducts() {
+        // No products to create, return clause that allows .when()
+        return new EmptyGivenClause(app);
+    }
+
     public WhenClause when() {
         // Execute all product creations
         for (var product : products) {

core/src/main/java/com/optivem/eshop/systemtest/core/gherkin/given/ProductBuilder.java

@@ -21,6 +21,11 @@ public ProductBuilder withUnitPrice(double unitPrice) {
         return this;
     }
 
+    public ProductBuilder withUnitPrice(String unitPrice) {
+        this.unitPrice = Double.parseDouble(unitPrice);
+        return this;
+    }
+
     public GivenClause and() {
         return givenClause;
     }

core/src/main/java/com/optivem/eshop/systemtest/core/gherkin/then/OrderVerificationBuilder.java

@@ -21,6 +21,46 @@ public OrderVerificationBuilder hasSku(String expectedSku) {
         return this;
     }
 
+    public OrderVerificationBuilder hasQuantity(int expectedQuantity) {
+        app.shop().viewOrder()
+                .orderNumber(orderNumber)
+                .execute()
+                .shouldSucceed()
+                .quantity(expectedQuantity);
+        return this;
+    }
+
+    public OrderVerificationBuilder hasCountry(String expectedCountry) {
+        app.shop().viewOrder()
+                .orderNumber(orderNumber)
+                .execute()
+                .shouldSucceed()
+                .country(expectedCountry);
+        return this;
+    }
+
+    public OrderVerificationBuilder hasUnitPrice(double expectedUnitPrice) {
+        app.shop().viewOrder()
+                .orderNumber(orderNumber)
+                .execute()
+                .shouldSucceed()
+                .unitPrice(expectedUnitPrice);
+        return this;
+    }
+
+    public OrderVerificationBuilder hasOriginalPrice(double expectedOriginalPrice) {
+        app.shop().viewOrder()
+                .orderNumber(orderNumber)
+                .execute()
+                .shouldSucceed()
+                .originalPrice(expectedOriginalPrice);
+        return this;
+    }
+
+    public OrderVerificationBuilder hasOriginalPrice(String expectedOriginalPrice) {
+        return hasOriginalPrice(Double.parseDouble(expectedOriginalPrice));
+    }
+
     public OrderVerificationBuilder hasTotalPrice(double expectedTotalPrice) {
         app.shop().viewOrder()
                 .orderNumber(orderNumber)
@@ -38,4 +78,58 @@ public OrderVerificationBuilder hasStatus(OrderStatus expectedStatus) {
                 .status(expectedStatus);
         return this;
     }
+
+    public OrderVerificationBuilder hasDiscountRateGreaterThanOrEqualToZero() {
+        app.shop().viewOrder()
+                .orderNumber(orderNumber)
+                .execute()
+                .shouldSucceed()
+                .discountRateGreaterThanOrEqualToZero();
+        return this;
+    }
+
+    public OrderVerificationBuilder hasDiscountAmountGreaterThanOrEqualToZero() {
+        app.shop().viewOrder()
+                .orderNumber(orderNumber)
+                .execute()
+                .shouldSucceed()
+                .discountAmountGreaterThanOrEqualToZero();
+        return this;
+    }
+
+    public OrderVerificationBuilder hasSubtotalPriceGreaterThanZero() {
+        app.shop().viewOrder()
+                .orderNumber(orderNumber)
+                .execute()
+                .shouldSucceed()
+                .subtotalPriceGreaterThanZero();
+        return this;
+    }
+
+    public OrderVerificationBuilder hasTaxRateGreaterThanOrEqualToZero() {
+        app.shop().viewOrder()
+                .orderNumber(orderNumber)
+                .execute()
+                .shouldSucceed()
+                .taxRateGreaterThanOrEqualToZero();
+        return this;
+    }
+
+    public OrderVerificationBuilder hasTaxAmountGreaterThanOrEqualToZero() {
+        app.shop().viewOrder()
+                .orderNumber(orderNumber)
+                .execute()
+                .shouldSucceed()
+                .taxAmountGreaterThanOrEqualToZero();
+        return this;
+    }
+
+    public OrderVerificationBuilder hasTotalPriceGreaterThanZero() {
+        app.shop().viewOrder()
+                .orderNumber(orderNumber)
+                .execute()
+                .shouldSucceed()
+                .totalPriceGreaterThanZero();
+        return this;
+    }
 }

core/src/main/java/com/optivem/eshop/systemtest/core/gherkin/when/PlaceOrderBuilder.java

@@ -4,11 +4,19 @@
 import com.optivem.eshop.systemtest.core.gherkin.then.ThenClause;
 
 public class PlaceOrderBuilder {
+    private static final String DEFAULT_SKU = "DEFAULT-SKU";
+    private static final int DEFAULT_QUANTITY = 1;
+    private static final String DEFAULT_COUNTRY = "US";
+
     private final SystemDsl app;
     private String orderNumber;
-    private String sku;
+    private String sku = DEFAULT_SKU;
     private String quantityString;
-    private Integer quantityInt;
+    private Integer quantityInt = DEFAULT_QUANTITY;
+    private String country = DEFAULT_COUNTRY;
+    private boolean skuExplicitlySet = false;
+    private boolean quantityExplicitlySet = false;
+    private boolean countryExplicitlySet = false;
 
     public PlaceOrderBuilder(SystemDsl app) {
         this.app = app;
@@ -21,31 +29,65 @@ public PlaceOrderBuilder withOrderNumber(String orderNumber) {
 
     public PlaceOrderBuilder withSku(String sku) {
         this.sku = sku;
+        this.skuExplicitlySet = true;
         return this;
     }
 
     public PlaceOrderBuilder withQuantity(int quantity) {
         this.quantityInt = quantity;
         this.quantityString = null;
+        this.quantityExplicitlySet = true;
         return this;
     }
 
+    /**
+     * Accepts a String quantity for validation tests (empty, non-integer values).
+     * For parameterized tests with valid integer strings, use this method.
+     */
     public PlaceOrderBuilder withQuantity(String quantity) {
         this.quantityString = quantity;
         this.quantityInt = null;
+        this.quantityExplicitlySet = true;
+        return this;
+    }
+
+    public PlaceOrderBuilder withCountry(String country) {
+        this.country = country;
+        this.countryExplicitlySet = true;
         return this;
     }
 
     public ThenClause then() {
         // Execute the place order
         var placeOrder = app.shop().placeOrder()
-                .orderNumber(orderNumber)
-                .sku(sku);
+                .orderNumber(orderNumber);
+        
+        // Apply SKU - use explicit value if set, otherwise use default
+        if (skuExplicitlySet) {
+            placeOrder.sku(sku);
+        } else {
+            placeOrder.sku(DEFAULT_SKU);
+        }
+        
+        // Apply quantity
+        if (quantityExplicitlySet) {
+            if (quantityString != null) {
+                placeOrder.quantity(quantityString);
+            } else if (quantityInt != null) {
+                placeOrder.quantity(quantityInt);
+            } else {
+                // null was explicitly passed as String
+                placeOrder.quantity((String) null);
+            }
+        } else {
+            placeOrder.quantity(DEFAULT_QUANTITY);
+        }
 
-        if (quantityString != null) {
-            placeOrder.quantity(quantityString);
-        } else if (quantityInt != null) {
-            placeOrder.quantity(quantityInt);
+        // Apply country
+        if (countryExplicitlySet) {
+            placeOrder.country(country);
+        } else {
+            placeOrder.country(DEFAULT_COUNTRY);
         }
 
         var result = placeOrder.execute();

core/src/main/java/com/optivem/eshop/systemtest/core/gherkin/when/ViewOrderBuilder.java

@@ -0,0 +1,26 @@
+package com.optivem.eshop.systemtest.core.gherkin.when;
+
+import com.optivem.eshop.systemtest.core.SystemDsl;
+import com.optivem.eshop.systemtest.core.gherkin.then.ThenClause;
+
+public class ViewOrderBuilder {
+    private final SystemDsl app;
+    private String orderNumber;
+
+    public ViewOrderBuilder(SystemDsl app) {
+        this.app = app;
+    }
+
+    public ViewOrderBuilder withOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+        return this;
+    }
+
+    public ThenClause then() {
+        var result = app.shop().viewOrder()
+                .orderNumber(orderNumber)
+                .execute();
+
+        return new ThenClause(app, orderNumber, result);
+    }
+}

core/src/main/java/com/optivem/eshop/systemtest/core/gherkin/when/WhenClause.java

@@ -16,4 +16,8 @@ public PlaceOrderBuilder placeOrder() {
     public CancelOrderBuilder cancelOrder() {
         return new CancelOrderBuilder(app);
     }
+
+    public ViewOrderBuilder viewOrder() {
+        return new ViewOrderBuilder(app);
+    }
 }