Modification des tests unitaires

.idea/geometry.iml

@@ -5,6 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/garage/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/garage/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/garage/src/tests" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
@@ -13,8 +14,8 @@
     <orderEntry type="module-library" scope="TEST">
       <library name="JUnit4">
         <CLASSES>
-          <root url="jar://$USER_HOME$/.m2/repository/junit/junit/4.12/junit-4.12.jar!/" />
-          <root url="jar://$USER_HOME$/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

garage/src/tests/TestVehicle.java

+import vehicle.part.option.Aircon;
+import vehicle.part.option.CareerBars;
+import vehicle.part.option.Option;
+
+import java.util.List;
+
+public class TestVehicle {
+
+}

garage/src/vehicle/Vehicle.java

@@ -128,28 +128,10 @@ public class Vehicle {
         return options;
     }
 
-    // DISPLAY /////////////////////////////////////////////////////////////////////////////////////////////////////////
-    public void displayVehicleInformation(){
-        // Clear screen
-        System.out.print("\033[H\033[2J");
-        System.out.flush();
-
-        System.out.println("|------------------------------------------------------------------|");
-        System.out.println("|                       VEHICULE INFORMATION                       |");
-        System.out.println("|------------------------------------------------------------------|");
-        System.out.println(" BRAND: " + brand + " MODEL: " + name +" PRICE: " + price);
-
-        System.out.println("|-----------------------------------------------------------------|");
+    public VehicleBrand getBrand(){
+        return this.brand;
     }
 
-
-    // Get the brand of the car
-    public VehicleBrand getBrand(){return this.brand;}
-
-    // Get the options of the car
-    // public List<vehicle.part.option> getOptions()
-
-    // Get the price
     public double getPrice(List<Option> options){
         int index = 0;
         double price = 0;
@@ -158,11 +140,23 @@ public class Vehicle {
             return price;
         }
         else{
-            //    price = options.Stream.forEach(o -> o.getPrice);
             price = options.stream().collect(Collectors.summingDouble(Option::getPrice));
         }
 
         return price;
+    }
+
+    // DISPLAY /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    public void displayVehicleInformation(){
+        // Clear screen
+        System.out.print("\033[H\033[2J");
+        System.out.flush();
 
+        System.out.println("|------------------------------------------------------------------|");
+        System.out.println("|                       VEHICULE INFORMATION                       |");
+        System.out.println("|------------------------------------------------------------------|");
+        System.out.println(" BRAND: " + brand + " MODEL: " + name +" PRICE: " + price);
+
+        System.out.println("|-----------------------------------------------------------------|");
     }
 }
\ No newline at end of file

garage/test/TestVehicle.java

-public class TestVehicle {
-}