fix: fixing BusStop error and adding all objects test

src/scenic/simulators/carla/model.scenic

@@ -252,7 +252,7 @@ class Chair(Prop):
 
 
 class BusStop(Prop):
-    blueprint: Uniform(*blueprints.busStopsModels)
+    blueprint: Uniform(*blueprints.busStopModels)
 
 
 class Advertisement(Prop):

tests/simulators/carla/all_objects.scenic

@@ -5,33 +5,33 @@ param time_step = 1.0/10
 model scenic.simulators.carla.model
 
 ego = new Car
-atm = new ATM visible
-advertisement = new Advertisement visible
-barrel = new Barrel visible
-barrier = new Barrier visible
-bench = new Bench visible
-bicycle = new Bicycle visible
-box = new Box visible
-#busstop = new BusStop visible
-casev = new Case visible
-chair = new Chair visible
-cone = new Cone visible
-container = new Container visible
-creasedbox = new CreasedBox visible
-debris = new Debris visible
-garbage = new Garbage visible
-gnome = new Gnome visible
-ironplate = new IronPlate visible
-kiosk = new Kiosk visible
-mailbox = new Mailbox visible
-motorcycle = new Motorcycle visible
-npccar = new NPCCar visible
-pedestrian = new Pedestrian visible
-plantpot = new PlantPot visible
-table = new Table visible
-trafficwarning = new TrafficWarning visible
-trash = new Trash visible
-truck = new Truck visible
-vendingmachine = new VendingMachine visible
+atm = new ATM
+advertisement = new Advertisement
+barrel = new Barrel
+barrier = new Barrier
+bench = new Bench
+bicycle = new Bicycle
+box = new Box
+busstop = new BusStop
+casev = new Case
+chair = new Chair
+cone = new Cone
+container = new Container
+creasedbox = new CreasedBox
+debris = new Debris
+garbage = new Garbage
+gnome = new Gnome
+ironplate = new IronPlate
+kiosk = new Kiosk
+mailbox = new Mailbox
+motorcycle = new Motorcycle
+npccar = new NPCCar
+pedestrian = new Pedestrian
+plantpot = new PlantPot
+table = new Table
+trafficwarning = new TrafficWarning
+trash = new Trash
+truck = new Truck
+vendingmachine = new VendingMachine
 
-terminate after 4 seconds
+terminate after 1 seconds

tests/simulators/carla/test_carla.py

@@ -10,19 +10,53 @@
 )
 
 
-def test_atm_object(loadLocalScenario):
+def test_all_objects(loadLocalScenario):
     pytest.importorskip("carla")
     from scenic.simulators.carla import CarlaSimulator
 
-    scenario = loadLocalScenario("atm.scenic", mode2D=True)
+    scenario = loadLocalScenario("all_objects.scenic", mode2D=True)
     scene, _ = scenario.generate(maxIterations=10000)
     simulator = CarlaSimulator(
         carla_map="Town05", map_path="../../../assets/maps/CARLA/Town05.xodr"
     )
     simulation = simulator.simulate(scene)
-    object_class_type = str(type(simulation.objects[1]))
-    atm_class_type = re.search(r"\.([A-Za-z]+)\'>", object_class_type).group(1)
-    assert atm_class_type == "ATM"
+    objects = simulation.objects
+    expected_objects = [
+        "ATM",
+        "Advertisement",
+        "Barrel",
+        "Barrier",
+        "Bench",
+        "Bicycle",
+        "Box",
+        "BusStop",
+        "Car",
+        "Case",
+        "Chair",
+        "Cone",
+        "Container",
+        "CreasedBox",
+        "Debris",
+        "Garbage",
+        "Gnome",
+        "IronPlate",
+        "Kiosk",
+        "Mailbox",
+        "Motorcycle",
+        "NPCCar",
+        "Pedestrian",
+        "PlantPot",
+        "Table",
+        "TrafficWarning",
+        "Trash",
+        "Truck",
+        "VendingMachine",
+    ]
+    assert len(objects) == len(expected_objects)
+    for i in range(len(expected_objects)):
+        object = str(type(objects[i]))
+        object_class = re.search(r"\.([A-Za-z]+)\'>", object).group(1)
+        assert object_class in expected_objects
 
 
 def test_throttle(loadLocalScenario):