From d53488926f250b6994dcfb3bebe12c783fc4b749 Mon Sep 17 00:00:00 2001
From: Ninitha701 <nbabypanachikkal@gmail.com>
Date: Sat, 17 Apr 2021 12:17:57 -0400
Subject: [PATCH 1/2] Implementing Cucumber Scenario. Exercise 1

---
 pom.xml                                       | 12 ++++++
 src/main/java/caffeinateme/Barrista_NB.java   | 42 ++++++++++++++++++
 src/main/java/caffeinateme/Customer_NB.java   | 32 ++++++++++++++
 src/main/java/caffeinateme/Order_NB.java      | 40 +++++++++++++++++
 .../caffeinateme/OrderCoffeeSteps_NB.java     | 43 +++++++++++++++++++
 .../resources/features/Order-a-coffee.feature | 23 ++++++++++
 6 files changed, 192 insertions(+)
 create mode 100644 src/main/java/caffeinateme/Barrista_NB.java
 create mode 100644 src/main/java/caffeinateme/Customer_NB.java
 create mode 100644 src/main/java/caffeinateme/Order_NB.java
 create mode 100644 src/test/java/caffeinateme/OrderCoffeeSteps_NB.java
 create mode 100644 src/test/resources/features/Order-a-coffee.feature

diff --git a/pom.xml b/pom.xml
index b003d38..1362e06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,6 +95,18 @@
             <version>1.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.cucumber</groupId>
