From acee0797997920db87330f67f05e7842da720d33 Mon Sep 17 00:00:00 2001
From: Feror <contact@feror.fr>
Date: Thu, 23 Jan 2025 11:36:25 +0100
Subject: [PATCH] =?UTF-8?q?d=C3=A9portation=20des=20tests=20des=20m=C3=A9t?=
 =?UTF-8?q?hodes=20startCar,=20stopCar=20et=20changeVitesse=20vers=20la=20?=
 =?UTF-8?q?classe=20CarTest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 carApp/.DS_Store                     | Bin 6148 -> 6148 bytes
 carApp/src/.DS_Store                 | Bin 6148 -> 6148 bytes
 carApp/src/test/java/CarTest.java    |  67 +++++++++++++++++++++------
 carApp/src/test/java/DriverTest.java |  29 ------------
 4 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/carApp/.DS_Store b/carApp/.DS_Store
index 5aa1c5be30400539e29c4facf594824d494cbae2..9fb14e292b12eef217686fd2319fa3e3e6f91a8b 100644
GIT binary patch
delta 51
zcmV-30L=e{FoZC$ECd1(f|D);ivc^6x&#^p+>P-~DU;a*Ujj9;lR5=p0Wg!B1)%~t
J%(FfQ#u2#Q5p4hf

delta 51
zcmV-30L=e{FoZC$ECd1&`jajMiviP<x&#^pLN?E^D3jR)Ujj<NlR5=p0g#iM1)%~s
Jqq9B+#u3vW5+wit

diff --git a/carApp/src/.DS_Store b/carApp/src/.DS_Store
index 41722a8e6ed631a5f4a2b2359c5dfa7edf50d94e..78f6bb55dd80a73bb64e9a232cb039993e507639 100644
GIT binary patch
delta 15
WcmZoMXffC@kC92_&gKP-DPjOE$OU)+

delta 15
WcmZoMXffC@kC91u^X3JNDPjOD%LPsV

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