Refactored structure

Author: buraksenyurt

drone-lab/src/controller/mod.rs

@@ -1,5 +1,7 @@
 mod drone_repository;
 mod flight_controller;
+mod simulation_controller;
 
 pub use drone_repository::*;
 pub use flight_controller::*;
+pub use simulation_controller::*;

drone-lab/src/controller/simulation_controller.rs

@@ -0,0 +1,34 @@
+use crate::model::{Drone, Location};
+
+pub struct SimulationController<'a> {
+    drones: Vec<Drone<'a>>,
+}
+
+impl<'a> SimulationController<'a> {
+    pub fn new() -> Self {
+        SimulationController { drones: Vec::new() }
+    }
+    pub fn load(&mut self, drone_count: i32) -> bool {
+        for i in 0..drone_count {
+            self.drones.push(Drone {
+                id: 1,
+                energy_level: 100.0,
+                model: "MODEL X",
+                is_alive: true,
+                location: Location {
+                    x: 0.0,
+                    y: 0.0,
+                    z: 0.0,
+                    caption: "",
+                },
+            })
+        }
+        true
+    }
+    pub fn get_count(&self) -> usize {
+        self.drones.len()
+    }
+    pub fn get_random(&self) -> Drone {
+        self.drones[0]
+    }
+}

drone-lab/src/model/location.rs

@@ -4,4 +4,4 @@ pub struct Location<'a> {
     pub x: f32,
     pub y: f32,
     pub z: f32,
-}
+}

drone-lab/src/model/mod.rs

@@ -2,4 +2,4 @@ mod drone;
 mod location;
 
 pub use drone::Drone;
-pub use location::Location;
+pub use location::Location;

drone-lab/src/tests/mod.rs

@@ -1,3 +1,3 @@
 mod drone_repository_tests;
 mod flight_controller_tests;
-mod simulation_loader_tests;
+mod simulation_loader_tests;

drone-lab/src/tests/simulation_loader_tests.rs

@@ -1,50 +1,18 @@
 #[cfg(test)]
 mod tests {
-    use crate::model::{Drone, Location};
-
-    struct Simulation<'a> {
-        drones: Vec<Drone<'a>>,
-    }
-    impl<'a> Simulation<'a> {
-        fn new() -> Self {
-            Simulation { drones: Vec::new() }
-        }
-        fn load(&mut self, drone_count: i32) -> bool {
-            for i in 0..drone_count {
-                self.drones.push(Drone {
-                    id: 1,
-                    energy_level: 100.0,
-                    model: "MODEL X",
-                    is_alive: true,
-                    location: Location {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 0.0,
-                        caption: "",
-                    },
-                })
-            }
-            true
-        }
-        fn get_count(&self) -> usize {
-            self.drones.len()
-        }
-        fn get_random(&self) -> Drone {
-            self.drones[0]
-        }
-    }
+    use crate::controller::SimulationController;
 
     #[test]
     fn should_allocate_one_drone_test() {
-        let mut simulation = Simulation::new();
+        let mut simulation = SimulationController::new();
         let actual = simulation.load(1);
         let expected = true;
         assert_eq!(actual, expected);
     }
 
     #[test]
     fn should_allocate_ten_drone_returns_ten_test() {
-        let mut simulation = Simulation::new();
+        let mut simulation = SimulationController::new();
         let _ = simulation.load(10);
         let actual = simulation.get_count();
         assert_eq!(actual, 10);