+            <artifactId>cucumber-java</artifactId>
+            <version>2.1.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.cucumber</groupId>
+            <artifactId>cucumber-java</artifactId>
+            <version>6.9.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/src/main/java/caffeinateme/Barrista_NB.java b/src/main/java/caffeinateme/Barrista_NB.java
new file mode 100644
index 0000000..98d475e
--- /dev/null
+++ b/src/main/java/caffeinateme/Barrista_NB.java
@@ -0,0 +1,42 @@
+package caffeinateme;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public class Barrista_NB {
+    List<Order_NB> receivedOrders= new ArrayList<>() ;
+    public void addToReceivedOrders(Order_NB order)
+    {
+        this.receivedOrders.add(order);
+    }
+
+    public List<Order_NB> getPendingOrders() {
+        return receivedOrders;
+    }
+
+    public List<Order_NB> getUrgentOrders() {
+        List<Order_NB> results = new ArrayList<>();
+        for(int i=0;i<receivedOrders.size();i++) {
+            if (receivedOrders.get(i).getOrderStatus()=="Urgent")
+                results.add(receivedOrders.get(i));
+        }
+        return results;
+    }
+
+
+    public String getCathysOrderStatus()
+    {
+        int i;
+        for( i=0;i<receivedOrders.size();i++) {
+            if(receivedOrders.get(i).getOrderedCustomerName() .equals("cathy"))
+            {
+                break;
+            }
+        }
+        return receivedOrders.get(i).getOrderStatus();
+    }
+
+}
+
diff --git a/src/main/java/caffeinateme/Customer_NB.java b/src/main/java/caffeinateme/Customer_NB.java
new file mode 100644
index 0000000..5f9ff5c
--- /dev/null
+++ b/src/main/java/caffeinateme/Customer_NB.java
@@ -0,0 +1,32 @@
+package caffeinateme;
+public class Customer_NB {
+
+        private String name;
+        private int distanceFromShop;
+
+        public Customer_NB (String customerName)
+        {
+            this.name=customerName;
+        }
+
+        public void setDistanceFromShop(int distanceFromShop) {
+            this.distanceFromShop = distanceFromShop;
+        }
+
+        public Integer getDistanceFromShop()
+        {
+            return distanceFromShop;
+        }
+
+        public Order_NB placeOrderFor(String orderedProduct)
+        {
+            Order_NB order = new Order_NB(this,orderedProduct);
+            return order;
+        }
+
+        public String getCustomerName()
+        {
+            return this.name;
+        }
+}
+
diff --git a/src/main/java/caffeinateme/Order_NB.java b/src/main/java/caffeinateme/Order_NB.java
new file mode 100644
index 0000000..8213308
--- /dev/null
+++ b/src/main/java/caffeinateme/Order_NB.java
@@ -0,0 +1,40 @@
+package caffeinateme;
+
+public class Order_NB {
+    private final Customer_NB customer;
+    private String orderedItem ;
+    private String orderStatus;
+    public Order_NB (Customer_NB customer, String orderedProduct)
+    {
+        this.customer=customer;
+        this.orderedItem=orderedProduct;
+        this.orderStatus=setOrderStatus();
+    }
+
+    private String setOrderStatus() {
+        String status;
+        if(this.customer.getDistanceFromShop() < 101)
+        {
+            status= "Urgent";
+        }
+        else
+        {
+            status ="Normal";
+        }
+        return status;
+    }
+
+    public String getOrderStatus()
+    {
+        return this.orderStatus;
+    }
+
+    public String getOrderedCustomerName()
+    {
+        return this.customer.getCustomerName();
+    }
+
+
+}
+
+
diff --git a/src/test/java/caffeinateme/OrderCoffeeSteps_NB.java b/src/test/java/caffeinateme/OrderCoffeeSteps_NB.java
new file mode 100644
index 0000000..bf1a891
--- /dev/null
+++ b/src/test/java/caffeinateme/OrderCoffeeSteps_NB.java
@@ -0,0 +1,43 @@
+package caffeinateme;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.hasItem;
+
+
+public class OrderCoffeeSteps_NB {
+        Customer_NB customer = new Customer_NB("cathy");
+        Barrista_NB barry = new Barrista_NB();
+        Order_NB order;
+
+
+        @Given("^Cathy is (\\d+) meters from the coffee shop$")
+        public void cathy_is_n_meters_from_the_coffee_shop(int distanceInMeters) throws Throwable {
+            customer.setDistanceFromShop(distanceInMeters);
+            assertThat(customer.getDistanceFromShop()).isEqualTo(distanceInMeters);
+        }
+
+        @When("^Cathy orders a (.*)$")
+        public void cathy_orders_a(String orderedProduct) throws Throwable {
+            order= customer.placeOrderFor(orderedProduct);
+            assertThat(order.getOrderedCustomerName()).isEqualTo("cathy");
+        }
+
+        @Then("^Barry should receive the order$")
+        public void barry_should_receive_the_order() throws Throwable {
+            order= customer.placeOrderFor("Large Cappuccino");
+            barry.addToReceivedOrders(order);
+            assertThat(barry.getPendingOrders(),hasItem(order));
+        }
+
+        @Then("^Barry should know that the coffee is (.*)$")
+        public void barry_should_know_that_the_coffee_is_Urgent(String orderStatus) throws Throwable {
+            order= customer.placeOrderFor("Large Cappuccino");
+            assertThat(barry.getCathysOrderStatus()).isEqualTo(orderStatus);
+        }
+
+    }
+
+
diff --git a/src/test/resources/features/Order-a-coffee.feature b/src/test/resources/features/Order-a-coffee.feature
new file mode 100644
index 0000000..d110ea1
--- /dev/null
+++ b/src/test/resources/features/Order-a-coffee.feature
@@ -0,0 +1,23 @@
+Feature: Order a coffee
+
+  In order to save time when I pick up my morning coffee
+  As a coffee lover
+  I want to be able to order my coffee in advance
+
+  Scenario: Buyer orders a coffee when they are close to the coffee shop
+    Given Cathy is 100 meters from the coffee shop
+    When Cathy orders a large cappuccino
+    Then Barry should receive the order
+    And Barry should know that the coffee is Urgent
+
+  Scenario: Buyer orders a coffee when they are close to the coffee shop
+    Given Cathy is 50 meters from the coffee shop
+    When Cathy orders a large cappuccino
+    Then Barry should receive the order
+    And Barry should know that the coffee is Urgent
+
+  Scenario: Buyer orders a coffee when they are close to the coffee shop
+    Given Cathy is 300 meters from the coffee shop
+    When Cathy orders a large cappuccino
+    Then Barry should receive the order
+    And Barry should know that the coffee is Normal

From 683465d32875354592546721395b84fba13d4152 Mon Sep 17 00:00:00 2001
From: Ninitha701 <nbabypanachikkal@gmail.com>
Date: Wed, 21 Apr 2021 22:20:07 -0400
Subject: [PATCH 2/2] Complete a order feature

---
 src/main/java/caffeinateme/Order.java         | 12 ++++++++++
 .../OrderACoffeeStepDefinitions.java          | 22 ++++++++++++++++++
 .../UserRegistrationStepDefinitions.java      |  2 +-
 src/test/java/caffeinateme/steps/Barista.java | 14 ++++++++++-
 .../steps/CoffeeOrdersClient.java             | 10 ++++++++
 .../java/caffeinateme/steps/Customer.java     |  9 ++++++++
 .../resources/features/Order-a-coffee.feature | 23 -------------------
 7 files changed, 67 insertions(+), 25 deletions(-)
 delete mode 100644 src/test/resources/features/Order-a-coffee.feature

