diff --git a/carApp/.DS_Store b/carApp/.DS_Store index 5aa1c5b..9fb14e2 100644 Binary files a/carApp/.DS_Store and b/carApp/.DS_Store differ diff --git a/carApp/src/.DS_Store b/carApp/src/.DS_Store index 41722a8..78f6bb5 100644 Binary files a/carApp/src/.DS_Store and b/carApp/src/.DS_Store differ diff --git a/carApp/src/test/java/CarTest.java b/carApp/src/test/java/CarTest.java index eade0e8..16a8209 100644 --- a/carApp/src/test/java/CarTest.java +++ b/carApp/src/test/java/CarTest.java @@ -1,42 +1,83 @@ +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; + import static org.assertj.core.api.Assertions.assertThat; public class CarTest { - private Car voiture; + private Car car; + private final ByteArrayOutputStream outContent = new ByteArrayOutputStream(); + private final PrintStream originalOut = System.out; @BeforeEach public void setUp() { - voiture = new Car("Sedan", "Bleu"); + car = new Car("Sedan", "Bleu"); + System.setOut(new PrintStream(outContent)); + } + + @AfterEach + public void restoreStreams() { + System.setOut(originalOut); } @Test public void testAccelerate() { - voiture.accelerate(); - assertThat(voiture.getSpeed()).isEqualTo(10); + car.accelerate(); + assertThat(car.getSpeed()).isEqualTo(10); } @Test public void testSlowDown() { - voiture.accelerate(); - voiture.slowDown(); - assertThat(voiture.getSpeed()).isEqualTo(0); + car.accelerate(); + car.slowDown(); + assertThat(car.getSpeed()).isEqualTo(0); } @Test public void testAccelerateToMax() { for (int i = 0; i < 12; i++) { - voiture.accelerate(); + car.accelerate(); } - assertThat(voiture.getSpeed()).isEqualTo(120); + assertThat(car.getSpeed()).isEqualTo(120); } @Test public void testSlowDownToMin() { - voiture.accelerate(); - voiture.slowDown(); - voiture.slowDown(); - assertThat(voiture.getSpeed()).isEqualTo(0); + car.accelerate(); + car.slowDown(); + car.slowDown(); + assertThat(car.getSpeed()).isEqualTo(0); + } + + @Test + public void testStartCar() { + Driver driver = new Driver("John", 20); + car.startCar(driver); + assertThat(outContent.toString().trim()).isEqualTo("John démarre la voiture."); + } + + @Test + public void testStopCar() { + Driver driver = new Driver("John", 20); + car.stopCar(driver); + assertThat(outContent.toString().trim()).isEqualTo("John arrête la voiture."); + } + + @Test + public void testChangeSpeed() { + Driver driver = new Driver("John", 20); + car.changeSpeed(driver, 80); + assertThat(car.getSpeed()).isEqualTo(80); + } + + @Test + public void testChangeSpeedToSame() { + Driver driver = new Driver("John", 20); + car.changeSpeed(driver, 10); + assertThat(car.getSpeed()).isEqualTo(10); } } \ No newline at end of file diff --git a/carApp/src/test/java/DriverTest.java b/carApp/src/test/java/DriverTest.java index 80f8c3c..529b04d 100644 --- a/carApp/src/test/java/DriverTest.java +++ b/carApp/src/test/java/DriverTest.java @@ -26,33 +26,4 @@ public class DriverTest { public void testIsAdult() { assertThat(driver.isAdult()).isTrue(); } - - @Test - public void testStartCar() { - Car voiture = new Car("Sedan", "Bleu"); - driver.startCar(voiture); - assertThat(outContent.toString().trim()).isEqualTo("John démarre la voiture."); - } - - @Test - public void testStopCar() { - Car voiture = new Car("Sedan", "Bleu"); - driver.stopCar(voiture); - assertThat(outContent.toString().trim()).isEqualTo("John arrête la voiture."); - } - - @Test - public void testChangeSpeed() { - Car voiture = new Car("Sedan", "Bleu"); - driver.changeSpeed(voiture, 80); - assertThat(voiture.getSpeed()).isEqualTo(80); - } - - @Test - public void testChangeSpeedToSame() { - Car voiture = new Car("Sedan", "Bleu"); - voiture.accelerate(); - driver.changeSpeed(voiture, 10); - assertThat(voiture.getSpeed()).isEqualTo(10); - } } \ No newline at end of file