From 6ea9e68d6696674ca47d2c349bbc019ee979b052 Mon Sep 17 00:00:00 2001
From: John Smart <john.smart@wakaleo.com>
Date: Wed, 3 Aug 2016 07:20:04 +0530
Subject: [PATCH 1/7] Replaced duplicate packag-info with a readme

---
 .../java/serenitylabs/tutorials/vetclinic/package-info.java   | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 src/test/java/serenitylabs/tutorials/vetclinic/package-info.java

diff --git a/src/test/java/serenitylabs/tutorials/vetclinic/package-info.java b/src/test/java/serenitylabs/tutorials/vetclinic/package-info.java
deleted file mode 100644
index 481a4ac9..00000000
--- a/src/test/java/serenitylabs/tutorials/vetclinic/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Unit tests for the Vet Clinic app
- **/
- package serenitylabs.tutorials.vetclinic;

From 38ab879dc6610d647c17050149526fb921a2a5e1 Mon Sep 17 00:00:00 2001
From: John Smart <john.smart@wakaleo.com>
Date: Wed, 3 Aug 2016 07:21:42 +0530
Subject: [PATCH 2/7] Replaced duplicate packag-info with a readme

---
 src/test/java/serenitylabs/tutorials/vetclinic/README.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/test/java/serenitylabs/tutorials/vetclinic/README.md

diff --git a/src/test/java/serenitylabs/tutorials/vetclinic/README.md b/src/test/java/serenitylabs/tutorials/vetclinic/README.md
new file mode 100644
index 00000000..8b2ec7b8
--- /dev/null
+++ b/src/test/java/serenitylabs/tutorials/vetclinic/README.md
@@ -0,0 +1 @@
+Your test code goes here.

From 858547ce13ad2c026f0bd50c2b3dd02ae4bbd532 Mon Sep 17 00:00:00 2001
From: John Smart <john.smart@wakaleo.com>
Date: Mon, 29 Aug 2016 10:05:24 +0100
Subject: [PATCH 3/7] Added Serenity outputs for CircleCI

---
 circle.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 circle.yml

diff --git a/circle.yml b/circle.yml
new file mode 100644
index 00000000..546b2056
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,6 @@
+  kata/sla/solution
+test:
+  post:
+    - mkdir -p $CIRCLE_TEST_REPORTS/junit/
+    - find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
+    - find . -type f -regex ".*/target/site/serenity/SERENITY-JUNIT-*.xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;

From 72de6b77ec0ae76e9b808f4e0a7667f0739370ce Mon Sep 17 00:00:00 2001
From: John Smart <john.smart@wakaleo.com>
Date: Mon, 29 Aug 2016 10:12:21 +0100
Subject: [PATCH 4/7] Configured Java 8 in the CircleCI build config

---
 circle.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 546b2056..822b980c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,4 +1,6 @@
-  kata/sla/solution
+machine:
+  java: oraclejdk8
+  
 test:
   post:
     - mkdir -p $CIRCLE_TEST_REPORTS/junit/

From 11ef2639e3de41c0f1731c47d0b982834941dc08 Mon Sep 17 00:00:00 2001
From: John Smart <john.smart@wakaleo.com>
Date: Mon, 29 Aug 2016 10:14:16 +0100
Subject: [PATCH 5/7] Configured Java 8 in the CircleCI build config

---
 circle.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 822b980c..cdee9fa7 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,6 +1,7 @@
 machine:
-  java: oraclejdk8
-  
+  java:
+    version: oraclejdk8
+    
 test:
   post:
     - mkdir -p $CIRCLE_TEST_REPORTS/junit/

From ebf548651d1a262a1d675ef66636e21ff0751773 Mon Sep 17 00:00:00 2001
From: kiran1552 <kiran@1552>
Date: Tue, 20 Sep 2016 18:13:51 +0530
Subject: [PATCH 6/7] Kata/Collections/practice

---
 .../collections/katas/APetHotel.java          |  9 +++
 .../collections/katas/BookingResponse.java    | 17 +++++
 .../vetclinic/collections/katas/PetHotel.java | 25 +++++++
 .../katas/WhenBookingPetsIntoAPetHotel.java   | 75 +++++++++++++++++++
 4 files changed, 126 insertions(+)
 create mode 100644 src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/BookingResponse.java
 create mode 100644 src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/PetHotel.java

