Skip to content

Espen Solhaug #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 11 additions & 29 deletions src/main/java/com/booleanuk/core/Article.java
Original file line number Diff line number Diff line change
@@ -1,35 +1,17 @@
package com.booleanuk.core;

public class Article {
String title;

boolean onLoan = false;

public Article(String title) {
this.title = title;
}

public boolean isOnLoan() {
return onLoan;
}

public String checkIn() {
if (!this.isOnLoan()) {
return "item is not currently on loan";
}

this.onLoan = false;

return "item has been checked in";
public class Article extends Item {
private Author author;
public Article(String title, Author author) {
super(title);
this.author = author;
}

public Author getAuthor() {
return author;
}

public String checkOut() {
if (this.isOnLoan()) {
return "item is currently on loan";
}

this.onLoan = true;

return "item has been checked out";
public void setAuthor(Author author) {
this.author = author;
}
}
25 changes: 25 additions & 0 deletions src/main/java/com/booleanuk/core/Author.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.booleanuk.core;

public class Author {
private String name;
private String contactInformation;
private String webSite;

public Author(String name, String contactInformation, String webSite) {
this.name = name;
this.contactInformation = contactInformation;
this.webSite = webSite;
}

public String getName() {
return name;
}

public String getContactInformation() {
return contactInformation;
}

public String getWebSite() {
return webSite;
}
}
36 changes: 9 additions & 27 deletions src/main/java/com/booleanuk/core/Book.java
Original file line number Diff line number Diff line change
@@ -1,35 +1,17 @@
package com.booleanuk.core;

public class Book {
String title;
public class Book extends Item {

boolean onLoan = false;

public Book(String title) {
this.title = title;
}

public boolean isOnLoan() {
return onLoan;
private Author author;
public Book(String title, Author author) {
super(title);
this.author = author;
}

public String checkIn() {
if (!this.isOnLoan()) {
return "item is not currently on loan";
}

this.onLoan = false;

return "item has been checked in";
public Author getAuthor() {
return author;
}

public String checkOut() {
if (this.isOnLoan()) {
return "item is currently on loan";
}

this.onLoan = true;

return "item has been checked out";
public void setAuthor(Author author) {
this.author = author;
}
}
31 changes: 31 additions & 0 deletions src/main/java/com/booleanuk/core/Item.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.booleanuk.core;

public class Item {
String title;

boolean onLoan = false;

public Item(String title) {
this.title = title;
}

public boolean isOnLoan() {
return onLoan;
}

public String checkIn() {
if(!this.isOnLoan()) {
return "item is not currently on loan";
}
this.onLoan = false;
return "item has been checked in";
}

public String checkOut() {
if(this.isOnLoan()) {
return "item is currently on loan";
}
this.onLoan = true;
return "item has been checked out";
}
}
79 changes: 13 additions & 66 deletions src/main/java/com/booleanuk/core/Library.java
Original file line number Diff line number Diff line change
@@ -1,53 +1,24 @@
package com.booleanuk.core;

import java.util.ArrayList;
import java.util.List;

public class Library {
List<Article> articles;
List<Book> books;
List<Newspaper> newspapers;
List<Item> items;

public void addToStock(Article item) {
this.articles.add(item);
public Library() {
this.items = new ArrayList<>();
}

public void addToStock(Book item) {
this.books.add(item);
}

public void addToStock(Newspaper item) {
this.newspapers.add(item);
public void addToStock(Item item) {
this.items.add(item);
}

// The following methods may contain code that you are unfamiliar with. The strange syntax of article -> something
// is called a lambda expression (https://www.w3schools.com/java/java_lambda.asp)
public String checkInArticle(String title) {
List<Article> filtered = this.articles.stream()
.filter(article -> article.title.equals(title))
.toList();

if (filtered.size() < 1) {
return "item is not part of the library's collection";
}

return filtered.get(0).checkIn();
}

public String checkOutArticle(String title) {
List<Article> filtered = this.articles.stream()
.filter(article -> article.title.equals(title))
.toList();

if (filtered.size() < 1) {
return "item is not part of the library's collection";
}

return filtered.get(0).checkOut();
}

public String checkInBook(String title) {
List<Book> filtered = this.books.stream()
.filter(book -> book.title.equals(title))
public String checkInItem(String title) {
List<Item> filtered = this.items.stream()
.filter(item -> item.title.equals(title))
.toList();

if (filtered.size() < 1) {
Expand All @@ -57,36 +28,12 @@ public String checkInBook(String title) {
return filtered.get(0).checkIn();
}

public String checkOutBook(String title) {
List<Book> filtered = this.books.stream()
.filter(book -> book.title.equals(title))
public String checkOutItem(String title) {
List<Item> filtered = this.items.stream()
.filter(item -> item.title.equals(title))
.toList();

if (filtered.size() < 1) {
return "item is not part of the library's collection";
}

return filtered.get(0).checkOut();
}

public String checkInNewspaper(String title) {
List<Newspaper> filtered = this.newspapers.stream()
.filter(newspaper -> newspaper.title.equals(title))
.toList();

if (filtered.size() < 1) {
return "item is not part of the library's collection";
}

return filtered.get(0).checkIn();
}

public String checkOutNewspaper(String title) {
List<Newspaper> filtered = this.newspapers.stream()
.filter(newspaper -> newspaper.title.equals(title))
.toList();

if (filtered.size() < 1) {
if (filtered.isEmpty()) {
return "item is not part of the library's collection";
}

Expand Down
13 changes: 4 additions & 9 deletions src/main/java/com/booleanuk/core/Newspaper.java
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
package com.booleanuk.core;

public class Newspaper {
String title;

boolean onLoan = false;
public class Newspaper extends Item {

public Newspaper(String title) {
this.title = title;
}

public boolean isOnLoan() {
return onLoan;
super(title);
}

@Override
public String checkIn() {
return "newspapers are not available for loan";
}

@Override
public String checkOut() {
return "newspapers are not available for loan";
}
Expand Down
14 changes: 10 additions & 4 deletions src/test/java/com/booleanuk/core/ArticleTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,36 @@
class ArticleTest {
@Test
public void shouldCheckOutIfAvailable() {
Article article = new Article("JUnit Rocks");
Article article = new Article("JUnit Rocks", new Author("Johnson", "12345678", "[email protected]"));
Assertions.assertEquals("item has been checked out", article.checkOut());
}

@Test
public void shouldDeclineIfNotAvailableToCheckout() {
Article article = new Article("JUnit Rocks");
Article article = new Article("JUnit Rocks", new Author("Johnson", "12345678", "[email protected]"));
article.checkOut();

Assertions.assertEquals("item is currently on loan", article.checkOut());
}

@Test
public void shouldCheckInIfOnLoan() {
Article article = new Article("JUnit Rocks");
Article article = new Article("JUnit Rocks", new Author("Johnson", "12345678", "[email protected]"));
article.checkOut();

Assertions.assertEquals("item has been checked in", article.checkIn());
}

@Test
public void shouldDeclineCheckInIfNotOnLoan() {
Article article = new Article("JUnit Rocks");
Article article = new Article("JUnit Rocks", new Author("Johnson", "12345678", "[email protected]"));

Assertions.assertEquals("item is not currently on loan", article.checkIn());
}

@Test
public void articleIsOfItemClass() {
Article article = new Article("A book", new Author("Johnson", "12345678", "[email protected]"));
Assertions.assertEquals(Item.class ,article.getClass().getSuperclass());
}
}
8 changes: 4 additions & 4 deletions src/test/java/com/booleanuk/core/BookTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,29 @@
public class BookTest {
@Test
public void shouldCheckOutIfAvailable() {
Book book = new Book("JUnit Rocks");
Book book = new Book("JUnit Rocks", new Author("Johnson", "12345678", "[email protected]"));
Assertions.assertEquals("item has been checked out", book.checkOut());
}

@Test
public void shouldDeclineIfNotAvailableToCheckout() {
Book book = new Book("JUnit Rocks");
Book book = new Book("JUnit Rocks", new Author("Johnson", "12345678", "[email protected]"));
book.checkOut();

Assertions.assertEquals("item is currently on loan", book.checkOut());
}

@Test
public void shouldCheckInIfOnLoan() {
Book book = new Book("JUnit Rocks");
Book book = new Book("JUnit Rocks", new Author("Johnson", "12345678", "[email protected]"));
book.checkOut();

Assertions.assertEquals("item has been checked in", book.checkIn());
}

@Test
public void shouldDeclineCheckInIfNotOnLoan() {
Book book = new Book("JUnit Rocks");
Book book = new Book("JUnit Rocks", new Author("Johnson", "12345678", "[email protected]"));

Assertions.assertEquals("item is not currently on loan", book.checkIn());
}
Expand Down
37 changes: 37 additions & 0 deletions src/test/java/com/booleanuk/core/LibraryTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package com.booleanuk.core;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

public class LibraryTest {
@Test
public void addingABookToStockTest() {
Library library = new Library();
Book book = new Book("The Handbook to Everything", new Author("Johnson", "12345678", "[email protected]"));
library.addToStock(book);
Assertions.assertEquals(book, library.items.get(0));
}

@Test
public void checkInNotCheckedOutBookGivesErrorStringTest() {
Library library = new Library();
Assertions.assertEquals("item is not part of the library's collection", library.checkInItem("title"));
}

@Test
public void checkInCheckedOutBookTest() {
Library library = new Library();
Book book = new Book("The Handbook to Everything", new Author("Johnson", "12345678", "[email protected]"));
book.checkOut();
library.addToStock(book);
Assertions.assertEquals("item has been checked in", library.checkInItem("The Handbook to Everything"));
}

@Test
public void checkOutItemGivesTest() {
Library library = new Library();
Book book = new Book("The Handbook to Everything", new Author("Johnson", "12345678", "[email protected]"));
library.addToStock(book);
Assertions.assertEquals("item has been checked out", library.checkOutItem("The Handbook to Everything"));
}
}