From 114293ff36e1da07f1c8da8b7a2b58361c5b7bdc Mon Sep 17 00:00:00 2001 From: Eduard Maura Date: Fri, 20 Jul 2018 10:29:30 +0200 Subject: [PATCH] Rename some classes --- src/main/java/com/twu/biblioteca/App.java | 36 +++++++++---------- ...AppInputController.java => UserInput.java} | 4 +-- ...ontroller.java => AuthenticatorInput.java} | 4 +-- .../books/application/BookRepository.java | 6 ++-- ...helvesInteractor.java => BookShelves.java} | 12 +++---- .../books/core/{BookInfo.java => Book.java} | 4 +-- .../books/core/BookInfoBuilder.java | 12 +++---- ...ookInputController.java => BookInput.java} | 4 +-- .../books/infrastructure/BookPresenter.java | 16 ++++----- .../persistence/InMemoryBookRepository.java | 10 +++--- ...elvesInteractor.java => MovieShelves.java} | 4 +-- ...ieInputController.java => MovieInput.java} | 4 +-- .../movies/infrastructure/MoviePresenter.java | 6 ++-- ...rollerShould.java => UserInputShould.java} | 10 +++--- ...uld.java => AuthenticatorInputShould.java} | 8 ++--- ...ctorShould.java => BookShelvesShould.java} | 6 ++-- .../{BookInfoShould.java => BookShould.java} | 12 +++---- ...rollerShould.java => BookInputShould.java} | 6 ++-- .../infrastructure/BookPresenterShould.java | 6 ++-- ...torShould.java => MovieShelvesShould.java} | 4 +-- ...ollerShould.java => MovieInputShould.java} | 4 +-- .../infrastructure/MoviePresenterShould.java | 6 ++-- 22 files changed, 92 insertions(+), 92 deletions(-) rename src/main/java/com/twu/biblioteca/{AppInputController.java => UserInput.java} (86%) rename src/main/java/com/twu/biblioteca/authentication/infrastructure/{AuthenticatorInputController.java => AuthenticatorInput.java} (80%) rename src/main/java/com/twu/biblioteca/books/application/{BookShelvesInteractor.java => BookShelves.java} (62%) rename src/main/java/com/twu/biblioteca/books/core/{BookInfo.java => Book.java} (95%) rename src/main/java/com/twu/biblioteca/books/infrastructure/{BookInputController.java => BookInput.java} (74%) rename src/main/java/com/twu/biblioteca/movies/application/{MovieShelvesInteractor.java => MovieShelves.java} (84%) rename src/main/java/com/twu/biblioteca/movies/infrastructure/{MovieInputController.java => MovieInput.java} (75%) rename src/test/java/com/twu/biblioteca/{AppInputControllerShould.java => UserInputShould.java} (75%) rename src/test/java/com/twu/biblioteca/authentication/infrastructure/{AuthenticatorInputControllerShould.java => AuthenticatorInputShould.java} (73%) rename src/test/java/com/twu/biblioteca/books/application/{BookShelvesInteractorShould.java => BookShelvesShould.java} (85%) rename src/test/java/com/twu/biblioteca/books/core/{BookInfoShould.java => BookShould.java} (75%) rename src/test/java/com/twu/biblioteca/books/infrastructure/{BookInputControllerShould.java => BookInputShould.java} (62%) rename src/test/java/com/twu/biblioteca/movies/application/{MovieShelvesInteractorShould.java => MovieShelvesShould.java} (81%) rename src/test/java/com/twu/biblioteca/movies/infrastructure/{MovieInputControllerShould.java => MovieInputShould.java} (76%) diff --git a/src/main/java/com/twu/biblioteca/App.java b/src/main/java/com/twu/biblioteca/App.java index c5a2948..3b70156 100644 --- a/src/main/java/com/twu/biblioteca/App.java +++ b/src/main/java/com/twu/biblioteca/App.java @@ -4,17 +4,17 @@ import com.twu.biblioteca.accounts.infrastructure.AccountPresenter; import com.twu.biblioteca.accounts.infrastructure.persistence.InMemoryAccountRepository; import com.twu.biblioteca.authentication.application.Authenticator; -import com.twu.biblioteca.authentication.infrastructure.AuthenticatorInputController; +import com.twu.biblioteca.authentication.infrastructure.AuthenticatorInput; import com.twu.biblioteca.authentication.infrastructure.AuthenticatorPresenter; import com.twu.biblioteca.authentication.infrastructure.InvalidLibraryNumber; import com.twu.biblioteca.authentication.infrastructure.persistence.InMemoryAccessRepository; import com.twu.biblioteca.books.application.BookRepository; -import com.twu.biblioteca.books.application.BookShelvesInteractor; -import com.twu.biblioteca.books.infrastructure.BookInputController; +import com.twu.biblioteca.books.application.BookShelves; +import com.twu.biblioteca.books.infrastructure.BookInput; import com.twu.biblioteca.books.infrastructure.BookPresenter; import com.twu.biblioteca.books.infrastructure.persistence.InMemoryBookRepository; -import com.twu.biblioteca.movies.application.MovieShelvesInteractor; -import com.twu.biblioteca.movies.infrastructure.MovieInputController; +import com.twu.biblioteca.movies.application.MovieShelves; +import com.twu.biblioteca.movies.infrastructure.MovieInput; import com.twu.biblioteca.movies.infrastructure.MoviePresenter; import com.twu.biblioteca.movies.infrastructure.persistance.InMemoryMovieRepository; @@ -38,19 +38,19 @@ public class App { public static void main(String[] args) { AppPresenter appPresenter = new AppPresenter(System.out); - AppInputController user = new AppInputController(System.in); + UserInput userInput = new UserInput(System.in); - BookShelvesInteractor bookShelves = new BookShelvesInteractor(bookRepository); - BookInputController bookInputController = new BookInputController(System.in); + BookShelves bookShelves = new BookShelves(bookRepository); + BookInput bookInput = new BookInput(System.in); BookPresenter bookPresenter = new BookPresenter(bookShelves, System.out); - MovieInputController movieInputController = new MovieInputController(System.in); - MovieShelvesInteractor movieShelves = new MovieShelvesInteractor(movieRepository); + MovieInput movieInput = new MovieInput(System.in); + MovieShelves movieShelves = new MovieShelves(movieRepository); MoviePresenter moviePresenter = new MoviePresenter(movieShelves, System.out); appPresenter.sayWelcome(); - AuthenticatorInputController authenticatorInputController = new AuthenticatorInputController(System.in); + AuthenticatorInput authenticatorInput = new AuthenticatorInput(System.in); Authenticator authenticator = new Authenticator(accessRepository); AuthenticatorPresenter authenticatorPresenter = new AuthenticatorPresenter(authenticator, System.out); @@ -59,28 +59,28 @@ public static void main(String[] args) { while (account == null) { try { appPresenter.askForLibraryNumber(); - String libraryNumber = authenticatorInputController.entersLibraryNumber(); + String libraryNumber = authenticatorInput.entersLibraryNumber(); appPresenter.askForPassword(); - String password = authenticatorInputController.entersPassword(); + String password = authenticatorInput.entersPassword(); if (authenticatorPresenter.canAccess(libraryNumber, password)) account = libraryNumber; } catch (InvalidLibraryNumber e) { authenticatorPresenter.warnInvalidLibraryNumber(); } } appPresenter.showMenu(); - while (!user.wantsToExit()) { - switch (user.getSelectedOption()) { + while (!userInput.wantsToExit()) { + switch (userInput.getSelectedOption()) { case 1: bookPresenter.listAvailableBooks(); break; case 2: bookPresenter.askForBookCheckOut(); - String bookTitle = bookInputController.readBookTitle(); + String bookTitle = bookInput.readBookTitle(); bookPresenter.checkOutBook(bookTitle); break; case 3: bookPresenter.askForBookReturn(); - bookTitle = bookInputController.readBookTitle(); + bookTitle = bookInput.readBookTitle(); bookPresenter.returnBook(bookTitle); break; case 4: @@ -88,7 +88,7 @@ public static void main(String[] args) { break; case 5: moviePresenter.askForMovieCheckOut(); - String movieName = movieInputController.readMovieName(); + String movieName = movieInput.readMovieName(); moviePresenter.checkOutMovie(movieName); break; case 6: diff --git a/src/main/java/com/twu/biblioteca/AppInputController.java b/src/main/java/com/twu/biblioteca/UserInput.java similarity index 86% rename from src/main/java/com/twu/biblioteca/AppInputController.java rename to src/main/java/com/twu/biblioteca/UserInput.java index 9e6155c..ac07a16 100644 --- a/src/main/java/com/twu/biblioteca/AppInputController.java +++ b/src/main/java/com/twu/biblioteca/UserInput.java @@ -3,11 +3,11 @@ import java.io.InputStream; import java.util.Scanner; -class AppInputController { +class UserInput { private final Scanner scanner; private Integer selectedOption; - AppInputController(InputStream inputScanner) { + UserInput(InputStream inputScanner) { this.scanner = new Scanner(inputScanner); } diff --git a/src/main/java/com/twu/biblioteca/authentication/infrastructure/AuthenticatorInputController.java b/src/main/java/com/twu/biblioteca/authentication/infrastructure/AuthenticatorInput.java similarity index 80% rename from src/main/java/com/twu/biblioteca/authentication/infrastructure/AuthenticatorInputController.java rename to src/main/java/com/twu/biblioteca/authentication/infrastructure/AuthenticatorInput.java index 6a36507..581b618 100644 --- a/src/main/java/com/twu/biblioteca/authentication/infrastructure/AuthenticatorInputController.java +++ b/src/main/java/com/twu/biblioteca/authentication/infrastructure/AuthenticatorInput.java @@ -3,11 +3,11 @@ import java.io.InputStream; import java.util.Scanner; -public class AuthenticatorInputController { +public class AuthenticatorInput { private final Scanner scanner; - public AuthenticatorInputController(InputStream in) { + public AuthenticatorInput(InputStream in) { this.scanner = new Scanner(in); } diff --git a/src/main/java/com/twu/biblioteca/books/application/BookRepository.java b/src/main/java/com/twu/biblioteca/books/application/BookRepository.java index 0708178..84ce9fe 100644 --- a/src/main/java/com/twu/biblioteca/books/application/BookRepository.java +++ b/src/main/java/com/twu/biblioteca/books/application/BookRepository.java @@ -1,12 +1,12 @@ package com.twu.biblioteca.books.application; -import com.twu.biblioteca.books.core.BookInfo; +import com.twu.biblioteca.books.core.Book; import java.util.Collection; import java.util.Optional; public interface BookRepository { - Collection listBooks(); + Collection listBooks(); - Optional find(String bookTitle); + Optional find(String bookTitle); } diff --git a/src/main/java/com/twu/biblioteca/books/application/BookShelvesInteractor.java b/src/main/java/com/twu/biblioteca/books/application/BookShelves.java similarity index 62% rename from src/main/java/com/twu/biblioteca/books/application/BookShelvesInteractor.java rename to src/main/java/com/twu/biblioteca/books/application/BookShelves.java index 9575cc8..5dedb57 100644 --- a/src/main/java/com/twu/biblioteca/books/application/BookShelvesInteractor.java +++ b/src/main/java/com/twu/biblioteca/books/application/BookShelves.java @@ -1,30 +1,30 @@ package com.twu.biblioteca.books.application; -import com.twu.biblioteca.books.core.BookInfo; +import com.twu.biblioteca.books.core.Book; import java.util.Collection; import java.util.Optional; -public class BookShelvesInteractor { +public class BookShelves { private final BookRepository bookRepository; - public BookShelvesInteractor(BookRepository bookRepository) { + public BookShelves(BookRepository bookRepository) { this.bookRepository = bookRepository; } - public Collection listBooks() { + public Collection listBooks() { return this.bookRepository.listBooks(); } public void checkOut(String bookTitle) { - Optional book = this.bookRepository.find(bookTitle); + Optional book = this.bookRepository.find(bookTitle); if (book.isPresent()) book.get().checkOut(); else throw new BookNotFound(); } public void returnBook(String bookTitle) { - Optional book = this.bookRepository.find(bookTitle); + Optional book = this.bookRepository.find(bookTitle); if (book.isPresent()) book.get().returnCopy(); else throw new BookNotFound(); } diff --git a/src/main/java/com/twu/biblioteca/books/core/BookInfo.java b/src/main/java/com/twu/biblioteca/books/core/Book.java similarity index 95% rename from src/main/java/com/twu/biblioteca/books/core/BookInfo.java rename to src/main/java/com/twu/biblioteca/books/core/Book.java index 5115f62..edd273e 100644 --- a/src/main/java/com/twu/biblioteca/books/core/BookInfo.java +++ b/src/main/java/com/twu/biblioteca/books/core/Book.java @@ -1,13 +1,13 @@ package com.twu.biblioteca.books.core; -public class BookInfo { +public class Book { private final String title; private String authorName; private int publicationYear; private boolean checkedOut; - BookInfo(String title) { + Book(String title) { this.title = title; } diff --git a/src/main/java/com/twu/biblioteca/books/core/BookInfoBuilder.java b/src/main/java/com/twu/biblioteca/books/core/BookInfoBuilder.java index 5af36c1..e7aef44 100644 --- a/src/main/java/com/twu/biblioteca/books/core/BookInfoBuilder.java +++ b/src/main/java/com/twu/biblioteca/books/core/BookInfoBuilder.java @@ -21,12 +21,12 @@ public BookInfoBuilder publishedInYear(int year) { return this; } - public BookInfo build() { - BookInfo bookInfo = new BookInfo(title); - bookInfo.setAuthorName(this.author); - bookInfo.setPublicationYear(this.publicationYear); - bookInfo.setCheckedOut(checkedOut); - return bookInfo; + public Book build() { + Book book = new Book(title); + book.setAuthorName(this.author); + book.setPublicationYear(this.publicationYear); + book.setCheckedOut(checkedOut); + return book; } diff --git a/src/main/java/com/twu/biblioteca/books/infrastructure/BookInputController.java b/src/main/java/com/twu/biblioteca/books/infrastructure/BookInput.java similarity index 74% rename from src/main/java/com/twu/biblioteca/books/infrastructure/BookInputController.java rename to src/main/java/com/twu/biblioteca/books/infrastructure/BookInput.java index c1c51ea..66f4c80 100644 --- a/src/main/java/com/twu/biblioteca/books/infrastructure/BookInputController.java +++ b/src/main/java/com/twu/biblioteca/books/infrastructure/BookInput.java @@ -3,10 +3,10 @@ import java.io.InputStream; import java.util.Scanner; -public class BookInputController { +public class BookInput { private final Scanner scanner; - public BookInputController(InputStream inputStream) { + public BookInput(InputStream inputStream) { this.scanner = new Scanner(inputStream); } diff --git a/src/main/java/com/twu/biblioteca/books/infrastructure/BookPresenter.java b/src/main/java/com/twu/biblioteca/books/infrastructure/BookPresenter.java index fc6cf66..13700a4 100644 --- a/src/main/java/com/twu/biblioteca/books/infrastructure/BookPresenter.java +++ b/src/main/java/com/twu/biblioteca/books/infrastructure/BookPresenter.java @@ -1,8 +1,8 @@ package com.twu.biblioteca.books.infrastructure; import com.twu.biblioteca.books.application.BookNotFound; -import com.twu.biblioteca.books.application.BookShelvesInteractor; -import com.twu.biblioteca.books.core.BookInfo; +import com.twu.biblioteca.books.application.BookShelves; +import com.twu.biblioteca.books.core.Book; import com.twu.biblioteca.books.core.BookNotAvailable; import com.twu.biblioteca.books.core.NotAbleToReturnBook; @@ -20,10 +20,10 @@ public class BookPresenter { private static final String THANK_YOU_FOR_RETURNING = "Thank you for returning the book"; private static final String NOT_VALID_BOOK = "That is not a valid book to return"; - private final BookShelvesInteractor bookShelves; + private final BookShelves bookShelves; private final PrintStream output; - public BookPresenter(BookShelvesInteractor bookShelves, PrintStream output) { + public BookPresenter(BookShelves bookShelves, PrintStream output) { this.bookShelves = bookShelves; this.output = output; } @@ -37,13 +37,13 @@ public void askForBookCheckOut() { } public void listAvailableBooks() { - Collection books = bookShelves.listBooks(); - List availableBooks = books.stream().filter(BookInfo::isAvailable).collect(Collectors.toList()); + Collection books = bookShelves.listBooks(); + List availableBooks = books.stream().filter(Book::isAvailable).collect(Collectors.toList()); if (availableBooks.isEmpty()) output.println("There are no books in the shelves"); else { output.println(HEADERS); - for (BookInfo bookInfo : availableBooks) { - output.println(bookInfo.getTitle() + SPACE_BETWEEN_COLUMNS + bookInfo.getAuthorName() + SPACE_BETWEEN_COLUMNS + bookInfo.getPublicationYear()); + for (Book book : availableBooks) { + output.println(book.getTitle() + SPACE_BETWEEN_COLUMNS + book.getAuthorName() + SPACE_BETWEEN_COLUMNS + book.getPublicationYear()); } } } diff --git a/src/main/java/com/twu/biblioteca/books/infrastructure/persistence/InMemoryBookRepository.java b/src/main/java/com/twu/biblioteca/books/infrastructure/persistence/InMemoryBookRepository.java index f033315..782f121 100644 --- a/src/main/java/com/twu/biblioteca/books/infrastructure/persistence/InMemoryBookRepository.java +++ b/src/main/java/com/twu/biblioteca/books/infrastructure/persistence/InMemoryBookRepository.java @@ -1,7 +1,7 @@ package com.twu.biblioteca.books.infrastructure.persistence; import com.twu.biblioteca.books.application.BookRepository; -import com.twu.biblioteca.books.core.BookInfo; +import com.twu.biblioteca.books.core.Book; import com.twu.biblioteca.books.core.BookInfoBuilder; import java.util.Collection; @@ -11,7 +11,7 @@ import java.util.stream.Collectors; public class InMemoryBookRepository implements BookRepository { - private Map books; + private Map books; public InMemoryBookRepository(Collection books) { this.books = books.stream().collect(Collectors.toMap(mapKey(), @@ -19,16 +19,16 @@ public InMemoryBookRepository(Collection books) { } @Override - public Collection listBooks() { + public Collection listBooks() { return this.books.values(); } @Override - public Optional find(String bookTitle) { + public Optional find(String bookTitle) { return this.books.values().stream().filter(book -> book.getTitle().equals(bookTitle)).findFirst(); } - private Function mapBook() { + private Function mapBook() { return values -> new BookInfoBuilder().withTitle(values[0]).fromAuthor(values[1]).publishedInYear(Integer.parseInt(values[2])).build(); } diff --git a/src/main/java/com/twu/biblioteca/movies/application/MovieShelvesInteractor.java b/src/main/java/com/twu/biblioteca/movies/application/MovieShelves.java similarity index 84% rename from src/main/java/com/twu/biblioteca/movies/application/MovieShelvesInteractor.java rename to src/main/java/com/twu/biblioteca/movies/application/MovieShelves.java index 3f3723f..4ff6ae5 100644 --- a/src/main/java/com/twu/biblioteca/movies/application/MovieShelvesInteractor.java +++ b/src/main/java/com/twu/biblioteca/movies/application/MovieShelves.java @@ -5,11 +5,11 @@ import java.util.Collection; import java.util.Optional; -public class MovieShelvesInteractor { +public class MovieShelves { private final MovieRepository movieRepository; - public MovieShelvesInteractor(MovieRepository movieRepository) { + public MovieShelves(MovieRepository movieRepository) { this.movieRepository = movieRepository; } diff --git a/src/main/java/com/twu/biblioteca/movies/infrastructure/MovieInputController.java b/src/main/java/com/twu/biblioteca/movies/infrastructure/MovieInput.java similarity index 75% rename from src/main/java/com/twu/biblioteca/movies/infrastructure/MovieInputController.java rename to src/main/java/com/twu/biblioteca/movies/infrastructure/MovieInput.java index 1954dd8..c643566 100644 --- a/src/main/java/com/twu/biblioteca/movies/infrastructure/MovieInputController.java +++ b/src/main/java/com/twu/biblioteca/movies/infrastructure/MovieInput.java @@ -3,10 +3,10 @@ import java.io.InputStream; import java.util.Scanner; -public class MovieInputController { +public class MovieInput { private final Scanner scanner; - public MovieInputController(InputStream in) { + public MovieInput(InputStream in) { this.scanner = new Scanner(in); } diff --git a/src/main/java/com/twu/biblioteca/movies/infrastructure/MoviePresenter.java b/src/main/java/com/twu/biblioteca/movies/infrastructure/MoviePresenter.java index c6a1fb3..4f41d08 100644 --- a/src/main/java/com/twu/biblioteca/movies/infrastructure/MoviePresenter.java +++ b/src/main/java/com/twu/biblioteca/movies/infrastructure/MoviePresenter.java @@ -1,7 +1,7 @@ package com.twu.biblioteca.movies.infrastructure; import com.twu.biblioteca.movies.application.MovieNotFound; -import com.twu.biblioteca.movies.application.MovieShelvesInteractor; +import com.twu.biblioteca.movies.application.MovieShelves; import com.twu.biblioteca.movies.core.Movie; import com.twu.biblioteca.movies.core.MovieNotAvailable; @@ -18,10 +18,10 @@ public class MoviePresenter { private static final String THANK_YOU_FOR_CHECKING_OUT = "Thank you! Enjoy the movie"; private static final String MOVIE_NOT_AVAILABLE = "That movie is not available"; - private final MovieShelvesInteractor movieShelves; + private final MovieShelves movieShelves; private final PrintStream output; - public MoviePresenter(MovieShelvesInteractor movieShelves, PrintStream output) { + public MoviePresenter(MovieShelves movieShelves, PrintStream output) { this.movieShelves = movieShelves; this.output = output; } diff --git a/src/test/java/com/twu/biblioteca/AppInputControllerShould.java b/src/test/java/com/twu/biblioteca/UserInputShould.java similarity index 75% rename from src/test/java/com/twu/biblioteca/AppInputControllerShould.java rename to src/test/java/com/twu/biblioteca/UserInputShould.java index cadcc1f..4358ba2 100644 --- a/src/test/java/com/twu/biblioteca/AppInputControllerShould.java +++ b/src/test/java/com/twu/biblioteca/UserInputShould.java @@ -7,28 +7,28 @@ import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.MatcherAssert.assertThat; -public class AppInputControllerShould { +public class UserInputShould { - private AppInputController inputController; + private UserInput inputController; @Test public void returnTrueWhenUserWantsToExit() { System.setIn(new ByteArrayInputStream("0".getBytes())); - inputController = new AppInputController(System.in); + inputController = new UserInput(System.in); assertThat(inputController.wantsToExit(), is(true)); } @Test public void returnFalseWhenUserDoesNotWantToExit() { System.setIn(new ByteArrayInputStream("1".getBytes())); - inputController = new AppInputController(System.in); + inputController = new UserInput(System.in); assertThat(inputController.wantsToExit(), is(false)); } @Test public void keepSelectedOptionWhenAskingIfUserWantsToExit() { System.setIn(new ByteArrayInputStream("34".getBytes())); - inputController = new AppInputController(System.in); + inputController = new UserInput(System.in); inputController.wantsToExit(); assertThat(inputController.getSelectedOption(), is(not(nullValue()))); } diff --git a/src/test/java/com/twu/biblioteca/authentication/infrastructure/AuthenticatorInputControllerShould.java b/src/test/java/com/twu/biblioteca/authentication/infrastructure/AuthenticatorInputShould.java similarity index 73% rename from src/test/java/com/twu/biblioteca/authentication/infrastructure/AuthenticatorInputControllerShould.java rename to src/test/java/com/twu/biblioteca/authentication/infrastructure/AuthenticatorInputShould.java index 7738994..34e002e 100644 --- a/src/test/java/com/twu/biblioteca/authentication/infrastructure/AuthenticatorInputControllerShould.java +++ b/src/test/java/com/twu/biblioteca/authentication/infrastructure/AuthenticatorInputShould.java @@ -8,21 +8,21 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -public class AuthenticatorInputControllerShould { +public class AuthenticatorInputShould { - private AuthenticatorInputController inputController; + private AuthenticatorInput inputController; @Test public void readLibraryNumberFromUser() { System.setIn(new ByteArrayInputStream(TestHelper.createValidLibraryNumber().getBytes())); - inputController = new AuthenticatorInputController(System.in); + inputController = new AuthenticatorInput(System.in); assertThat(inputController.entersLibraryNumber(), is("123-1234")); } @Test public void readPasswordFromUser() { System.setIn(new ByteArrayInputStream("87q5".getBytes())); - inputController = new AuthenticatorInputController(System.in); + inputController = new AuthenticatorInput(System.in); assertThat(inputController.entersPassword(), is("87q5")); } diff --git a/src/test/java/com/twu/biblioteca/books/application/BookShelvesInteractorShould.java b/src/test/java/com/twu/biblioteca/books/application/BookShelvesShould.java similarity index 85% rename from src/test/java/com/twu/biblioteca/books/application/BookShelvesInteractorShould.java rename to src/test/java/com/twu/biblioteca/books/application/BookShelvesShould.java index d5dbcb3..4c5a896 100644 --- a/src/test/java/com/twu/biblioteca/books/application/BookShelvesInteractorShould.java +++ b/src/test/java/com/twu/biblioteca/books/application/BookShelvesShould.java @@ -8,15 +8,15 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class BookShelvesInteractorShould { +public class BookShelvesShould { private BookRepository bookRepoMock; - private BookShelvesInteractor bookShelves; + private BookShelves bookShelves; @Before public void setUp() { this.bookRepoMock = mock(BookRepository.class); - bookShelves = new BookShelvesInteractor(bookRepoMock); + bookShelves = new BookShelves(bookRepoMock); } @Test(expected = BookNotFound.class) diff --git a/src/test/java/com/twu/biblioteca/books/core/BookInfoShould.java b/src/test/java/com/twu/biblioteca/books/core/BookShould.java similarity index 75% rename from src/test/java/com/twu/biblioteca/books/core/BookInfoShould.java rename to src/test/java/com/twu/biblioteca/books/core/BookShould.java index 3d6c7a9..0cade16 100644 --- a/src/test/java/com/twu/biblioteca/books/core/BookInfoShould.java +++ b/src/test/java/com/twu/biblioteca/books/core/BookShould.java @@ -5,37 +5,37 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -public class BookInfoShould { +public class BookShould { @Test public void beAvailableWhenCreated() { - BookInfo book = new BookInfo("some title"); + Book book = new Book("some title"); assertThat(book.isAvailable(), is(true)); } @Test public void beNotAvailableWhenCheckedOut() { - BookInfo book = new BookInfo("some title"); + Book book = new Book("some title"); book.checkOut(); assertThat(book.isAvailable(), is(false)); } @Test(expected = BookNotAvailable.class) public void throwBookNotAvailableWhenTryingToCheckOutBeingNotAvailable() { - BookInfo book = new BookInfo("some title"); + Book book = new Book("some title"); book.checkOut(); book.checkOut(); } @Test(expected = NotAbleToReturnBook.class) public void throwNotAbleToReturnWhenTryingToReturnBeingAvailable() { - BookInfo book = new BookInfo("some title"); + Book book = new Book("some title"); book.returnCopy(); } @Test public void beAvailableAfterReturned() { - BookInfo book = new BookInfo("some title"); + Book book = new Book("some title"); book.checkOut(); book.returnCopy(); assertThat(book.isAvailable(), is(true)); diff --git a/src/test/java/com/twu/biblioteca/books/infrastructure/BookInputControllerShould.java b/src/test/java/com/twu/biblioteca/books/infrastructure/BookInputShould.java similarity index 62% rename from src/test/java/com/twu/biblioteca/books/infrastructure/BookInputControllerShould.java rename to src/test/java/com/twu/biblioteca/books/infrastructure/BookInputShould.java index 6a5253b..cdd3c40 100644 --- a/src/test/java/com/twu/biblioteca/books/infrastructure/BookInputControllerShould.java +++ b/src/test/java/com/twu/biblioteca/books/infrastructure/BookInputShould.java @@ -7,11 +7,11 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -public class BookInputControllerShould { +public class BookInputShould { @Test public void readUserBookTitleInput() { System.setIn(new ByteArrayInputStream("some input".getBytes())); - BookInputController bookInputController = new BookInputController(System.in); - assertThat(bookInputController.readBookTitle(), is("some input")); + BookInput bookInput = new BookInput(System.in); + assertThat(bookInput.readBookTitle(), is("some input")); } } \ No newline at end of file diff --git a/src/test/java/com/twu/biblioteca/books/infrastructure/BookPresenterShould.java b/src/test/java/com/twu/biblioteca/books/infrastructure/BookPresenterShould.java index 11a2b1c..619cd26 100644 --- a/src/test/java/com/twu/biblioteca/books/infrastructure/BookPresenterShould.java +++ b/src/test/java/com/twu/biblioteca/books/infrastructure/BookPresenterShould.java @@ -1,7 +1,7 @@ package com.twu.biblioteca.books.infrastructure; import com.twu.biblioteca.books.application.BookNotFound; -import com.twu.biblioteca.books.application.BookShelvesInteractor; +import com.twu.biblioteca.books.application.BookShelves; import com.twu.biblioteca.books.core.BookInfoBuilder; import com.twu.biblioteca.books.core.BookNotAvailable; import com.twu.biblioteca.books.core.NotAbleToReturnBook; @@ -17,13 +17,13 @@ public class BookPresenterShould { - private BookShelvesInteractor bookShelvesMock; + private BookShelves bookShelvesMock; private PrintStream outMock; private BookPresenter presenter; @Before public void setUp() { - bookShelvesMock = mock(BookShelvesInteractor.class); + bookShelvesMock = mock(BookShelves.class); outMock = mock(PrintStream.class); presenter = new BookPresenter(bookShelvesMock, outMock); } diff --git a/src/test/java/com/twu/biblioteca/movies/application/MovieShelvesInteractorShould.java b/src/test/java/com/twu/biblioteca/movies/application/MovieShelvesShould.java similarity index 81% rename from src/test/java/com/twu/biblioteca/movies/application/MovieShelvesInteractorShould.java rename to src/test/java/com/twu/biblioteca/movies/application/MovieShelvesShould.java index b7ffe0a..5a49aa8 100644 --- a/src/test/java/com/twu/biblioteca/movies/application/MovieShelvesInteractorShould.java +++ b/src/test/java/com/twu/biblioteca/movies/application/MovieShelvesShould.java @@ -8,7 +8,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class MovieShelvesInteractorShould { +public class MovieShelvesShould { private MovieRepository movieRepoMock; @@ -20,7 +20,7 @@ public void setUp() { @Test(expected = MovieNotFound.class) public void throwMovieNotFoundWhenCheckingOutAMovieNotInTheShelves() { when(movieRepoMock.find("A non existing movie")).thenReturn(Optional.empty()); - MovieShelvesInteractor movieShelvesInteractor = new MovieShelvesInteractor(movieRepoMock); + MovieShelves movieShelvesInteractor = new MovieShelves(movieRepoMock); movieShelvesInteractor.checkOutMovie("A non existing movie"); } } diff --git a/src/test/java/com/twu/biblioteca/movies/infrastructure/MovieInputControllerShould.java b/src/test/java/com/twu/biblioteca/movies/infrastructure/MovieInputShould.java similarity index 76% rename from src/test/java/com/twu/biblioteca/movies/infrastructure/MovieInputControllerShould.java rename to src/test/java/com/twu/biblioteca/movies/infrastructure/MovieInputShould.java index 9990a8f..dc77ca2 100644 --- a/src/test/java/com/twu/biblioteca/movies/infrastructure/MovieInputControllerShould.java +++ b/src/test/java/com/twu/biblioteca/movies/infrastructure/MovieInputShould.java @@ -7,12 +7,12 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -public class MovieInputControllerShould { +public class MovieInputShould { @Test public void readMovieNameFromUserInput() { System.setIn(new ByteArrayInputStream("some input".getBytes())); - MovieInputController inputController = new MovieInputController(System.in); + MovieInput inputController = new MovieInput(System.in); assertThat(inputController.readMovieName(), is("some input")); } } \ No newline at end of file diff --git a/src/test/java/com/twu/biblioteca/movies/infrastructure/MoviePresenterShould.java b/src/test/java/com/twu/biblioteca/movies/infrastructure/MoviePresenterShould.java index e9e50b2..a865d54 100644 --- a/src/test/java/com/twu/biblioteca/movies/infrastructure/MoviePresenterShould.java +++ b/src/test/java/com/twu/biblioteca/movies/infrastructure/MoviePresenterShould.java @@ -1,7 +1,7 @@ package com.twu.biblioteca.movies.infrastructure; import com.twu.biblioteca.movies.application.MovieNotFound; -import com.twu.biblioteca.movies.application.MovieShelvesInteractor; +import com.twu.biblioteca.movies.application.MovieShelves; import com.twu.biblioteca.movies.core.MovieBuilder; import com.twu.biblioteca.movies.core.MovieNotAvailable; import org.junit.Before; @@ -15,13 +15,13 @@ import static org.mockito.Mockito.*; public class MoviePresenterShould { - private MovieShelvesInteractor movieShelvesMock; + private MovieShelves movieShelvesMock; private PrintStream fakeOutput; private MoviePresenter presenter; @Before public void setUp() { - movieShelvesMock = mock(MovieShelvesInteractor.class); + movieShelvesMock = mock(MovieShelves.class); fakeOutput = mock(PrintStream.class); presenter = new MoviePresenter(movieShelvesMock, fakeOutput); }