diff --git a/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/APetHotel.java b/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/APetHotel.java
index 6a5c242b..a9b06f7b 100644
--- a/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/APetHotel.java
+++ b/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/APetHotel.java
@@ -11,6 +11,7 @@
  * A utility class to generate pet hotels with pets already booked
  */
 public class APetHotel {
+
     public static PetAdder with(int petCount) {
         return new PetAdder(petCount);
     }
@@ -38,5 +39,13 @@ private Breed someBreed() {
         private String someName(int petCount) {
             return PET_NAMES.get(random.nextInt(PET_NAMES.size())) + " " + petCount;
         }
+
+        public PetHotel petsCheckIn() {
+            PetHotel petHotel= new PetHotel();
+            for (int i=0;i<petCount; i++)
+                petHotel.checkIn(Pet.dog().named("Fido-"+i));
+
+           return petHotel;
+        }
     }
 }
diff --git a/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/BookingResponse.java b/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/BookingResponse.java
new file mode 100644
index 00000000..19e87674
--- /dev/null
+++ b/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/BookingResponse.java
@@ -0,0 +1,17 @@
+package serenitylabs.tutorials.vetclinic.collections.katas;
+
+/**
+ * Created by kimahale on 9/20/2016.
+ */
+public class BookingResponse {
+
+    private final boolean confirmedStatus;
+
+    public BookingResponse(boolean confirmedStatus) {
+        this.confirmedStatus = confirmedStatus;
+    }
+
+    public boolean isConfirmed() {
+        return confirmedStatus;
+    }
+}
diff --git a/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/PetHotel.java b/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/PetHotel.java
new file mode 100644
index 00000000..60363b06
--- /dev/null
+++ b/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/PetHotel.java
@@ -0,0 +1,25 @@
+package serenitylabs.tutorials.vetclinic.collections.katas;
+
+import serenitylabs.tutorials.vetclinic.Pet;
+
+import java.util.*;
+
+/**
+ * Created by kimahale on 9/20/2016.
+ */
+public class PetHotel {
+
+    private Collection<Pet> pets= new TreeSet<>(Comparator.comparing(Pet::getName));
+    public static int DEFAULT_MAXIMUM_CAPACITY = 20;
+
+    public List<Pet> getPets() {
+        return new ArrayList(pets);
+    }
+
+    public BookingResponse checkIn(Pet pet) {
+
+        if (pets.size() <DEFAULT_MAXIMUM_CAPACITY)
+           pets.add(pet);
+        return new BookingResponse(true);
+    }
+}
diff --git a/src/test/java/serenitylabs/tutorials/vetclinic/collections/katas/WhenBookingPetsIntoAPetHotel.java b/src/test/java/serenitylabs/tutorials/vetclinic/collections/katas/WhenBookingPetsIntoAPetHotel.java
index 5486b552..3e696b87 100644
--- a/src/test/java/serenitylabs/tutorials/vetclinic/collections/katas/WhenBookingPetsIntoAPetHotel.java
+++ b/src/test/java/serenitylabs/tutorials/vetclinic/collections/katas/WhenBookingPetsIntoAPetHotel.java
@@ -1,36 +1,111 @@
 package serenitylabs.tutorials.vetclinic.collections.katas;
 
 import org.junit.Test;
