Implemented author class. Refactoring. Changed tests to adhere to exercise two.

Author: Thomas Wiik

src/main/java/com/booleanuk/core/Article.java

@@ -1,8 +1,10 @@
 package com.booleanuk.core;
 
 public class Article extends RentableReadingMaterial{
+    private final Author author;
 
-    public Article(String title){
+    public Article(String title, Author author){
         super(title);
+        this.author = author;
     }
 }

src/main/java/com/booleanuk/core/Author.java

@@ -0,0 +1,13 @@
+package com.booleanuk.core;
+
+public class Author {
+    private final String name;
+    private final String phoneNumber;
+    private final String email;
+
+    public Author(String name, String phoneNumber, String email){
+        this.name = name;
+        this.phoneNumber = phoneNumber;
+        this.email = email;
+    }
+}

src/main/java/com/booleanuk/core/Book.java

@@ -1,7 +1,12 @@
 package com.booleanuk.core;
 
 public class Book extends RentableReadingMaterial{
-    public Book(String title) {
+    private final Author author;
+
+    public Book(String title, Author author) {
         super(title);
+        this.author = author;
     }
+
+    public Author getAuthor(){ return this.author; }
 }

src/test/java/com/booleanuk/core/ArticleTest.java

@@ -6,30 +6,34 @@
 class ArticleTest {
     @Test
     public void shouldCheckOutIfAvailable() {
-        Article article = new Article("JUnit Rocks");
-        Assertions.assertEquals("item has been checked out", article.checkOut());
+        Author author = new Author("Dave", "12345678", "[email protected]");
+        Article article = new Article("JUnit Rocks", author);
+        Assertions.assertEquals("Item has been checked out.", article.checkOut());
     }
 
     @Test
     public void shouldDeclineIfNotAvailableToCheckout() {
-        Article article = new Article("JUnit Rocks");
+        Author author = new Author("Dave", "12345678", "[email protected]");
+        Article article = new Article("JUnit Rocks", author);
         article.checkOut();
 
-        Assertions.assertEquals("item is currently on loan", article.checkOut());
+        Assertions.assertEquals("Item is currently on loan.", article.checkOut());
     }
 
     @Test
     public void shouldCheckInIfOnLoan() {
-        Article article = new Article("JUnit Rocks");
+        Author author = new Author("Dave", "12345678", "[email protected]");
+        Article article = new Article("JUnit Rocks", author);
         article.checkOut();
 
-        Assertions.assertEquals("item has been checked in", article.checkIn());
+        Assertions.assertEquals("Item has been checked in.", article.checkIn());
     }
 
     @Test
     public void shouldDeclineCheckInIfNotOnLoan() {
-        Article article = new Article("JUnit Rocks");
+        Author author = new Author("Dave", "12345678", "[email protected]");
+        Article article = new Article("JUnit Rocks", author);
 
-        Assertions.assertEquals("item is not currently on loan", article.checkIn());
+        Assertions.assertEquals("Item is not currently on loan.", article.checkIn());
     }
 }

src/test/java/com/booleanuk/core/BookTest.java

@@ -6,30 +6,34 @@
 public class BookTest {
     @Test
     public void shouldCheckOutIfAvailable() {
-        Book book = new Book("JUnit Rocks");
-        Assertions.assertEquals("item has been checked out", book.checkOut());
+        Author author = new Author("Dave", "12345678", "[email protected]");
+        Book book = new Book("JUnit Rocks", author);
+        Assertions.assertEquals("Item has been checked out.", book.checkOut());
     }
 
     @Test
     public void shouldDeclineIfNotAvailableToCheckout() {
-        Book book = new Book("JUnit Rocks");
+        Author author = new Author("Dave", "12345678", "[email protected]");
+        Book book = new Book("JUnit Rocks", author);
         book.checkOut();
 
-        Assertions.assertEquals("item is currently on loan", book.checkOut());
+        Assertions.assertEquals("Item is currently on loan.", book.checkOut());
     }
 
     @Test
     public void shouldCheckInIfOnLoan() {
-        Book book = new Book("JUnit Rocks");
+        Author author = new Author("Dave", "12345678", "[email protected]");
+        Book book = new Book("JUnit Rocks", author);
         book.checkOut();
 
-        Assertions.assertEquals("item has been checked in", book.checkIn());
+        Assertions.assertEquals("Item has been checked in.", book.checkIn());
     }
 
     @Test
     public void shouldDeclineCheckInIfNotOnLoan() {
-        Book book = new Book("JUnit Rocks");
+        Author author = new Author("Dave", "12345678", "[email protected]");
+        Book book = new Book("JUnit Rocks", author);
 
-        Assertions.assertEquals("item is not currently on loan", book.checkIn());
+        Assertions.assertEquals("Item is not currently on loan.", book.checkIn());
     }
 }

src/test/java/com/booleanuk/core/LibraryTest.java

@@ -8,13 +8,14 @@ public class LibraryTest {
     @Test
     public void checkOutRentableReadingMaterialTest(){
         Library library = new Library();
-        RentableReadingMaterial book = new Book("My Java life");
+        Author author = new Author("Dave", "12345678", "[email protected]");
+        RentableReadingMaterial book = new Book("Teaching cats Java for dummies", author);
         library.addToStock(book);
 
-        String result = library.checkOutRentableReadingMaterial("My Java life");
+        String result = library.checkOutRentableReadingMaterial("Teaching cats Java for dummies");
         Assertions.assertEquals("Item has been checked out.", result);
 
-        result = library.checkOutRentableReadingMaterial("My Java life");
+        result = library.checkOutRentableReadingMaterial("Teaching cats Java for dummies");
         Assertions.assertEquals("Item is currently on loan.", result);
 
         result = library.checkOutRentableReadingMaterial("The secret life of cats");
@@ -23,14 +24,15 @@ public void checkOutRentableReadingMaterialTest(){
 
     @Test void checkInRentableReadingMaterialTest(){
         Library library = new Library();
-        RentableReadingMaterial book = new Book("My Java life");
+        Author author = new Author("Dave", "12345678", "[email protected]");
+        RentableReadingMaterial book = new Book("Teaching cats Java for dummies", author);
         library.addToStock(book);
 
-        library.checkOutRentableReadingMaterial("My Java life");
-        String result = library.checkInRentableReadingMaterial("My Java life");
+        library.checkOutRentableReadingMaterial("Teaching cats Java for dummies");
+        String result = library.checkInRentableReadingMaterial("Teaching cats Java for dummies");
         Assertions.assertEquals("Item has been checked in.", result);
 
-        result = library.checkInRentableReadingMaterial("My Java life");
+        result = library.checkInRentableReadingMaterial("Teaching cats Java for dummies");
         Assertions.assertEquals("Item is not currently on loan.", result);
 
         result = library.checkInRentableReadingMaterial("The life of a cat");

src/test/java/com/booleanuk/core/RentableReadingMaterialTest.java

@@ -6,29 +6,33 @@
 public class RentableReadingMaterialTest {
     @Test
     public void shouldCheckOutIfAvailable() {
-        Book book = new Book("JUnit Rocks");
+        Author author = new Author("Dave", "12345678", "[email protected]");
+        Book book = new Book("JUnit Rocks", author);
         Assertions.assertEquals("Item has been checked out.", book.checkOut());
     }
 
     @Test
     public void shouldDeclineIfNotAvailableToCheckout() {
-        Book book = new Book("JUnit Rocks");
+        Author author = new Author("Dave", "12345678", "[email protected]");
+        Book book = new Book("JUnit Rocks", author);
         book.checkOut();
 
         Assertions.assertEquals("Item is currently on loan.", book.checkOut());
     }
 
     @Test
     public void shouldCheckInIfOnLoan() {
-        Book book = new Book("JUnit Rocks");
+        Author author = new Author("Dave", "12345678", "[email protected]");
+        Book book = new Book("JUnit Rocks", author);
         book.checkOut();
 
         Assertions.assertEquals("Item has been checked in.", book.checkIn());
     }
 
     @Test
     public void shouldDeclineCheckInIfNotOnLoan() {
-        Book book = new Book("JUnit Rocks");
+        Author author = new Author("Dave", "12345678", "[email protected]");
+        Book book = new Book("JUnit Rocks", author);
 
         Assertions.assertEquals("Item is not currently on loan.", book.checkIn());
     }