re-organized tests for riding persons. refs #21

tests/sumo/basic/person/riding/access/testsuite.sumo

@@ -0,0 +1,21 @@
+# scenario derived from output of  sumo/devices/rerouting/personTrip/car_public_walk2, see #7006
+ride_access_ride
+
+# check what happens if the from edge of a later walk isn't set and there are multiple access involved
+ride_access_ambiguous_walk
+
+# check what happens if the from edge of a later walk isn't set and there are multiple access involved
+ride_access_ambiguous_ride
+
+# check what happens if the from edge of a later walk isn't set and there are multiple access involved
+ride_access_ambiguous_taxiride
+
+# a walk and subsequent ride use redundant declarations of 
+# walk: to + busStop
+# ride: from
+# 
+# this triggers #11210
+ride_access_redundancy
+
+# ride directly to access edge of destination stop
+ride_access_busstop

tests/sumo/basic/person/riding/person_is_triggered/testsuite.sumo

@@ -0,0 +1,8 @@
+# person starting in a vehicle
+person_triggered
+
+# 2 person starting in the same vehicle
+persons_triggered
+
+# person starting in a vehicle with ride attribute from
+person_triggered_from

tests/sumo/basic/person/riding/testsuite.sumo

@@ -1,3 +1,10 @@
+# vehicle depart (at stop or insertion)  is triggered by person
+veh_is_triggered
+
+# person departure is triggered by vehicle
+person_is_triggered
+access
+
 # person with a single ride
 ride
 
@@ -54,15 +61,6 @@ public_wait
 # bus arrives past it's until time but still picks up person
 public_brief_stop
 
-# vehicle is waiting at stop for a person
-triggered
-
-# vehicle with triggered departure is discarded due to departDelay
-triggered_discard
-
-# car waiting for person
-vehicle_triggered
-
 # When all vehicles have left the simulation, any remainig persons waiting for a ride should abort their plan.
 abort_impossible_ride
 
@@ -72,17 +70,26 @@ capacity
 # specify the persons that may enter
 permitted
 
-# person ride triggers a vehicle scaled with 3
-ride_triggered_scale
+# vehicle ride ends at a containerStop but the person is set to arrive at a busStop (and depends on it's access)
+ride_stopMismatch
+
+# person uses lines="ANY", vehicle stops at a lane rather than a busStop
+ride_ANY_stopLane
+
+# tests if a person leaves a vehicle not only if the destination edge is reached but also if the vehicle that is transporting the person reached its current destination stop (plus minos some tolerance)
+leaving_vehicle_at_stop
+
+# tests if a person leaves a vehicle not only if the destination edge is reached but also if the vehicle that is transporting the person reached its current destination stop (plus minos some tolerance)
+leaving_vehicle_at_stop_subsecond
 
-# scenario derived from output of  sumo/devices/rerouting/personTrip/car_public_walk2, see #7006
-ride_access_ride
+# check correct arrival when there are multiple stops on the same edge
+three_trainStops_at_one_edge
 
-# check what happens if the from edge of a later walk isn't set and there are multiple access involved
-ride_access_ambiguous_walk
+# person rides and then stops
+ride_and_stop
 
-# check what happens if the from edge of a later walk isn't set and there are multiple access involved
-ride_access_ambiguous_ride
+# person rides and exits the vehicle with some tolerance
+ride_and_stop_tolerance
 
-# check what happens if the from edge of a later walk isn't set and there are multiple access involved
-ride_access_ambiguous_taxiride
+# If a vehicle leaves the simulation before delivering all passengers a warning should be triggered
+ride_wrong_destination

tests/sumo/basic/person/riding/veh_is_triggered/testsuite.sumo

@@ -0,0 +1,14 @@
+# vehicle is waiting at stop for a person
+triggered
+
+# vehicle with triggered departure is discarded due to departDelay
+triggered_discard
+
+# car waiting for person
+vehicle_triggered
+
+# person ride triggers a vehicle scaled with 3
+ride_triggered_scale
+
+# the ride ends before delivering passenger
+ride_premature_end

tests/sumo/basic/person/testsuite.sumo

@@ -7,27 +7,6 @@ riding
 # test option --scale
 scale
 
-# check correct arrival when there are multiple stops on the same edge
-three_trainStops_at_one_edge
-
-# person rides and then stops
-ride_and_stop
-
-# person rides and exits the vehicle with some tolerance
-ride_and_stop_tolerance
-
-# the ride ends before delivering passenger
-ride_premature_end
-
-# person starting in a vehicle
-person_triggered
-
-# person starting in a vehicle with ride attribute from
-person_triggered_from
-
-# 2 person starting in the same vehicle
-persons_triggered
-
 # person stops for a given duration
 stop_duration
 
@@ -43,27 +22,15 @@ stop_no_duration
 # person stops for a given duration, specified via attribute edge
 stop_edge
 
-# If a vehicle leaves the simulation before delivering all passengers a warning should be triggered
-ride_wrong_destination
-
 # test whether a chain of walks rides and stops works
 trip_chain
 
 # test whether a chain of walks rides and stops works (specify for charging stations, see #5384)
 trip_chain_chargingstations
 
-# tests if a person leaves a vehicle not only if the destination edge is reached but also if the vehicle that is transporting the person reached its current destination stop (plus minos some tolerance)
-leaving_vehicle_at_stop
-
-# tests if a person leaves a vehicle not only if the destination edge is reached but also if the vehicle that is transporting the person reached its current destination stop (plus minos some tolerance)
-leaving_vehicle_at_stop_subsecond
-
 # test wheather the personNumber of a vehicle decreases if persons leave the vehicle at a stop
 person_number
 
-# person uses lines="ANY", vehicle stops at a lane rather than a busStop
-ride_ANY_stopLane
-
 # successive stops on different edges should raise an error (teleporting instead via #6325)
 stop_teleport_stop
 
@@ -76,22 +43,9 @@ atJunction_walk_ride
 # last edge of the ride differs from first edge of the walk
 atJunction_ride_walk
 
-# ride directly to access edge of destination stop
-ride_access_busstop
-
-# vehicle ride ends at a containerStop but the person is set to arrive at a busStop (and depends on it's access)
-ride_stopMismatch
-
 # define rides that end at a busStop, parkingArea, etc.
 stop_stoppingPlace
 
-# a walk and subsequent ride use redundant declarations of 
-# walk: to + busStop
-# ride: from
-# 
-# this triggers #11210
-ride_access_redundancy
-
 # person is inserted to the appointed position of a edge, not next to the edge. 
 person_inserted_departPos
 errors