Move EGO completely on road during unit tests

Author: shalinmehtalgsvl

tests/test_NPC.py

@@ -58,7 +58,7 @@ def test_get_agents(self):
     def test_NPC_follow_lane(self): #Check if NPC can follow lane
         with SimConnection() as sim:
             state = spawnState(sim)
-            state.position.z -= 5
+            state.position.x -= 5
             sim.add_agent("Jaguar2015XE (Apollo 3.5)", lgsvl.AgentType.EGO, state)
             agent = self.create_NPC(sim, "Sedan")
             agent.follow_closest_lane(True, 5.6)
@@ -71,7 +71,7 @@ def test_NPC_follow_lane(self): #Check if NPC can follow lane
     def test_rotate_NPC(self): # Check if NPC can be rotated
         with SimConnection() as sim:
             state = spawnState(sim)
-            state.position.z -= 5
+            state.position.x -= 5
             sim.add_agent("Jaguar2015XE (Apollo 3.5)", lgsvl.AgentType.EGO, state)
             agent = self.create_NPC(sim, "SUV")
             self.assertAlmostEqual(agent.state.transform.rotation.y, 0, places=3)
@@ -151,7 +151,7 @@ def test_access_removed_NPC(self): # Check that and exception is raised when try
     def test_follow_waypoints(self): # Check that the NPC can follow waypoints
         with SimConnection(60) as sim:
             state = spawnState(sim)
-            state.position.z -= 5
+            state.position.x -= 5
             sim.add_agent("Jaguar2015XE (Apollo 3.5)", lgsvl.AgentType.EGO, state)
             spawns = sim.get_spawn()
             sx = spawns[0].position.x
@@ -192,16 +192,16 @@ def test_high_waypoint(self): # Check that a NPC will drive to under a high wayp
         try:
             with SimConnection(15) as sim:
                 state = spawnState(sim)
-                state.position.z -= 5
+                state.position.x -= 5
                 sim.add_agent("Jaguar2015XE (Apollo 3.5)", lgsvl.AgentType.EGO, state)
                 spawns = sim.get_spawn()
                 sx = spawns[0].position.x
                 sy = spawns[0].position.y
                 sz = spawns[0].position.z
                 agent = self.create_NPC(sim, "Sedan")
 
-                px = 12
-                pz = 4
+                px = 4
+                pz = 12
                 py = 5
                 speed = 6
                 wp = [lgsvl.DriveWaypoint(lgsvl.Vector(sx-px, sy+py, sz+pz), speed)]
@@ -217,7 +217,7 @@ def on_waypoint(agent,index):
     def test_npc_different_directions(self): # Check that specified velocities match the NPC's movement
         with SimConnection() as sim:
             state = spawnState(sim)
-            state.position.z -= 5
+            state.position.x -= 5
             sim.add_agent("Jaguar2015XE (Apollo 3.5)", lgsvl.AgentType.EGO, state)
             state = spawnState(sim)
             state.velocity = lgsvl.Vector(-10,0,0)
@@ -253,7 +253,7 @@ def on_stop_line(agent):
                 npc.follow_closest_lane(True, 10)
                 npc.on_stop_line(on_stop_line)
 
-                state.position.z -= 5
+                state.position.x -= 5
                 sim.add_agent("Jaguar2015XE (Apollo 3.5)", lgsvl.AgentType.EGO, state)
                 sim.run(60)
         self.assertIn("Waypoint reached", repr(e.exception))

tests/test_peds.py

@@ -15,7 +15,7 @@ class TestPeds(unittest.TestCase):
     def test_ped_creation(self): # Check if the different types of Peds can be created
         with SimConnection() as sim:
             state = spawnState(sim)
-            state.position.z -= 5
+            state.position.z -= 4
             sim.add_agent("Jaguar2015XE (Apollo 3.5)", lgsvl.AgentType.EGO, state)
             for name in ["Bob", "EntrepreneurFemale", "Howard", "Johny", \
                 "Pamela", "Presley", "Red", "Robin", "Stephen", "Zoe"]:
@@ -26,7 +26,7 @@ def test_ped_creation(self): # Check if the different types of Peds can be creat
     def test_ped_random_walk(self): # Check if pedestrians can walk randomly
         with SimConnection() as sim:
             state = spawnState(sim)
-            state.position.z -= 5
+            state.position.z -= 4
             sim.add_agent("Jaguar2015XE (Apollo 3.5)", lgsvl.AgentType.EGO, state)
             state = spawnState(sim)
             spawnPoint = state.transform.position
@@ -48,7 +48,7 @@ def test_ped_random_walk(self): # Check if pedestrians can walk randomly
     def test_ped_circle_waypoints(self): # Check if pedestrians can follow waypoints
         with SimConnection(60) as sim:
             state = spawnState(sim)
-            state.position.z -= 5
+            state.position.z -= 4
             sim.add_agent("Jaguar2015XE (Apollo 3.5)", lgsvl.AgentType.EGO, state)
             state = spawnState(sim)
             sx = state.position.x