Skip to content

Commit

Permalink
Merge pull request #2 from ArnaudOggy/fare_conversion
Browse files Browse the repository at this point in the history 
Fares v2>v1 - Increased functional test coverage
  • Loading branch information
@pbench
pbench authored Mar 24, 2020
2 parents b430151 + 4f732ce commit 6a1f943
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 8 deletions.
3 changes: 2 additions & 1 deletion tests/fixtures/merge-ntfs/input/ticket_prices.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
ticket_id,ticket_price,ticket_currency,ticket_validity_start,ticket_validity_end
OIF:ticket.1,3.14,EUR,20190101,20190630
OIF:ticket.1,3.14,EUR,20190101,20190331
OIF:ticket.1,3.15,EUR,20190401,20190630
1 change: 1 addition & 0 deletions tests/fixtures/merge-ntfs/input/ticket_use_perimeters.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ ticket_use_id,object_type,object_id,perimeter_action
OIF:ticket-use.1,network,OIF:101,1
OIF:ticket-use.1,network,OIF:102,1
OIF:ticket-use.1,line,OIF:002002002:LICOIF829,2
OIF:ticket-use.2,line,OIF:002002002:LICOIF829,1
1 change: 1 addition & 0 deletions tests/fixtures/merge-ntfs/input/ticket_uses.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
ticket_use_id,ticket_id,max_transfers,boarding_time_limit,alighting_time_limit
OIF:ticket-use.1,OIF:ticket.1,3,,120
OIF:ticket-use.2,OIF:ticket.1,0,,
5 changes: 4 additions & 1 deletion tests/fixtures/merge-ntfs/output_merge_fares/fares.csv
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
avant changement;après changement;début trajet;fin trajet;condition globale;clef ticket
*;line=line:B42;stoparea=stop_area:CDG&nb_changes<1;stoparea=stop_area:NAT;;ticket-use.2
*;line=line:B42;stoparea=stop_area:NAT&nb_changes<1;stoparea=stop_area:CDG;;ticket-use.2
*;line=line:M1;stoparea=stop_area:NAT&nb_changes<1;stoparea=stop_area:CDG;;ticket-use.4
*;line=line:OIF:002002002:LICOIF829;nb_changes<1;;;OIF:ticket-use.2
*;network=network:OIF:101;line!=line:OIF:002002002:LICOIF829&nb_changes<4;duration<121;;OIF:ticket-use.1
*;network=network:OIF:102;line!=line:OIF:002002002:LICOIF829&nb_changes<4;duration<121;;OIF:ticket-use.1
*;network=network:TGN;nb_changes<1;;;ticket-use.1
*;network=network:TGN;;;;ticket-use.1
*;network=network:TGN;zone=ZoneParis&line!=line:B42&nb_changes<2&duration<31;zone=ZoneOffParis&duration<91;;ticket-use.3
network=network:OIF:101;network=network:OIF:101;ticket=OIF:ticket-use.1&line!=line:OIF:002002002:LICOIF829&nb_changes<4;duration<121;;
network=network:OIF:101;network=network:OIF:102;ticket=OIF:ticket-use.1&line!=line:OIF:002002002:LICOIF829&nb_changes<4;duration<121;;
network=network:OIF:102;network=network:OIF:101;ticket=OIF:ticket-use.1&line!=line:OIF:002002002:LICOIF829&nb_changes<4;duration<121;;
network=network:OIF:102;network=network:OIF:102;ticket=OIF:ticket-use.1&line!=line:OIF:002002002:LICOIF829&nb_changes<4;duration<121;;
network=network:TGN;network=network:TGN;ticket=ticket-use.1&;;;
network=network:TGN;network=network:TGN;ticket=ticket-use.3&zone=ZoneParis&line!=line:B42&nb_changes<2&duration<31;zone=ZoneOffParis&duration<91;;
5 changes: 4 additions & 1 deletion tests/fixtures/merge-ntfs/output_merge_fares/prices.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
OIF:ticket-use.1;20190101;20190701;314;;;;centime
OIF:ticket-use.1;20190101;20190401;314;;;;centime
OIF:ticket-use.1;20190401;20190701;315;;;;centime
OIF:ticket-use.2;20190101;20190401;314;;;;centime
OIF:ticket-use.2;20190401;20190701;315;;;;centime
ticket-use.1;20190101;20200101;90;;;;centime
ticket-use.2;20190101;20200101;113;;;;centime
ticket-use.4;20190101;20200101;116;;;;centime
3 changes: 2 additions & 1 deletion tests/fixtures/merge-ntfs/output_merge_fares/ticket_prices.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ ticket.1,0.9,EUR,20190101,20191231
ticket.2,1.13,EUR,20190101,20191231
ticket.3,1.38,GBP,20190101,20191231
ticket.4,1.16,EUR,20190101,20191231
OIF:ticket.1,3.14,EUR,20190101,20190630
OIF:ticket.1,3.14,EUR,20190101,20190331
OIF:ticket.1,3.15,EUR,20190401,20190630
1 change: 1 addition & 0 deletions tests/fixtures/merge-ntfs/output_merge_fares/ticket_use_perimeters.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ ticket-use.4,line,M1,1
OIF:ticket-use.1,network,OIF:101,1
OIF:ticket-use.1,network,OIF:102,1
OIF:ticket-use.1,line,OIF:002002002:LICOIF829,2
OIF:ticket-use.2,line,OIF:002002002:LICOIF829,1
1 change: 1 addition & 0 deletions tests/fixtures/merge-ntfs/output_merge_fares/ticket_use_restrictions.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ticket_use_id,restriction_type,use_origin,use_destination
ticket-use.2,OD,NAT,CDG
ticket-use.2,OD,CDG,NAT
ticket-use.3,zone,ZoneParis,ZoneOffParis
ticket-use.4,OD,NAT,CDG
3 changes: 2 additions & 1 deletion tests/fixtures/merge-ntfs/output_merge_fares/ticket_uses.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ticket_use_id,ticket_id,max_transfers,boarding_time_limit,alighting_time_limit
ticket-use.1,ticket.1,0,,
ticket-use.1,ticket.1,,,
ticket-use.2,ticket.2,0,,
ticket-use.3,ticket.3,1,30,90
ticket-use.4,ticket.4,0,,
OIF:ticket-use.1,OIF:ticket.1,3,,120
OIF:ticket-use.2,OIF:ticket.1,0,,
4 changes: 3 additions & 1 deletion tests/fixtures/merge-ntfs/output_merge_fares_only_one_farev2/fares.csv
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
avant changement;après changement;début trajet;fin trajet;condition globale;clef ticket
*;line=line:B42;stoparea=stop_area:CDG&nb_changes<1;stoparea=stop_area:NAT;;ticket-use.2
*;line=line:B42;stoparea=stop_area:NAT&nb_changes<1;stoparea=stop_area:CDG;;ticket-use.2
*;line=line:M1;stoparea=stop_area:NAT&nb_changes<1;stoparea=stop_area:CDG;;ticket-use.4
*;network=network:TGN;nb_changes<1;;;ticket-use.1
*;network=network:TGN;;;;ticket-use.1
*;network=network:TGN;zone=ZoneParis&line!=line:B42&nb_changes<2&duration<31;zone=ZoneOffParis&duration<91;;ticket-use.3
network=network:TGN;network=network:TGN;ticket=ticket-use.1&;;;
network=network:TGN;network=network:TGN;ticket=ticket-use.3&zone=ZoneParis&line!=line:B42&nb_changes<2&duration<31;zone=ZoneOffParis&duration<91;;
1 change: 1 addition & 0 deletions tests/fixtures/merge-ntfs/output_merge_fares_only_one_farev2/ticket_use_restrictions.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ticket_use_id,restriction_type,use_origin,use_destination
ticket-use.2,OD,NAT,CDG
ticket-use.2,OD,CDG,NAT
ticket-use.3,zone,ZoneParis,ZoneOffParis
ticket-use.4,OD,NAT,CDG
2 changes: 1 addition & 1 deletion tests/fixtures/merge-ntfs/output_merge_fares_only_one_farev2/ticket_uses.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ticket_use_id,ticket_id,max_transfers,boarding_time_limit,alighting_time_limit
ticket-use.1,ticket.1,0,,
ticket-use.1,ticket.1,,,
ticket-use.2,ticket.2,0,,
ticket-use.3,ticket.3,1,30,90
ticket-use.4,ticket.4,0,,
1 change: 1 addition & 0 deletions tests/fixtures/ntfs/ticket_use_restrictions.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ticket_use_id,restriction_type,use_origin,use_destination
ticket-use.2,OD,NAT,CDG
ticket-use.2,OD,CDG,NAT
ticket-use.3,zone,ZoneParis,ZoneOffParis
ticket-use.4,OD,NAT,CDG
2 changes: 1 addition & 1 deletion tests/fixtures/ntfs/ticket_uses.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ticket_use_id,ticket_id,max_transfers,boarding_time_limit,alighting_time_limit
ticket-use.1,ticket.1,0,,
ticket-use.1,ticket.1,,,
ticket-use.2,ticket.2,0,,
ticket-use.3,ticket.3,1,30,90
ticket-use.4,ticket.4,0,,

0 comments on commit 6a1f943

Please sign in to comment.