+import serenitylabs.tutorials.vetclinic.Pet;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertThat;
 
 public class WhenBookingPetsIntoAPetHotel {
 
 
     @Test
     public void the_hotel_should_initially_have_no_pets_booked() {
+        // When
+        PetHotel petHotel = new PetHotel();
+        // Then
+        assertThat(petHotel.getPets(), hasSize(0));
     }
 
     @Test
     public void should_be_able_to_check_a_pet_into_the_hotel() throws Exception {
+        // Given
+        PetHotel petHotel=new PetHotel();
+        Pet fido= Pet.dog().named("Fido");
+        //When
+        petHotel.checkIn(fido);
+        // Then
+        assertThat(petHotel.getPets(), hasItems(fido));
     }
 
     @Test
     public void should_be_able_to_check_in_several_pets() throws Exception {
+
+        // Given
+        PetHotel petHotel=new PetHotel();
+        Pet fido= Pet.dog().named("Fido");
+        Pet felix= Pet.cat().named("Felix");
+
+        //When
+        petHotel.checkIn(fido);
+        petHotel.checkIn(felix);
+        // Then
+        assertThat(petHotel.getPets(), hasItems(fido, felix));
+
     }
 
+
     @Test
     public void should_not_be_able_to_check_in_the_same_pet_twice() throws Exception {
+
+        // Given
+        PetHotel petHotel=new PetHotel();
+        Pet fido= Pet.dog().named("Fido");
+        Pet felix= Pet.cat().named("Felix");
+        
+        petHotel.checkIn(fido);
+        petHotel.checkIn(felix);
+
+        // When
+        petHotel.checkIn(fido);
+        // Then
+        assertThat(petHotel.getPets(), containsInAnyOrder(fido, felix));
+
     }
 
     @Test
     public void should_be_able_to_retrieve_checked_in_pets_in_alphabetical_order() throws Exception {
+        // Given
+        PetHotel petHotel=new PetHotel();
+        Pet fido= Pet.dog().named("Fido");
+        Pet felix= Pet.cat().named("Felix");
+        Pet tommy= Pet.dog().named("Tommy");
+
+
+        // When
+        petHotel.checkIn(fido);
+        petHotel.checkIn(felix);
+        petHotel.checkIn(tommy);
+        // Then
+        assertThat(petHotel.getPets(), contains(felix, fido, tommy));
+
+
     }
 
     @Test
     public void should_be_able_to_obtain_a_booking_confirmation_when_we_check_in_a_pet() throws Exception {
+
+        // Given
+        PetHotel petHotel=new PetHotel();
+        Pet fido= Pet.dog().named("Fido");
+        // When
+        BookingResponse bookingResponse= petHotel.checkIn(fido);
+        // Then
+        assertThat(bookingResponse.isConfirmed(), equalTo(true));
     }
 
     @Test
     public void should_not_be_able_to_check_in_pets_beyond_hotel_capacity() throws Exception {
+        // Given
+        PetHotel petHotel=APetHotel.with(20).petsCheckIn();
+        Pet fido= Pet.dog().named("Fido");
+
+        // When
+        petHotel.checkIn(fido);
+
+        // Then
+        assertThat(petHotel.getPets(), hasSize(20));
+
     }
 
     @Test

From 358db26704b9095982131bc64c4bc8521a6e08f3 Mon Sep 17 00:00:00 2001
From: kiran1552 <kiran@1552>
Date: Tue, 20 Sep 2016 18:46:10 +0530
Subject: [PATCH 7/7] Kata/Collections/practice completed all test cases

---
 .../collections/katas/BookingResponse.java    |  4 ++
 .../vetclinic/collections/katas/PetHotel.java | 22 ++++++--
 .../katas/WhenBookingPetsIntoAPetHotel.java   | 51 ++++++++++++++++++-
 3 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/BookingResponse.java b/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/BookingResponse.java
index 19e87674..2d4f3b57 100644
--- a/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/BookingResponse.java
+++ b/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/BookingResponse.java
@@ -14,4 +14,8 @@ public BookingResponse(boolean confirmedStatus) {
     public boolean isConfirmed() {
         return confirmedStatus;
     }
+
+    public boolean isOnWaitingList() {
+        return !confirmedStatus;
+    }
 }
diff --git a/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/PetHotel.java b/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/PetHotel.java
index 60363b06..a8b6ee73 100644
--- a/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/PetHotel.java
+++ b/src/main/java/serenitylabs/tutorials/vetclinic/collections/katas/PetHotel.java
@@ -11,15 +11,31 @@ public class PetHotel {
 
     private Collection<Pet> pets= new TreeSet<>(Comparator.comparing(Pet::getName));
     public static int DEFAULT_MAXIMUM_CAPACITY = 20;
+    private Queue<Pet> waitingList = new LinkedList<>();
 
     public List<Pet> getPets() {
         return new ArrayList(pets);
     }
 
     public BookingResponse checkIn(Pet pet) {
+        boolean confirmStatus= false;
+        if (pets.size() <DEFAULT_MAXIMUM_CAPACITY) {
+            pets.add(pet);
+            confirmStatus=true;
+        }
+        else
+            waitingList.add(pet);
+        return new BookingResponse(confirmStatus);
+    }
+
+    public List<Pet> getWaitingList() {
+        return new ArrayList<>(waitingList);
+    }
 
-        if (pets.size() <DEFAULT_MAXIMUM_CAPACITY)
-           pets.add(pet);
-        return new BookingResponse(true);
+    public void checkOut(Pet pet) {
+        pets.remove(pet);
+        if (!waitingList.isEmpty()) {
+            checkIn(waitingList.poll());
+        }
     }
 }
diff --git a/src/test/java/serenitylabs/tutorials/vetclinic/collections/katas/WhenBookingPetsIntoAPetHotel.java b/src/test/java/serenitylabs/tutorials/vetclinic/collections/katas/WhenBookingPetsIntoAPetHotel.java
index 3e696b87..5061c6c1 100644
--- a/src/test/java/serenitylabs/tutorials/vetclinic/collections/katas/WhenBookingPetsIntoAPetHotel.java
+++ b/src/test/java/serenitylabs/tutorials/vetclinic/collections/katas/WhenBookingPetsIntoAPetHotel.java
@@ -52,7 +52,7 @@ public void should_not_be_able_to_check_in_the_same_pet_twice() throws Exception
         PetHotel petHotel=new PetHotel();
         Pet fido= Pet.dog().named("Fido");
         Pet felix= Pet.cat().named("Felix");
-        
+
         petHotel.checkIn(fido);
         petHotel.checkIn(felix);
 
@@ -110,20 +110,69 @@ public void should_not_be_able_to_check_in_pets_beyond_hotel_capacity() throws E
 
     @Test
     public void should_notify_owner_that_the_hotel_is_full() throws Exception {
+
+        // Given
+        PetHotel petHotel=APetHotel.with(20).petsCheckIn();
+        Pet fido= Pet.dog().named("Fido");
+        // When
+        BookingResponse bookingResponse= petHotel.checkIn(fido);
+        // Then
+        assertThat(bookingResponse.isConfirmed(), is(false));
+        assertThat(bookingResponse.isOnWaitingList(), is(true));
+
+
     }
 
 
     @Test
     public void should_place_pets_on_a_waiting_list_when_the_hotel_is_full() throws Exception {
+
+        // Given
+        PetHotel petHotel=APetHotel.with(20).petsCheckIn();
+        Pet fido= Pet.dog().named("Fido");
+        // When
+         petHotel.checkIn(fido);
+        // Then
+        assertThat(petHotel.getWaitingList(), hasItem(fido));
+
     }
 
     @Test
     public void pets_on_the_waiting_list_should_be_added_to_the_hotel_when_a_place_is_freed() throws Exception {
+
+        // Given
+        PetHotel petHotel=APetHotel.with(19).petsCheckIn();
+        Pet fido= Pet.dog().named("Fido");
+        Pet felix= Pet.cat().named("Felix");
+        // Pet roger= Pet.rabbit().named("Roger");
+
+        petHotel.checkIn(fido);
+        petHotel.checkIn(felix);
+        // petHotel.checkIn(roger);
+        petHotel.checkOut(fido);
+        // Then
+        assertThat(petHotel.getPets(), hasItem(felix));
+
     }
 
 
     @Test
     public void pets_on_the_waiting_list_should_be_admitted_on_a_first_come_first_served_basis() throws Exception {
+
+        PetHotel hotel = APetHotel.with(19).petsCheckIn();
+        Pet felix = Pet.cat().named("FELIX");
+        Pet fido = Pet.dog().named("FIDO");
+        Pet roger = Pet.rabbit().named("ROGER");
+
+        hotel.checkIn(felix);
+        hotel.checkIn(fido);
+        hotel.checkIn(roger);
+
+        //WHEN
+        hotel.checkOut(felix);
+
+        //Then
+        assertThat(hotel.getPets(), hasItem(fido));
     }
 
 }