build.gradle

@@ -10,8 +10,6 @@ repositories {
 dependencies {
 	testImplementation(platform('org.junit:junit-bom:5.10.0'))
 	testImplementation('org.junit.jupiter:junit-jupiter')
-	testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2'
-	testImplementation "org.mockito:mockito-core:3.+"
 }
 
 test {

src/main/java/movierental/Customer.java

@@ -48,9 +48,8 @@ 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";

src/main/java/movierental/Movie.java

@@ -21,7 +21,6 @@ public class Movie {
     public void setPriceCode(int arg) {
         _priceCode = arg;
     }
-
     public String getTitle() {
         return _title;
     }

src/test/java/movierental/CustomerTest.java

@@ -2,32 +2,31 @@ package movierental;
 
 import org.junit.jupiter.api.Test;
 
-import static org.mockito.Mockito.mock;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.when;
-import static org.assertj.core.api.Assertions.assertThat;
 
 public class CustomerTest {
 
     @Test
     public void test() {
-        // Given
         Customer customer = new Customer("Bob");
-        Movie mockMovie = mock(Movie.class);
+        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("Short New", Movie.NEW_RELEASE), 1));
+        customer.addRental(new Rental(new Movie("Long New", Movie.NEW_RELEASE), 2));
+        customer.addRental(new Rental(new Movie("Bambi", Movie.CHILDRENS), 3));
+        customer.addRental(new Rental(new Movie("Toy Story", Movie.CHILDRENS), 4));
 
-        when(mockMovie.getTitle()).thenReturn("Mock Movie");
-        when(mockMovie.getPriceCode()).thenReturn(Movie.REGULAR);
-        customer.addRental(new Rental(mockMovie, 2));
-
-        // When
-        String statement = customer.statement();
-
-        // Then
         String expected = "" +
                 "Rental Record for Bob\n" +
-                "\tMock Movie\t2.0\n" +
+                "\tJaws\t2.0\n" +
-                "Amount owed is 2.0\n" +
+                "\tGolden Eye\t3.5\n" +
-                "You earned 1 frequent renter points";
+                "\tShort New\t3.0\n" +
+                "\tLong New\t6.0\n" +
+                "\tBambi\t1.5\n" +
+                "\tToy Story\t3.0\n" +
+                "Amount owed is 19.0\n" +
+                "You earned 7 frequent renter points";
 
-        assertThat(statement).isEqualTo(expected);
+        assertEquals(expected, customer.statement());
     }
 }