Skip to content

Commit cb0fd0c

Browse files
br648br648
committed
improvement(FaresV2ValidationTest.java): Update unit test to include fare leg join rules and rider c
1 parent 2382e77 commit cb0fd0c

4 files changed

Lines changed: 105 additions & 97 deletions

File tree

‎src/test/java/com/conveyal/datatools/manager/jobs/validation/FaresV2ValidationTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,12 @@ void canValidateFareV2Files() {
6363
List<String> files = summary.getList("files", String.class);
6464
assertTrue(files.contains("areas.txt"));
6565
assertTrue(files.contains("fare_leg_rules.txt"));
66+
assertTrue(files.contains("fare_leg_join_rules.txt"));
6667
assertTrue(files.contains("fare_media.txt"));
6768
assertTrue(files.contains("fare_products.txt"));
6869
assertTrue(files.contains("fare_transfer_rules.txt"));
6970
assertTrue(files.contains("networks.txt"));
71+
assertTrue(files.contains("rider_categories.txt"));
7072
assertTrue(files.contains("route_networks.txt"));
7173
assertTrue(files.contains("stop_areas.txt"));
7274
assertTrue(files.contains("timeframes.txt"));

‎src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-fares-v2/fare_leg_join_rules.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
from_network_id,to_network_id,from_stop_id,to_stop_id
2+
1,2,3,4

‎src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-fares-v2/fare_products.txt‎

Lines changed: 97 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,97 @@
1-
fare_product_id,fare_product_name,fare_media_id,amount,currency
2-
prod_boat_zone_1,Ferry Zone 1 one-way fare,cash,6.50,USD
3-
prod_boat_zone_1,Ferry Zone 1 one-way fare,credit_debit,6.50,USD
4-
prod_boat_zone_1,Ferry Zone 1 one-way fare,mticket,6.50,USD
5-
prod_boat_zone_1a,Ferry Zone 1A one-way fare,cash,2.40,USD
6-
prod_boat_zone_1a,Ferry Zone 1A one-way fare,credit_debit,2.40,USD
7-
prod_boat_zone_1a,Ferry Zone 1A one-way fare,mticket,2.40,USD
8-
prod_boat_zone_2,Ferry Zone 2 one-way fare,cash,7.00,USD
9-
prod_boat_zone_2,Ferry Zone 2 one-way fare,credit_debit,7.00,USD
10-
prod_boat_zone_2,Ferry Zone 2 one-way fare,mticket,7.00,USD
11-
prod_cape_buzzards_hyannis_fare,CapeFLYER Middleborough/Lakeville one-way fare,cash,5.00,USD
12-
prod_cape_buzzards_hyannis_fare,CapeFLYER Middleborough/Lakeville one-way fare,credit_debit,5.00,USD
13-
prod_cape_buzzards_hyannis_fare,CapeFLYER Middleborough/Lakeville one-way fare,mticket,5.00,USD
14-
prod_cape_sbb_buzzards_fare,CapeFLYER Bourne one-way fare,cash,20.00,USD
15-
prod_cape_sbb_buzzards_fare,CapeFLYER Bourne one-way fare,credit_debit,20.00,USD
16-
prod_cape_sbb_buzzards_fare,CapeFLYER Bourne one-way fare,mticket,20.00,USD
17-
prod_cape_sbb_hyannis_fare,CapeFLYER Hyannis one-way fare,cash,22.00,USD
18-
prod_cape_sbb_hyannis_fare,CapeFLYER Hyannis one-way fare,credit_debit,22.00,USD
19-
prod_cape_sbb_hyannis_fare,CapeFLYER Hyannis one-way fare,mticket,22.00,USD
20-
prod_cr_inter_1,Commuter Rail Interzone 1 one-way fare,cash,2.75,USD
21-
prod_cr_inter_1,Commuter Rail Interzone 1 one-way fare,credit_debit,2.75,USD
22-
prod_cr_inter_1,Commuter Rail Interzone 1 one-way fare,mticket,2.75,USD
23-
prod_cr_inter_10,Commuter Rail Interzone 10 one-way fare,cash,7.25,USD
24-
prod_cr_inter_10,Commuter Rail Interzone 10 one-way fare,credit_debit,7.25,USD
25-
prod_cr_inter_10,Commuter Rail Interzone 10 one-way fare,mticket,7.25,USD
26-
prod_cr_inter_2,Commuter Rail Interzone 2 one-way fare,cash,3.25,USD
27-
prod_cr_inter_2,Commuter Rail Interzone 2 one-way fare,credit_debit,3.25,USD
28-
prod_cr_inter_2,Commuter Rail Interzone 2 one-way fare,mticket,3.25,USD
29-
prod_cr_inter_3,Commuter Rail Interzone 3 one-way fare,cash,3.50,USD
30-
prod_cr_inter_3,Commuter Rail Interzone 3 one-way fare,credit_debit,3.50,USD
31-
prod_cr_inter_3,Commuter Rail Interzone 3 one-way fare,mticket,3.50,USD
32-
prod_cr_inter_4,Commuter Rail Interzone 4 one-way fare,cash,4.25,USD
33-
prod_cr_inter_4,Commuter Rail Interzone 4 one-way fare,credit_debit,4.25,USD
34-
prod_cr_inter_4,Commuter Rail Interzone 4 one-way fare,mticket,4.25,USD
35-
prod_cr_inter_5,Commuter Rail Interzone 5 one-way fare,cash,4.75,USD
36-
prod_cr_inter_5,Commuter Rail Interzone 5 one-way fare,credit_debit,4.75,USD
37-
prod_cr_inter_5,Commuter Rail Interzone 5 one-way fare,mticket,4.75,USD
38-
prod_cr_inter_6,Commuter Rail Interzone 6 one-way fare,cash,5.25,USD
39-
prod_cr_inter_6,Commuter Rail Interzone 6 one-way fare,credit_debit,5.25,USD
40-
prod_cr_inter_6,Commuter Rail Interzone 6 one-way fare,mticket,5.25,USD
41-
prod_cr_inter_7,Commuter Rail Interzone 7 one-way fare,cash,5.75,USD
42-
prod_cr_inter_7,Commuter Rail Interzone 7 one-way fare,credit_debit,5.75,USD
43-
prod_cr_inter_7,Commuter Rail Interzone 7 one-way fare,mticket,5.75,USD
44-
prod_cr_inter_8,Commuter Rail Interzone 8 one-way fare,cash,6.25,USD
45-
prod_cr_inter_8,Commuter Rail Interzone 8 one-way fare,credit_debit,6.25,USD
46-
prod_cr_inter_8,Commuter Rail Interzone 8 one-way fare,mticket,6.25,USD
47-
prod_cr_inter_9,Commuter Rail Interzone 9 one-way fare,cash,6.75,USD
48-
prod_cr_inter_9,Commuter Rail Interzone 9 one-way fare,credit_debit,6.75,USD
49-
prod_cr_inter_9,Commuter Rail Interzone 9 one-way fare,mticket,6.75,USD
50-
prod_cr_zone_1,Commuter Rail Zone 1 one-way fare,cash,6.50,USD
51-
prod_cr_zone_1,Commuter Rail Zone 1 one-way fare,credit_debit,6.50,USD
52-
prod_cr_zone_1,Commuter Rail Zone 1 one-way fare,mticket,6.50,USD
53-
prod_cr_zone_10,Commuter Rail Zone 10 one-way fare,cash,13.25,USD
54-
prod_cr_zone_10,Commuter Rail Zone 10 one-way fare,credit_debit,13.25,USD
55-
prod_cr_zone_10,Commuter Rail Zone 10 one-way fare,mticket,13.25,USD
56-
prod_cr_zone_1a,Commuter Rail Zone 1A one-way fare,cash,2.40,USD
57-
prod_cr_zone_1a,Commuter Rail Zone 1A one-way fare,credit_debit,2.40,USD
58-
prod_cr_zone_1a,Commuter Rail Zone 1A one-way fare,mticket,2.40,USD
59-
prod_cr_zone_2,Commuter Rail Zone 2 one-way fare,cash,7.00,USD
60-
prod_cr_zone_2,Commuter Rail Zone 2 one-way fare,credit_debit,7.00,USD
61-
prod_cr_zone_2,Commuter Rail Zone 2 one-way fare,mticket,7.00,USD
62-
prod_cr_zone_3,Commuter Rail Zone 3 one-way fare,cash,8.00,USD
63-
prod_cr_zone_3,Commuter Rail Zone 3 one-way fare,credit_debit,8.00,USD
64-
prod_cr_zone_3,Commuter Rail Zone 3 one-way fare,mticket,8.00,USD
65-
prod_cr_zone_4,Commuter Rail Zone 4 one-way fare,cash,8.75,USD
66-
prod_cr_zone_4,Commuter Rail Zone 4 one-way fare,credit_debit,8.75,USD
67-
prod_cr_zone_4,Commuter Rail Zone 4 one-way fare,mticket,8.75,USD
68-
prod_cr_zone_5,Commuter Rail Zone 5 one-way fare,cash,9.75,USD
69-
prod_cr_zone_5,Commuter Rail Zone 5 one-way fare,credit_debit,9.75,USD
70-
prod_cr_zone_5,Commuter Rail Zone 5 one-way fare,mticket,9.75,USD
71-
prod_cr_zone_6,Commuter Rail Zone 6 one-way fare,cash,10.50,USD
72-
prod_cr_zone_6,Commuter Rail Zone 6 one-way fare,credit_debit,10.50,USD
73-
prod_cr_zone_6,Commuter Rail Zone 6 one-way fare,mticket,10.50,USD
74-
prod_cr_zone_7,Commuter Rail Zone 7 one-way fare,cash,11.00,USD
75-
prod_cr_zone_7,Commuter Rail Zone 7 one-way fare,credit_debit,11.00,USD
76-
prod_cr_zone_7,Commuter Rail Zone 7 one-way fare,mticket,11.00,USD
77-
prod_cr_zone_8,Commuter Rail Zone 8 one-way fare,cash,12.25,USD
78-
prod_cr_zone_8,Commuter Rail Zone 8 one-way fare,credit_debit,12.25,USD
79-
prod_cr_zone_8,Commuter Rail Zone 8 one-way fare,mticket,12.25,USD
80-
prod_cr_zone_9,Commuter Rail Zone 9 one-way fare,cash,12.75,USD
81-
prod_cr_zone_9,Commuter Rail Zone 9 one-way fare,credit_debit,12.75,USD
82-
prod_cr_zone_9,Commuter Rail Zone 9 one-way fare,mticket,12.75,USD
83-
prod_express_bus,Express Bus cash fare,cash,4.25,USD
84-
prod_ferry_east_boston,East Boston Ferry one-way fare,mticket,2.40,USD
85-
prod_ferry_f1,Hingham/Hull Ferry one-way fare,cash,9.75,USD
86-
prod_ferry_f1,Hingham/Hull Ferry one-way fare,credit_debit,9.75,USD
87-
prod_ferry_f1,Hingham/Hull Ferry one-way fare,mticket,9.75,USD
88-
prod_ferry_f4,Charlestown Ferry one-way fare,cash,3.70,USD
89-
prod_ferry_f4,Charlestown Ferry one-way fare,credit_debit,3.70,USD
90-
prod_ferry_f4,Charlestown Ferry one-way fare,mticket,3.70,USD
91-
prod_foxboro_event_fare,Foxboro Event Service round-trip fare,cash,20.00,USD
92-
prod_foxboro_event_fare,Foxboro Event Service round-trip fare,credit_debit,20.00,USD
93-
prod_foxboro_event_fare,Foxboro Event Service round-trip fare,mticket,20.00,USD
94-
prod_free_fare,Free fare,,0.00,USD
95-
prod_local_bus,Local Bus cash fare,cash,1.70,USD
96-
prod_rapid_transit_cash,Subway cash fare,cash,2.40,USD
97-
prod_rapid_transit_quick_subway,Subway Quick Ticket,charlieticket,2.40,USD
1+
fare_product_id,fare_product_name,rider_category_id,fare_media_id,amount,currency
2+
prod_boat_zone_1,Ferry Zone 1 one-way fare,HONORED_CITIZEN,cash,6.50,USD
3+
prod_boat_zone_1,Ferry Zone 1 one-way fare,,credit_debit,6.50,USD
4+
prod_boat_zone_1,Ferry Zone 1 one-way fare,,mticket,6.50,USD
5+
prod_boat_zone_1a,Ferry Zone 1A one-way fare,,cash,2.40,USD
6+
prod_boat_zone_1a,Ferry Zone 1A one-way fare,,credit_debit,2.40,USD
7+
prod_boat_zone_1a,Ferry Zone 1A one-way fare,,mticket,2.40,USD
8+
prod_boat_zone_2,Ferry Zone 2 one-way fare,,cash,7.00,USD
9+
prod_boat_zone_2,Ferry Zone 2 one-way fare,,credit_debit,7.00,USD
10+
prod_boat_zone_2,Ferry Zone 2 one-way fare,,mticket,7.00,USD
11+
prod_cape_buzzards_hyannis_fare,CapeFLYER Middleborough/Lakeville one-way fare,,cash,5.00,USD
12+
prod_cape_buzzards_hyannis_fare,CapeFLYER Middleborough/Lakeville one-way fare,,credit_debit,5.00,USD
13+
prod_cape_buzzards_hyannis_fare,CapeFLYER Middleborough/Lakeville one-way fare,,mticket,5.00,USD
14+
prod_cape_sbb_buzzards_fare,CapeFLYER Bourne one-way fare,,cash,20.00,USD
15+
prod_cape_sbb_buzzards_fare,CapeFLYER Bourne one-way fare,,credit_debit,20.00,USD
16+
prod_cape_sbb_buzzards_fare,CapeFLYER Bourne one-way fare,,mticket,20.00,USD
17+
prod_cape_sbb_hyannis_fare,CapeFLYER Hyannis one-way fare,,cash,22.00,USD
18+
prod_cape_sbb_hyannis_fare,CapeFLYER Hyannis one-way fare,,credit_debit,22.00,USD
19+
prod_cape_sbb_hyannis_fare,CapeFLYER Hyannis one-way fare,,mticket,22.00,USD
20+
prod_cr_inter_1,Commuter Rail Interzone 1 one-way fare,,cash,2.75,USD
21+
prod_cr_inter_1,Commuter Rail Interzone 1 one-way fare,,credit_debit,2.75,USD
22+
prod_cr_inter_1,Commuter Rail Interzone 1 one-way fare,,mticket,2.75,USD
23+
prod_cr_inter_10,Commuter Rail Interzone 10 one-way fare,,cash,7.25,USD
24+
prod_cr_inter_10,Commuter Rail Interzone 10 one-way fare,,credit_debit,7.25,USD
25+
prod_cr_inter_10,Commuter Rail Interzone 10 one-way fare,,mticket,7.25,USD
26+
prod_cr_inter_2,Commuter Rail Interzone 2 one-way fare,,cash,3.25,USD
27+
prod_cr_inter_2,Commuter Rail Interzone 2 one-way fare,,credit_debit,3.25,USD
28+
prod_cr_inter_2,Commuter Rail Interzone 2 one-way fare,,mticket,3.25,USD
29+
prod_cr_inter_3,Commuter Rail Interzone 3 one-way fare,,cash,3.50,USD
30+
prod_cr_inter_3,Commuter Rail Interzone 3 one-way fare,,credit_debit,3.50,USD
31+
prod_cr_inter_3,Commuter Rail Interzone 3 one-way fare,,mticket,3.50,USD
32+
prod_cr_inter_4,Commuter Rail Interzone 4 one-way fare,,cash,4.25,USD
33+
prod_cr_inter_4,Commuter Rail Interzone 4 one-way fare,,credit_debit,4.25,USD
34+
prod_cr_inter_4,Commuter Rail Interzone 4 one-way fare,,mticket,4.25,USD
35+
prod_cr_inter_5,Commuter Rail Interzone 5 one-way fare,,cash,4.75,USD
36+
prod_cr_inter_5,Commuter Rail Interzone 5 one-way fare,,credit_debit,4.75,USD
37+
prod_cr_inter_5,Commuter Rail Interzone 5 one-way fare,,mticket,4.75,USD
38+
prod_cr_inter_6,Commuter Rail Interzone 6 one-way fare,,cash,5.25,USD
39+
prod_cr_inter_6,Commuter Rail Interzone 6 one-way fare,,credit_debit,5.25,USD
40+
prod_cr_inter_6,Commuter Rail Interzone 6 one-way fare,,mticket,5.25,USD
41+
prod_cr_inter_7,Commuter Rail Interzone 7 one-way fare,,cash,5.75,USD
42+
prod_cr_inter_7,Commuter Rail Interzone 7 one-way fare,,credit_debit,5.75,USD
43+
prod_cr_inter_7,Commuter Rail Interzone 7 one-way fare,,mticket,5.75,USD
44+
prod_cr_inter_8,Commuter Rail Interzone 8 one-way fare,,cash,6.25,USD
45+
prod_cr_inter_8,Commuter Rail Interzone 8 one-way fare,,credit_debit,6.25,USD
46+
prod_cr_inter_8,Commuter Rail Interzone 8 one-way fare,,mticket,6.25,USD
47+
prod_cr_inter_9,Commuter Rail Interzone 9 one-way fare,,cash,6.75,USD
48+
prod_cr_inter_9,Commuter Rail Interzone 9 one-way fare,,credit_debit,6.75,USD
49+
prod_cr_inter_9,Commuter Rail Interzone 9 one-way fare,,mticket,6.75,USD
50+
prod_cr_zone_1,Commuter Rail Zone 1 one-way fare,,cash,6.50,USD
51+
prod_cr_zone_1,Commuter Rail Zone 1 one-way fare,,credit_debit,6.50,USD
52+
prod_cr_zone_1,Commuter Rail Zone 1 one-way fare,,mticket,6.50,USD
53+
prod_cr_zone_10,Commuter Rail Zone 10 one-way fare,,cash,13.25,USD
54+
prod_cr_zone_10,Commuter Rail Zone 10 one-way fare,,credit_debit,13.25,USD
55+
prod_cr_zone_10,Commuter Rail Zone 10 one-way fare,,mticket,13.25,USD
56+
prod_cr_zone_1a,Commuter Rail Zone 1A one-way fare,,cash,2.40,USD
57+
prod_cr_zone_1a,Commuter Rail Zone 1A one-way fare,,credit_debit,2.40,USD
58+
prod_cr_zone_1a,Commuter Rail Zone 1A one-way fare,,mticket,2.40,USD
59+
prod_cr_zone_2,Commuter Rail Zone 2 one-way fare,,cash,7.00,USD
60+
prod_cr_zone_2,Commuter Rail Zone 2 one-way fare,,credit_debit,7.00,USD
61+
prod_cr_zone_2,Commuter Rail Zone 2 one-way fare,,mticket,7.00,USD
62+
prod_cr_zone_3,Commuter Rail Zone 3 one-way fare,,cash,8.00,USD
63+
prod_cr_zone_3,Commuter Rail Zone 3 one-way fare,,credit_debit,8.00,USD
64+
prod_cr_zone_3,Commuter Rail Zone 3 one-way fare,,mticket,8.00,USD
65+
prod_cr_zone_4,Commuter Rail Zone 4 one-way fare,,cash,8.75,USD
66+
prod_cr_zone_4,Commuter Rail Zone 4 one-way fare,,credit_debit,8.75,USD
67+
prod_cr_zone_4,Commuter Rail Zone 4 one-way fare,,mticket,8.75,USD
68+
prod_cr_zone_5,Commuter Rail Zone 5 one-way fare,,cash,9.75,USD
69+
prod_cr_zone_5,Commuter Rail Zone 5 one-way fare,,credit_debit,9.75,USD
70+
prod_cr_zone_5,Commuter Rail Zone 5 one-way fare,,mticket,9.75,USD
71+
prod_cr_zone_6,Commuter Rail Zone 6 one-way fare,,cash,10.50,USD
72+
prod_cr_zone_6,Commuter Rail Zone 6 one-way fare,,credit_debit,10.50,USD
73+
prod_cr_zone_6,Commuter Rail Zone 6 one-way fare,,mticket,10.50,USD
74+
prod_cr_zone_7,Commuter Rail Zone 7 one-way fare,,cash,11.00,USD
75+
prod_cr_zone_7,Commuter Rail Zone 7 one-way fare,,credit_debit,11.00,USD
76+
prod_cr_zone_7,Commuter Rail Zone 7 one-way fare,,mticket,11.00,USD
77+
prod_cr_zone_8,Commuter Rail Zone 8 one-way fare,,cash,12.25,USD
78+
prod_cr_zone_8,Commuter Rail Zone 8 one-way fare,,credit_debit,12.25,USD
79+
prod_cr_zone_8,Commuter Rail Zone 8 one-way fare,,mticket,12.25,USD
80+
prod_cr_zone_9,Commuter Rail Zone 9 one-way fare,,cash,12.75,USD
81+
prod_cr_zone_9,Commuter Rail Zone 9 one-way fare,,credit_debit,12.75,USD
82+
prod_cr_zone_9,Commuter Rail Zone 9 one-way fare,,mticket,12.75,USD
83+
prod_express_bus,Express Bus cash fare,,cash,4.25,USD
84+
prod_ferry_east_boston,East Boston Ferry one-way fare,,mticket,2.40,USD
85+
prod_ferry_f1,Hingham/Hull Ferry one-way fare,,cash,9.75,USD
86+
prod_ferry_f1,Hingham/Hull Ferry one-way fare,,credit_debit,9.75,USD
87+
prod_ferry_f1,Hingham/Hull Ferry one-way fare,,mticket,9.75,USD
88+
prod_ferry_f4,Charlestown Ferry one-way fare,,cash,3.70,USD
89+
prod_ferry_f4,Charlestown Ferry one-way fare,,credit_debit,3.70,USD
90+
prod_ferry_f4,Charlestown Ferry one-way fare,,mticket,3.70,USD
91+
prod_foxboro_event_fare,Foxboro Event Service round-trip fare,,cash,20.00,USD
92+
prod_foxboro_event_fare,Foxboro Event Service round-trip fare,,credit_debit,20.00,USD
93+
prod_foxboro_event_fare,Foxboro Event Service round-trip fare,,mticket,20.00,USD
94+
prod_free_fare,Free fare,,,0.00,USD
95+
prod_local_bus,Local Bus cash fare,,cash,1.70,USD
96+
prod_rapid_transit_cash,Subway cash fare,,cash,2.40,USD
97+
prod_rapid_transit_quick_subway,Subway Quick Ticket,,charlieticket,2.40,USD

‎src/test/resources/com/conveyal/datatools/gtfs/fake-agency-with-fares-v2/rider_categories.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
rider_category_id,rider_category_name,min_age,max_age,eligibility_url,is_default_fare_category
2+
HONORED_CITIZEN,Honored Citizen,,,https://trimet.org/fares/honoredcitizen.htm,0
3+
ADULT,Adult,,,,1
4+
YOUTH,Youth,7,17,https://trimet.org/fares/youth.htm,0

0 commit comments

Comments
 (0)