enter_roundabout -> roundabout-exit (these are still off by one @mokob ?)
This commit is contained in:
		
							parent
							
								
									6ae3315bb9
								
							
						
					
					
						commit
						926290dd9c
					
				| @ -22,9 +22,9 @@ Feature: Roundabout Instructions | |||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | turns                            | |             | from | to | route | turns                            | | ||||||
|             | s    | t  | sa,tb | depart,enter_roundabout-1,arrive | |             | s    | t  | sa,tb | depart,roundabout-exit-1,arrive | | ||||||
|             | s    | u  | sa,uc | depart,enter_roundabout-2,arrive | |             | s    | u  | sa,uc | depart,roundabout-exit-2,arrive | | ||||||
|             | s    | v  | sa,vd | depart,enter_roundabout-3,arrive | |             | s    | v  | sa,vd | depart,roundabout-exit-3,arrive | | ||||||
|             | u    | v  | uc,vd | depart,enter_roundabout-1,arrive | |             | u    | v  | uc,vd | depart,roundabout-exit-1,arrive | | ||||||
|             | u    | s  | uc,sa | depart,enter_roundabout-2,arrive | |             | u    | s  | uc,sa | depart,roundabout-exit-2,arrive | | ||||||
|             | u    | t  | uc,tb | depart,enter_roundabout-3,arrive | |             | u    | t  | uc,tb | depart,roundabout-exit-3,arrive | | ||||||
|  | |||||||
| @ -22,9 +22,9 @@ Feature: Roundabout Instructions | |||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | turns                            | |             | from | to | route | turns                            | | ||||||
|             | s    | t  | sa,tb | depart,enter_roundabout-1,arrive | |             | s    | t  | sa,tb | depart,roundabout-exit-1,arrive | | ||||||
|             | s    | u  | sa,uc | depart,enter_roundabout-2,arrive | |             | s    | u  | sa,uc | depart,roundabout-exit-2,arrive | | ||||||
|             | s    | v  | sa,vd | depart,enter_roundabout-3,arrive | |             | s    | v  | sa,vd | depart,roundabout-exit-3,arrive | | ||||||
|             | u    | v  | uc,vd | depart,enter_roundabout-1,arrive | |             | u    | v  | uc,vd | depart,roundabout-exit-1,arrive | | ||||||
|             | u    | s  | uc,sa | depart,enter_roundabout-2,arrive | |             | u    | s  | uc,sa | depart,roundabout-exit-2,arrive | | ||||||
|             | u    | t  | uc,tb | depart,enter_roundabout-3,arrive | |             | u    | t  | uc,tb | depart,roundabout-exit-3,arrive | | ||||||
|  | |||||||
| @ -26,9 +26,9 @@ Feature: Roundabout Instructions | |||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | turns                            | |             | from | to | route | turns                            | | ||||||
|             | s    | t  | sa,tb | depart,enter_roundabout-1,arrive | |             | s    | t  | sa,tb | depart,roundabout-exit-1,arrive | | ||||||
|             | s    | u  | sa,uc | depart,enter_roundabout-2,arrive | |             | s    | u  | sa,uc | depart,roundabout-exit-2,arrive | | ||||||
|             | s    | v  | sa,vd | depart,enter_roundabout-3,arrive | |             | s    | v  | sa,vd | depart,roundabout-exit-3,arrive | | ||||||
|             | u    | v  | uc,vd | depart,enter_roundabout-1,arrive | |             | u    | v  | uc,vd | depart,roundabout-exit-1,arrive | | ||||||
|             | u    | s  | uc,sa | depart,enter_roundabout-2,arrive | |             | u    | s  | uc,sa | depart,roundabout-exit-2,arrive | | ||||||
|             | u    | t  | uc,tb | depart,enter_roundabout-3,arrive | |             | u    | t  | uc,tb | depart,roundabout-exit-3,arrive | | ||||||
|  | |||||||
| @ -22,18 +22,18 @@ Feature: Roundabout Instructions | |||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | turns                            | |             | from | to | route | turns                            | | ||||||
|             | s    | t  | sa,tb | depart,enter_roundabout-1,arrive | |             | s    | t  | sa,tb | depart,roundabout-exit-1,arrive | | ||||||
|             | s    | u  | sa,uc | depart,enter_roundabout-2,arrive | |             | s    | u  | sa,uc | depart,roundabout-exit-2,arrive | | ||||||
|             | s    | v  | sa,vd | depart,enter_roundabout-3,arrive | |             | s    | v  | sa,vd | depart,roundabout-exit-3,arrive | | ||||||
|             | t    | u  | tb,uc | depart,enter_roundabout-1,arrive | |             | t    | u  | tb,uc | depart,roundabout-exit-1,arrive | | ||||||
|             | t    | v  | tb,vd | depart,enter_roundabout-2,arrive | |             | t    | v  | tb,vd | depart,roundabout-exit-2,arrive | | ||||||
|             | t    | s  | tb,sa | depart,enter_roundabout-3,arrive | |             | t    | s  | tb,sa | depart,roundabout-exit-3,arrive | | ||||||
|             | u    | v  | uc,vd | depart,enter_roundabout-1,arrive | |             | u    | v  | uc,vd | depart,roundabout-exit-1,arrive | | ||||||
|             | u    | s  | uc,sa | depart,enter_roundabout-2,arrive | |             | u    | s  | uc,sa | depart,roundabout-exit-2,arrive | | ||||||
|             | u    | t  | uc,tb | depart,enter_roundabout-3,arrive | |             | u    | t  | uc,tb | depart,roundabout-exit-3,arrive | | ||||||
|             | v    | s  | vd,sa | depart,enter_roundabout-1,arrive | |             | v    | s  | vd,sa | depart,roundabout-exit-1,arrive | | ||||||
|             | v    | t  | vd,tb | depart,enter_roundabout-2,arrive | |             | v    | t  | vd,tb | depart,roundabout-exit-2,arrive | | ||||||
|             | v    | u  | vd,uc | depart,enter_roundabout-3,arrive | |             | v    | u  | vd,uc | depart,roundabout-exit-3,arrive | | ||||||
| 
 | 
 | ||||||
