Merge branch 'master' of https://gvipers.imt-lille-douai.fr/arthur.poignonnec/geometry

# Conflicts:
#	garage/src/Option/Option.java
#	garage/src/vehicle/part/engine/Engine.java

.idea/geometry.iml

@@ -3,6 +3,8 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/garage/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/garage/src" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>

.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="12" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/classes" />
   </component>
 </project>
\ No newline at end of file

garage/src/garage/Task.java

@@ -5,13 +5,13 @@ import java.util.List;
 
 public class Task {
 
-    private Class clazz;
-    private Method method;
+    private Object obj;
+    private String method;
     private List<Object> args;
     private Integer t;
 
-    public Task(Class clazz, Method method, List<Object> args, Integer t) {
-        this.clazz = clazz;
+    public Task(Object obj, String method, List<Object> args, Integer t) {
+        this.obj = obj;
         this.method = method;
         this.args = args;
         this.t = t;

garage/src/vehicle/Vehicle.java

@@ -6,6 +6,7 @@ import vehicle.part.frame.Frame;
 import vehicle.part.gearbox.GearBox;
 import vehicle.part.gearbox.GearBoxAutomatic;
 import vehicle.part.gearbox.GearBoxManual;
+import vehicle.part.option.Option;
 import vehicle.part.pedal.Pedal;
 import vehicle.part.pedal.PedalAccelerator;
 import vehicle.part.pedal.PedalBrake;
@@ -13,6 +14,7 @@ import vehicle.part.pedal.PedalClutch;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class Vehicle {
 
@@ -63,6 +65,10 @@ public class Vehicle {
         if("MANUAL".equals(model.getEngineModel().getGearBoxType())) {
             pedals.add(new PedalClutch((GearBoxManual) gearBox));
         }
+
+        // CREATING OPTIONS
+        options = new ArrayList<>();
+
     }
 
     // METHODS /////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -97,6 +103,30 @@ public class Vehicle {
         return frame.getWeight();
     }
 
+    public Frame getFrame() {
+        return frame;
+    }
+
+    public List<Pedal> getPedals() {
+        return pedals;
+    }
+
+    public GearBox getGearBox() {
+        return gearBox;
+    }
+
+    public List<Brake> getBrakes() {
+        return brakes;
+    }
+
+    public Engine getEngine() {
+        return engine;
+    }
+
+    public List<Option> getOptions() {
+        return options;
+    }
+
     // DISPLAY /////////////////////////////////////////////////////////////////////////////////////////////////////////
     public void displayVehicleInformation(){
         // Clear screen
@@ -113,7 +143,7 @@ public class Vehicle {
 
 
     // Get the brand of the car
-    public VehicleBrand getBrand(){return this.brand};
+    public VehicleBrand getBrand(){return this.brand;}
 
     // Get the options of the car
     // public List<vehicle.part.option> getOptions()
@@ -127,9 +157,10 @@ public class Vehicle {
             return price;
         }
         else{
-            while (index < options.size()){
+            /*while (index < options.size()){
                 price = options.Stream.forEach(o -> o.getPrice);
-            }
+            }*/
+            price = options.stream().collect(Collectors.summingDouble(Option::getPrice));
         }
 
         return price;
@@ -137,4 +168,6 @@ public class Vehicle {
     }
 
 
+
+
 }

garage/test/TestBenchTest.java

@@ -6,7 +6,10 @@ import vehicle.Vehicle;
 import vehicle.VehicleModel;
 import vehicle.part.pedal.PedalAccelerator;
 
+import java.util.Arrays;
+
 import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.assertNull;
 
 public class TestBenchTest {
@@ -14,6 +17,7 @@ public class TestBenchTest {
     private TestBench testBench;
     private Vehicle fiat500;
     private Vehicle peugeot5008;
+    private Task task;
 
     @Before
     public void setUp(){
@@ -21,6 +25,7 @@ public class TestBenchTest {
 
         fiat500 = new Vehicle(VehicleModel.FIAT_500);
         peugeot5008 = new Vehicle(VehicleModel.PEUGEOT_5008);
+        task = new Task(fiat500.getPedals().get(0), "setState", Arrays.asList(50d), 5);
     }
 
     @Test
@@ -70,7 +75,18 @@ public class TestBenchTest {
 
     @Test
     public void addTaskTest(){
+        assertEquals(0, testBench.getTasks().size());
+        testBench.addTask(task);
+        assertEquals(1, testBench.getTasks().size());
+        assertTrue(testBench.getTasks().contains(task));
+    }
 
+    @Test
+    public void removeTaskTest(){
+        testBench.addTask(task);
+        assertEquals(1, testBench.getTasks().size());
+        testBench.removeTask(task);
+        assertEquals(0, testBench.getTasks().size());
     }