Changements de style de code
This commit is contained in:
parent
56bdaee2a2
commit
c2ae3f8f2e
3 changed files with 10 additions and 2 deletions
|
|
@ -48,8 +48,9 @@ public class Customer {
|
||||||
// add frequent renter points
|
// add frequent renter points
|
||||||
frequentRenterPoints++;
|
frequentRenterPoints++;
|
||||||
// add bonus for a two day new release rental
|
// 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++;
|
frequentRenterPoints++;
|
||||||
|
}
|
||||||
|
|
||||||
// show figures for this rental
|
// show figures for this rental
|
||||||
result += "\t" + each.getMovie().getTitle() + "\t" + String.valueOf(thisAmount) + "\n";
|
result += "\t" + each.getMovie().getTitle() + "\t" + String.valueOf(thisAmount) + "\n";
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@ public class Movie {
|
||||||
public void setPriceCode(int arg) {
|
public void setPriceCode(int arg) {
|
||||||
_priceCode = arg;
|
_priceCode = arg;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getTitle() {
|
public String getTitle() {
|
||||||
return _title;
|
return _title;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ public class CustomerTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void test() {
|
public void test() {
|
||||||
|
// Given
|
||||||
Customer customer = new Customer("Bob");
|
Customer customer = new Customer("Bob");
|
||||||
customer.addRental(new Rental(new Movie("Jaws", Movie.REGULAR), 2));
|
customer.addRental(new Rental(new Movie("Jaws", Movie.REGULAR), 2));
|
||||||
customer.addRental(new Rental(new Movie("Golden Eye", Movie.REGULAR), 3));
|
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("Bambi", Movie.CHILDRENS), 3));
|
||||||
customer.addRental(new Rental(new Movie("Toy Story", Movie.CHILDRENS), 4));
|
customer.addRental(new Rental(new Movie("Toy Story", Movie.CHILDRENS), 4));
|
||||||
|
|
||||||
|
// When
|
||||||
|
String statement = customer.statement();
|
||||||
|
|
||||||
|
|
||||||
|
// Then
|
||||||
String expected = "" +
|
String expected = "" +
|
||||||
"Rental Record for Bob\n" +
|
"Rental Record for Bob\n" +
|
||||||
"\tJaws\t2.0\n" +
|
"\tJaws\t2.0\n" +
|
||||||
|
|
@ -27,6 +33,6 @@ public class CustomerTest {
|
||||||
"Amount owed is 19.0\n" +
|
"Amount owed is 19.0\n" +
|
||||||
"You earned 7 frequent renter points";
|
"You earned 7 frequent renter points";
|
||||||
|
|
||||||
assertEquals(expected, customer.statement());
|
assertEquals(expected, statement);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Add table
Reference in a new issue