changed to use assertj

ystromm · Martin Carlsson · mirkoperillo · commit e1764678f44a · 2021-01-30T15:05:29.000+01:00
Co-authored-by: Martin Carlsson &lt;martin.carlsson@svt.se&gt;
diff --git a/exercises/concept/classes/src/test/java/RemoteControlCarTest.java b/exercises/concept/classes/src/test/java/RemoteControlCarTest.java
@@ -2,41 +2,43 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.assertj.core.api.Assertions.*;
+
 public class RemoteControlCarTest {
     @Test
     public void buy_new_car_returns_instance() {
         RemoteControlCar car = RemoteControlCar.buy();
-        Assert.assertNotNull(car);
+        assertThat(car).isNotNull();
     }
 
     @Ignore("Remove to run test")
     @Test
     public void buy_new_car_returns_new_car_each_time() {
         RemoteControlCar car1 = RemoteControlCar.buy();
         RemoteControlCar car2 = RemoteControlCar.buy();
-        Assert.assertNotSame(car2, car1);
+        assertThat(car1).isNotEqualTo(car2);
     }
 
     @Ignore("Remove to run test")
     @Test
     public void new_car_distance_display() {
         RemoteControlCar car = new RemoteControlCar();
-        Assert.assertEquals("Driven 0 meters", car.distanceDisplay());
+        assertThat(car.distanceDisplay()).isEqualTo("Driven 0 meters");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void new_car_battery_display() {
         RemoteControlCar car = new RemoteControlCar();
-        Assert.assertEquals("Battery at 100%", car.batteryDisplay());
+        assertThat(car.batteryDisplay()).isEqualTo("Battery at 100%");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void distance_display_after_driving_once() {
         RemoteControlCar car = new RemoteControlCar();
         car.drive();
-        Assert.assertEquals("Driven 20 meters", car.distanceDisplay());
+        assertThat(car.distanceDisplay()).isEqualTo("Driven 20 meters");
     }
 
     @Ignore("Remove to run test")
@@ -48,15 +50,16 @@ public void distance_display_after_driving_multiple_times() {
             car.drive();
         }
 
-        Assert.assertEquals("Driven 340 meters", car.distanceDisplay());
+        assertThat(car.distanceDisplay()).isEqualTo("Driven 340 meters");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void battery_display_after_driving_once() {
         RemoteControlCar car = new RemoteControlCar();
         car.drive();
-        Assert.assertEquals("Battery at 99%", car.batteryDisplay());
+        
+        assertThat(car.batteryDisplay()).isEqualTo("Battery at 99%");
     }
 
     @Ignore("Remove to run test")
@@ -68,7 +71,7 @@ public void battery_display_after_driving_multiple_times() {
             car.drive();
         }
 
-        Assert.assertEquals("Battery at 77%", car.batteryDisplay());
+        assertThat(car.batteryDisplay()).isEqualTo("Battery at 77%");
     }
 
     @Ignore("Remove to run test")
@@ -84,7 +87,7 @@ public void battery_display_when_battery_empty() {
         // Attempt to drive one more time (should not work)
         car.drive();
 
-        Assert.assertEquals("Battery empty", car.batteryDisplay());
+        assertThat(car.batteryDisplay()).isEqualTo("Battery empty");
     }
 
     @Ignore("Remove to run test")
@@ -100,6 +103,6 @@ public void distance_display_when_battery_empty() {
         // Attempt to drive one more time (should not work)
         car.drive();
 
-        Assert.assertEquals("Driven 2000 meters", car.distanceDisplay());
+        assertThat(car.distanceDisplay()).isEqualTo("Driven 2000 meters");
     }
 }