|     Scenario: Testbot - Roundabout with oneway links |     Scenario: Testbot - Roundabout with oneway links | ||||||
|         Given the node map |         Given the node map | ||||||
| @ -58,19 +58,19 @@ Feature: Roundabout Instructions | |||||||
| 
 | 
 | ||||||
|         When I route I should get |         When I route I should get | ||||||
|             | from | to | route | turns                            | |             | from | to | route | turns                            | | ||||||
|             | j    | k  | jb,ck | depart,enter_roundabout-1,arrive | |             | j    | k  | jb,ck | depart,roundabout-exit-1,arrive | | ||||||
|             | j    | m  | jb,em | depart,enter_roundabout-2,arrive | |             | j    | m  | jb,em | depart,roundabout-exit-2,arrive | | ||||||
|             | j    | o  | jb,go | depart,enter_roundabout-3,arrive | |             | j    | o  | jb,go | depart,roundabout-exit-3,arrive | | ||||||
|             | j    | i  | jb,ai | depart,enter_roundabout-4,arrive | |             | j    | i  | jb,ai | depart,roundabout-exit-4,arrive | | ||||||
|             | l    | m  | ld,em | depart,enter_roundabout-1,arrive | |             | l    | m  | ld,em | depart,roundabout-exit-1,arrive | | ||||||
|             | l    | o  | ld,go | depart,enter_roundabout-2,arrive | |             | l    | o  | ld,go | depart,roundabout-exit-2,arrive | | ||||||
|             | l    | i  | ld,ai | depart,enter_roundabout-3,arrive | |             | l    | i  | ld,ai | depart,roundabout-exit-3,arrive | | ||||||
|             | l    | k  | ld,ck | depart,enter_roundabout-4,arrive | |             | l    | k  | ld,ck | depart,roundabout-exit-4,arrive | | ||||||
|             | n    | o  | nf,go | depart,enter_roundabout-1,arrive | |             | n    | o  | nf,go | depart,roundabout-exit-1,arrive | | ||||||
|             | n    | i  | nf,ai | depart,enter_roundabout-2,arrive | |             | n    | i  | nf,ai | depart,roundabout-exit-2,arrive | | ||||||
|             | n    | k  | nf,ck | depart,enter_roundabout-3,arrive | |             | n    | k  | nf,ck | depart,roundabout-exit-3,arrive | | ||||||
|             | n    | m  | nf,em | depart,enter_roundabout-4,arrive | |             | n    | m  | nf,em | depart,roundabout-exit-4,arrive | | ||||||
|             | p    | i  | ph,ai | depart,enter_roundabout-1,arrive | |             | p    | i  | ph,ai | depart,roundabout-exit-1,arrive | | ||||||
|             | p    | k  | ph,ck | depart,enter_roundabout-2,arrive | |             | p    | k  | ph,ck | depart,roundabout-exit-2,arrive | | ||||||
|             | p    | m  | ph,em | depart,enter_roundabout-3,arrive | |             | p    | m  | ph,em | depart,roundabout-exit-3,arrive | | ||||||
|             | p    | o  | ph,go | depart,enter_roundabout-4,arrive | |             | p    | o  | ph,go | depart,roundabout-exit-4,arrive | | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user