Fixed test structure

Author: sam

test/ev3dev2/util/__init__.py test/ev3dev2/simulator/__init__.pytest/ev3dev2/util/__init__.py renamed to test/ev3dev2/simulator/__init__.py

@@ -1,15 +1,16 @@
 import threading
 import unittest
 
-from ev3dev2.connection.message.DataRequest import DataRequest
-from ev3dev2.connection.message.DriveCommand import DriveCommand
-from ev3dev2.connection.message.SoundCommand import SoundCommand
-from simulator.connection.MessageProcessor import MessageProcessor
-from simulator.state.RobotState import get_robot_state
-from simulator.util.Util import load_config, apply_scaling
+# based on scaling_multiplier: 0.60
+from ev3dev2.simulator.config.config import load_config
+from ev3dev2.simulator.connection.MessageProcessor import MessageProcessor
+from ev3dev2.simulator.connection.message.DataRequest import DataRequest
+from ev3dev2.simulator.connection.message.DriveCommand import DriveCommand
+from ev3dev2.simulator.connection.message.SoundCommand import SoundCommand
+from ev3dev2.simulator.state.RobotState import get_robot_state
+from ev3dev2.simulator.util.Util import apply_scaling
 
 
-# based on scaling_multiplier: 0.60
 class MessageProcessorTest(unittest.TestCase):
 
     def test_create_jobs_left(self):

…lator/connection/MessageProcessorTest.py …lator/connection/MessageProcessorTest.pytest/simulator/connection/MessageProcessorTest.py renamed to test/ev3dev2/simulator/connection/MessageProcessorTest.py test/simulator/connection/MessageProcessorTest.py renamed to test/ev3dev2/simulator/connection/MessageProcessorTest.py

@@ -2,12 +2,12 @@
 import threading
 import unittest
 
-from simulator.connection.ServerSocket import ServerSocket
-from simulator.state.RobotState import get_robot_state
-from simulator.util.Util import load_config
+# based on scaling_multiplier: 0.60
+from ev3dev2.simulator.config.config import load_config
+from ev3dev2.simulator.connection.ServerSocket import ServerSocket
+from ev3dev2.simulator.state.RobotState import get_robot_state
 
 
-# based on scaling_multiplier: 0.60
 class ServerSocketTest(unittest.TestCase):
 
     def test_process_drive_command(self):

…simulator/connection/ServerSocketTest.py …simulator/connection/ServerSocketTest.pytest/simulator/connection/ServerSocketTest.py renamed to test/ev3dev2/simulator/connection/ServerSocketTest.py test/simulator/connection/ServerSocketTest.py renamed to test/ev3dev2/simulator/connection/ServerSocketTest.py

@@ -1,7 +1,7 @@
 import unittest
 
-from ev3dev2.util.MotorCommandCreator import MotorCommandCreator
-from simulator.util.Util import load_config
+from ev3dev2.simulator.config.config import load_config
+from ev3dev2.simulator.connector.MotorCommandCreator import MotorCommandCreator
 
 
 class MotorCommandCreatorTest(unittest.TestCase):

test/simulator/__init__.py …ev3dev2/simulator/connection/__init__.pytest/simulator/__init__.py renamed to test/ev3dev2/simulator/connection/__init__.py test/simulator/__init__.py renamed to test/ev3dev2/simulator/connection/__init__.py

@@ -2,8 +2,8 @@
 
 import arcade
 
-from simulator.obstacle.Border import Border
-from simulator.util.Util import load_config
+from ev3dev2.simulator.config.config import load_config
+from ev3dev2.simulator.obstacle.Border import Border
 
 
 class BorderTest(unittest.TestCase):

…/ev3dev2/util/MotorCommandCreatorTest.py …tor/connector/MotorCommandCreatorTest.pytest/ev3dev2/util/MotorCommandCreatorTest.py renamed to test/ev3dev2/simulator/connector/MotorCommandCreatorTest.py test/ev3dev2/util/MotorCommandCreatorTest.py renamed to test/ev3dev2/simulator/connector/MotorCommandCreatorTest.py

@@ -1,6 +1,6 @@
 import unittest
 
-from simulator.util.Util import get_circle_points, pythagoras, calc_differential_steering_angle_x_y
+from ev3dev2.simulator.util.Util import get_circle_points, calc_differential_steering_angle_x_y, pythagoras
 
 
 class UtilTest(unittest.TestCase):