From c2ae3f8f2e15507ea2155c005ca919c1973988ce Mon Sep 17 00:00:00 2001 From: Feror Date: Tue, 4 Feb 2025 10:35:05 +0100 Subject: [PATCH] Changements de style de code --- src/main/java/movierental/Customer.java | 3 ++- src/main/java/movierental/Movie.java | 1 + src/test/java/movierental/CustomerTest.java | 8 +++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/movierental/Customer.java b/src/main/java/movierental/Customer.java index a38d677..bfdf7d5 100644 --- a/src/main/java/movierental/Customer.java +++ b/src/main/java/movierental/Customer.java @@ -48,8 +48,9 @@ public class Customer { // add frequent renter points frequentRenterPoints++; // add bonus for a two day new release rental - if ((each.getMovie().getPriceCode() == Movie.NEW_RELEASE) && each.getDaysRented() > 1) + if ((each.getMovie().getPriceCode() == Movie.NEW_RELEASE) && each.getDaysRented() > 1) { frequentRenterPoints++; + } // show figures for this rental result += "\t" + each.getMovie().getTitle() + "\t" + String.valueOf(thisAmount) + "\n"; diff --git a/src/main/java/movierental/Movie.java b/src/main/java/movierental/Movie.java index 7e9c14c..f7c79cf 100644 --- a/src/main/java/movierental/Movie.java +++ b/src/main/java/movierental/Movie.java @@ -21,6 +21,7 @@ public class Movie { public void setPriceCode(int arg) { _priceCode = arg; } + public String getTitle() { return _title; } diff --git a/src/test/java/movierental/CustomerTest.java b/src/test/java/movierental/CustomerTest.java index 1be9e38..3263827 100644 --- a/src/test/java/movierental/CustomerTest.java +++ b/src/test/java/movierental/CustomerTest.java @@ -8,6 +8,7 @@ public class CustomerTest { @Test public void test() { + // Given Customer customer = new Customer("Bob"); customer.addRental(new Rental(new Movie("Jaws", Movie.REGULAR), 2)); customer.addRental(new Rental(new Movie("Golden Eye", Movie.REGULAR), 3)); @@ -16,6 +17,11 @@ public class CustomerTest { customer.addRental(new Rental(new Movie("Bambi", Movie.CHILDRENS), 3)); customer.addRental(new Rental(new Movie("Toy Story", Movie.CHILDRENS), 4)); + // When + String statement = customer.statement(); + + + // Then String expected = "" + "Rental Record for Bob\n" + "\tJaws\t2.0\n" + @@ -27,6 +33,6 @@ public class CustomerTest { "Amount owed is 19.0\n" + "You earned 7 frequent renter points"; - assertEquals(expected, customer.statement()); + assertEquals(expected, statement); } } \ No newline at end of file