diff --git a/src/main/java/caffeinateme/Order.java b/src/main/java/caffeinateme/Order.java
index b1004f6..5b2ce7f 100644
--- a/src/main/java/caffeinateme/Order.java
+++ b/src/main/java/caffeinateme/Order.java
@@ -5,12 +5,15 @@ public class Order {
     private final int quantity;
     private final String product;
     private int etaInMinutes;
+    private String orderStatus;
+
 
     public Order(long customerId, int quantity, String product) {
 
         this.customerId = customerId;
         this.quantity = quantity;
         this.product = product;
+        this.orderStatus = "Pending";
     }
 
     public OrderReceipt getReceipt() {
@@ -29,6 +32,15 @@ public String getProduct() {
         return product;
     }
 
+    public void completeOrder()
+    {
+        this.orderStatus="Complete";
+    }
+    public String getOrderStatus()
+    {
+        return orderStatus;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/src/test/java/caffeinateme/OrderACoffeeStepDefinitions.java b/src/test/java/caffeinateme/OrderACoffeeStepDefinitions.java
index f720b70..867bf8f 100644
--- a/src/test/java/caffeinateme/OrderACoffeeStepDefinitions.java
+++ b/src/test/java/caffeinateme/OrderACoffeeStepDefinitions.java
@@ -37,6 +37,7 @@ public void sheOrdersA(String order) throws Throwable {
         Serenity.setSessionVariable("orderReceipt").to(orderReceipt);
     }
 
+
     @Then("^Barry should receive the order$")
     public void barryShouldReceiveTheOrder() throws Throwable {
         assertThat(barry.pendingOrders()).contains(Order.matching(orderReceipt));
@@ -99,4 +100,25 @@ public ReceiptLineItem convertToReceiptLineItem(Map<String, String> receiptLineI
     public void theReceiptShouldContainTheLineItems(List<ReceiptLineItem> expectedLineItems) throws Throwable {
         assertThat(receipt.getLineItems()).containsExactlyElementsOf(expectedLineItems);
     }
+
+    @Given("^(.*) is a barista")
+    public void barry_is_a_barista(String name) {
+        barry.isCalled(name);
+    }
+
+    @When("^Barry marks the order as (.*)")
+    public void barry_marks_the_order_as_complete(String orderStatus) {
+    barry.completeOrder(orderReceipt);
+    }
+
+    @Then("the order should no longer appear in the pending orders")
+    public void the_order_should_no_longer_appear_in_the_pending_orders() {
+        assertThat(barry.pendingOrders()).doesNotContain(Order.matching(orderReceipt));
+    }
+
+    @Then("Sarah should see the order in her order history")
+    public void sarah_should_see_the_order_in_her_order_history() {
+        assertThat(customer.getOrderHistoryFor(orderReceipt.getCustomerId())).contains(Order.matching(orderReceipt));
+    }
+
 }
diff --git a/src/test/java/caffeinateme/UserRegistrationStepDefinitions.java b/src/test/java/caffeinateme/UserRegistrationStepDefinitions.java
index d158d12..4846594 100644
--- a/src/test/java/caffeinateme/UserRegistrationStepDefinitions.java
+++ b/src/test/java/caffeinateme/UserRegistrationStepDefinitions.java
@@ -13,7 +13,7 @@ public class UserRegistrationStepDefinitions {
     @Steps(shared = true)
     Customer customer;
 
-    @Given("^(.*) has a Caffeinate-Me account")
+    @Given("^(.*) (?:has|is) a (?:Caffeinate-Me account|registered customer)")
     public void userHasACaffeinateMeAccount(String userName) {
         userRegistrations.registerUser(customer);
         customer.isCalled(userName);
diff --git a/src/test/java/caffeinateme/steps/Barista.java b/src/test/java/caffeinateme/steps/Barista.java
index d6c6f76..4ce9b3e 100644
--- a/src/test/java/caffeinateme/steps/Barista.java
+++ b/src/test/java/caffeinateme/steps/Barista.java
@@ -1,10 +1,12 @@
 package caffeinateme.steps;
 
 import caffeinateme.Order;
+import caffeinateme.OrderReceipt;
 import net.serenitybdd.core.steps.ScenarioActor;
 import net.thucydides.core.annotations.Steps;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class Barista extends ScenarioActor {
 
@@ -12,6 +14,16 @@ public class Barista extends ScenarioActor {
     CoffeeOrdersClient coffeeOrders;
 
     public List<Order> pendingOrders() {
-        return coffeeOrders.getOrders();
+        return coffeeOrders.getOrders().stream()
+                .filter(order -> order.getOrderStatus() != "Complete")
+                .collect(Collectors.toList());
+    }
+
+    public void completeOrder(OrderReceipt orderReceipt) {
+        coffeeOrders.getOrders().stream().filter(order -> order.getCustomerId()==orderReceipt.getCustomerId())
+                .forEach(order ->order.completeOrder());
+                       // coffeeOrders.getOrders().stream().filter(order -> order.getCustomerId()==orderReceipt.getCustomerId())
+                //.forEach(order -> coffeeOrders.setOrderHistory(order));
+        //coffeeOrders.getOrders().removeIf(order -> order.getCustomerId() == orderReceipt.getCustomerId());
     }
 }
diff --git a/src/test/java/caffeinateme/steps/CoffeeOrdersClient.java b/src/test/java/caffeinateme/steps/CoffeeOrdersClient.java
index b55201e..f29a057 100644
--- a/src/test/java/caffeinateme/steps/CoffeeOrdersClient.java
+++ b/src/test/java/caffeinateme/steps/CoffeeOrdersClient.java
@@ -11,6 +11,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class CoffeeOrdersClient {
 
@@ -18,6 +19,7 @@ public class CoffeeOrdersClient {
     ProductCatalog productCatalog;
 
     List<Order> orders = new ArrayList<>();
+    List<Order> orderHistory = new ArrayList<>();
 
     @Step("Place order for customer {0} for {1} x {2}")
     public OrderReceipt placeOrder(long customerId, int quantity, String product) {
@@ -65,4 +67,12 @@ private double roundedTo2DecimalPlaces(double value) {
     private double subtotalFor(Order order) {
         return productCatalog.priceOf(order.getProduct()) * order.getQuantity();
     }
+
+    public List<Order> getOrderHistory(long customerId){
+       return orders.stream().filter(order -> order.getCustomerId()==customerId)
+                .filter(order -> order.getOrderStatus()=="Complete")
+               .collect(Collectors.toList());
+    }
+
+
 }
diff --git a/src/test/java/caffeinateme/steps/Customer.java b/src/test/java/caffeinateme/steps/Customer.java
index eb09be1..6e5924e 100644
--- a/src/test/java/caffeinateme/steps/Customer.java
+++ b/src/test/java/caffeinateme/steps/Customer.java
@@ -1,11 +1,15 @@
 package caffeinateme.steps;
 
+import caffeinateme.Order;
 import caffeinateme.OrderReceipt;
 import caffeinateme.Receipt;
 import net.serenitybdd.core.steps.ScenarioActor;
 import net.thucydides.core.annotations.Step;
 import net.thucydides.core.annotations.Steps;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 public class Customer extends ScenarioActor {
 
     private long customerId;
@@ -35,4 +39,9 @@ public void updatesHerETATo(int minutesAway) {
     public Receipt requestsAReceipt() {
         return coffeeOrders.getReceiptFor(customerId);
     }
+
+    public List<Order> getOrderHistoryFor(long customerId)
+    {
+        return coffeeOrders.getOrderHistory(customerId);
+    }
 }
diff --git a/src/test/resources/features/Order-a-coffee.feature b/src/test/resources/features/Order-a-coffee.feature
deleted file mode 100644
index d110ea1..0000000
--- a/src/test/resources/features/Order-a-coffee.feature
+++ /dev/null
@@ -1,23 +0,0 @@
-Feature: Order a coffee
-
-  In order to save time when I pick up my morning coffee
-  As a coffee lover
-  I want to be able to order my coffee in advance
-
-  Scenario: Buyer orders a coffee when they are close to the coffee shop
-    Given Cathy is 100 meters from the coffee shop
-    When Cathy orders a large cappuccino
-    Then Barry should receive the order
-    And Barry should know that the coffee is Urgent
-
-  Scenario: Buyer orders a coffee when they are close to the coffee shop
-    Given Cathy is 50 meters from the coffee shop
-    When Cathy orders a large cappuccino
-    Then Barry should receive the order
-    And Barry should know that the coffee is Urgent
-
-  Scenario: Buyer orders a coffee when they are close to the coffee shop
-    Given Cathy is 300 meters from the coffee shop
-    When Cathy orders a large cappuccino
-    Then Barry should receive the order
-    And Barry should know that the coffee is Normal