Skip to content

Commit f75eefc

Browse files
drewdadrewda
committed
adjust tests to handle addition of hope link flex feed
1 parent a54443d commit f75eefc

11 files changed

Lines changed: 27 additions & 19 deletions

‎server/gql/agency_resolver_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestAgencyResolver(t *testing.T) {
2121
name: "basic",
2222
query: `query { agencies {agency_id}}`,
2323
selector: "agencies.#.agency_id",
24-
selectExpect: []string{"caltrain-ca-us", "a8b6ef46-7d4d-45f8-8200-cf4f5ce9d5a6", "BART", ""},
24+
selectExpect: []string{"caltrain-ca-us", "a8b6ef46-7d4d-45f8-8200-cf4f5ce9d5a6", "4982", "BART", ""},
2525
},
2626
{
2727
name: "basic fields",
@@ -363,7 +363,7 @@ func TestAgencyResolver_Location(t *testing.T) {
363363
}`,
364364
vars: hw{"lat": sanJoseFocus.Lat, "lon": sanJoseFocus.Lon},
365365
selector: "agencies.#.feed_version.feed.onestop_id",
366-
selectExpect: []string{"CT", "BA", "HA", "ctran-flex"},
366+
selectExpect: []string{"CT", "BA", "HA", "hopelink-flex", "ctran-flex"},
367367
},
368368
{
369369
name: "focus basic: East coast focus returns FL agency before CA agencies",
@@ -375,7 +375,7 @@ func TestAgencyResolver_Location(t *testing.T) {
375375
}`,
376376
vars: hw{"lat": floridaFocus.Lat, "lon": floridaFocus.Lon},
377377
selector: "agencies.#.feed_version.feed.onestop_id",
378-
selectExpect: []string{"HA", "BA", "CT", "ctran-flex"},
378+
selectExpect: []string{"HA", "BA", "CT", "hopelink-flex", "ctran-flex"},
379379
},
380380
{
381381
name: "focus with pagination: maintains ordering",

‎server/gql/booking_rule_resolver_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func TestBookingRuleResolver(t *testing.T) {
6060
}
6161
}`,
6262
vars: hw{"sha1": ctranFlexSha1, "brid": brid},
63-
expect: `{"feed_versions":[{"booking_rules":[{"booking_rule_id":"booking_rule_id__2bc6804f-9e24-4b91-8947-c73a2363e7b6_MTWTFxx_20220107_20320522__053000_190000__053000_190000__m_b3a73dc523608998d850c431bf49b740093fd69415233fb3e74709073b335b6a","booking_type":1,"booking_url":"https://book.ridethecurrent.com","drop_off_message":null,"id":1,"info_url":null,"message":"The Current is an on-demand rideshare service by C-TRAN that provides point-to-point service for just the cost of a local bus ride. Schedule your ride on The Current app, at www.ridethecurrent.com or through our mobile app, or by calling 360-695-0123 then track your driver’s arrival.","phone_number":"360-695-0123","pickup_message":null,"prior_notice_duration_max":null,"prior_notice_duration_min":0,"prior_notice_last_day":null,"prior_notice_last_time":null,"prior_notice_start_day":2,"prior_notice_start_time":"00:00:00"}]}]}`,
63+
expect: `{"feed_versions":[{"booking_rules":[{"booking_rule_id":"booking_rule_id__2bc6804f-9e24-4b91-8947-c73a2363e7b6_MTWTFxx_20220107_20320522__053000_190000__053000_190000__m_b3a73dc523608998d850c431bf49b740093fd69415233fb3e74709073b335b6a","booking_type":1,"booking_url":"https://book.ridethecurrent.com","drop_off_message":null,"id":2,"info_url":null,"message":"The Current is an on-demand rideshare service by C-TRAN that provides point-to-point service for just the cost of a local bus ride. Schedule your ride on The Current app, at www.ridethecurrent.com or through our mobile app, or by calling 360-695-0123 then track your driver’s arrival.","phone_number":"360-695-0123","pickup_message":null,"prior_notice_duration_max":null,"prior_notice_duration_min":0,"prior_notice_last_day":null,"prior_notice_last_time":null,"prior_notice_start_day":2,"prior_notice_start_time":"00:00:00"}]}]}`,
6464
},
6565
}
6666
c, _ := newTestClient(t)

‎server/gql/feed_resolver_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func TestFeedResolver(t *testing.T) {
1313
name: "basic",
1414
query: `query { feeds {onestop_id}}`,
1515
selector: "feeds.#.onestop_id",
16-
selectExpect: []string{"CT", "ctran-flex", "test-gbfs", "BA", "HA", "BA~rt", "CT~rt", "test", "EX"},
16+
selectExpect: []string{"CT", "ctran-flex", "hopelink-flex", "test-gbfs", "BA", "HA", "BA~rt", "CT~rt", "test", "EX"},
1717
},
1818
{
1919
name: "basic fields",
@@ -88,7 +88,7 @@ func TestFeedResolver(t *testing.T) {
8888
name: "where spec=gtfs",
8989
query: `query { feeds(where:{spec:[GTFS]}) {onestop_id}}`,
9090
selector: "feeds.#.onestop_id",
91-
selectExpect: []string{"CT", "ctran-flex", "BA", "HA", "test", "EX"},
91+
selectExpect: []string{"CT", "ctran-flex", "hopelink-flex", "BA", "HA", "test", "EX"},
9292
},
9393
{
9494
name: "where spec=gtfs-rt",
@@ -106,13 +106,13 @@ func TestFeedResolver(t *testing.T) {
106106
name: "where fetch_error=false",
107107
query: `query { feeds(where:{fetch_error:false}) {onestop_id}}`,
108108
selector: "feeds.#.onestop_id",
109-
selectExpect: []string{"CT", "ctran-flex", "BA", "HA", "EX"},
109+
selectExpect: []string{"CT", "ctran-flex", "hopelink-flex", "BA", "HA", "EX"},
110110
},
111111
{
112112
name: "where import_status=success",
113113
query: `query { feeds(where:{import_status:SUCCESS}) {onestop_id}}`,
114114
selector: "feeds.#.onestop_id",
115-
selectExpect: []string{"CT", "ctran-flex", "BA", "HA", "EX"},
115+
selectExpect: []string{"CT", "ctran-flex", "hopelink-flex", "BA", "HA", "EX"},
116116
},
117117
{
118118
name: "where import_status=in_progress", // TODO: mock an in-progress import

‎server/gql/feed_version_resolver_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestFeedVersionResolver(t *testing.T) {
2222
name: "basic",
2323
query: `query { feed_versions {sha1} }`,
2424
selector: "feed_versions.#.sha1",
25-
selectExpect: []string{"e535eb2b3b9ac3ef15d82c56575e914575e732e0", "d2813c293bcfd7a97dde599527ae6c62c98e66c6", "c969427f56d3a645195dd8365cde6d7feae7e99b", "dd7aca4a8e4c90908fd3603c097fabee75fea907", "43e2278aa272879c79460582152b04e7487f0493", "96b67c0934b689d9085c52967365d8c233ea321d", "e8bc76c3c8602cad745f41a49ed5c5627ad6904c"},
25+
selectExpect: []string{"e535eb2b3b9ac3ef15d82c56575e914575e732e0", "d2813c293bcfd7a97dde599527ae6c62c98e66c6", "c969427f56d3a645195dd8365cde6d7feae7e99b", "dd7aca4a8e4c90908fd3603c097fabee75fea907", "43e2278aa272879c79460582152b04e7487f0493", "96b67c0934b689d9085c52967365d8c233ea321d", "40b1560b9767ca4ee5d9cc3f70947822e0e346be", "e8bc76c3c8602cad745f41a49ed5c5627ad6904c"},
2626
},
2727
{
2828
name: "basic fields",

‎server/gql/route_resolver_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestRouteResolver(t *testing.T) {
1818
name: "basic",
1919
query: `query { routes { route_id } }`,
2020
selector: "routes.#.route_id",
21-
selectExpect: []string{"1", "12", "14", "15", "16", "17", "19", "20", "24", "25", "275", "30", "31", "32", "33", "34", "35", "36", "360", "37", "38", "39", "400", "42", "45", "46", "48", "5", "51", "6", "60", "7", "75", "8", "9", "96", "97", "570", "571", "572", "573", "574", "800", "PWT", "SKY", "01", "03", "05", "07", "11", "19", "Bu-130", "Li-130", "Lo-130", "TaSj-130", "Gi-130", "Sp-130", "2bc6804f-9e24-4b91-8947-c73a2363e7b6", "68456f6e-2a04-4fcb-971b-fd57348e2ed7", "3dce5414-260d-4cdb-b3d8-b256802d35c5", "0553af3e-53b8-4f98-ba47-0fc03d2404de", "fb93d53e-bf9a-426b-adb2-c913e4d5ecfd", "424421e5-c7c4-4307-8893-5ab9c913cecf"},
21+
selectExpect: []string{"1", "12", "14", "15", "16", "17", "19", "20", "24", "25", "275", "30", "31", "32", "33", "34", "35", "36", "360", "37", "38", "39", "400", "42", "45", "46", "48", "5", "51", "6", "60", "7", "75", "8", "9", "96", "97", "570", "571", "572", "573", "574", "800", "PWT", "SKY", "01", "03", "05", "07", "11", "19", "Bu-130", "Li-130", "Lo-130", "TaSj-130", "Gi-130", "Sp-130", "2bc6804f-9e24-4b91-8947-c73a2363e7b6", "68456f6e-2a04-4fcb-971b-fd57348e2ed7", "3dce5414-260d-4cdb-b3d8-b256802d35c5", "0553af3e-53b8-4f98-ba47-0fc03d2404de", "fb93d53e-bf9a-426b-adb2-c913e4d5ecfd", "424421e5-c7c4-4307-8893-5ab9c913cecf", "77684"},
2222
},
2323
{
2424
name: "basic fields",

‎server/rest/agency_request_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestAgencyRequest(t *testing.T) {
1818
name: "basic",
1919
h: AgencyRequest{},
2020
selector: "agencies.#.agency_id",
21-
expectSelect: []string{"caltrain-ca-us", "a8b6ef46-7d4d-45f8-8200-cf4f5ce9d5a6", "BART", ""},
21+
expectSelect: []string{"caltrain-ca-us", "a8b6ef46-7d4d-45f8-8200-cf4f5ce9d5a6", "4982", "BART", ""},
2222
},
2323
// this used to be caltrain but now bart is imported first.
2424
{

‎server/rest/feed_request_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestFeedRequest(t *testing.T) {
1717
h: &FeedRequest{},
1818
format: "",
1919
selector: "feeds.#.onestop_id",
20-
expectSelect: []string{"CT", "ctran-flex", "test-gbfs", "BA", "HA", "BA~rt", "CT~rt", "test", "EX"},
20+
expectSelect: []string{"CT", "ctran-flex", "hopelink-flex", "test-gbfs", "BA", "HA", "BA~rt", "CT~rt", "test", "EX"},
2121
},
2222
{
2323
name: "onestop_id",
@@ -38,7 +38,7 @@ func TestFeedRequest(t *testing.T) {
3838
h: &FeedRequest{Spec: "gtfs"},
3939
format: "",
4040
selector: "feeds.#.onestop_id",
41-
expectSelect: []string{"CT", "ctran-flex", "BA", "HA", "test", "EX"},
41+
expectSelect: []string{"CT", "ctran-flex", "hopelink-flex", "BA", "HA", "test", "EX"},
4242
},
4343
{
4444
name: "spec lower case dash",
@@ -67,7 +67,7 @@ func TestFeedRequest(t *testing.T) {
6767
h: &FeedRequest{FetchError: "false"},
6868
format: "",
6969
selector: "feeds.#.onestop_id",
70-
expectSelect: []string{"CT", "ctran-flex", "BA", "HA", "EX"},
70+
expectSelect: []string{"CT", "ctran-flex", "hopelink-flex", "BA", "HA", "EX"},
7171
},
7272
{
7373
name: "tags test=ok",

‎server/rest/feed_version_request_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ func TestFeedVersionRequest(t *testing.T) {
1414
h: FeedVersionRequest{},
1515
format: "",
1616
selector: "feed_versions.#.sha1",
17-
expectSelect: []string{"43e2278aa272879c79460582152b04e7487f0493", "c969427f56d3a645195dd8365cde6d7feae7e99b", "e535eb2b3b9ac3ef15d82c56575e914575e732e0", "e8bc76c3c8602cad745f41a49ed5c5627ad6904c", "d2813c293bcfd7a97dde599527ae6c62c98e66c6", "dd7aca4a8e4c90908fd3603c097fabee75fea907", "96b67c0934b689d9085c52967365d8c233ea321d"},
17+
expectSelect: []string{"43e2278aa272879c79460582152b04e7487f0493", "c969427f56d3a645195dd8365cde6d7feae7e99b", "e535eb2b3b9ac3ef15d82c56575e914575e732e0", "40b1560b9767ca4ee5d9cc3f70947822e0e346be", "e8bc76c3c8602cad745f41a49ed5c5627ad6904c", "d2813c293bcfd7a97dde599527ae6c62c98e66c6", "dd7aca4a8e4c90908fd3603c097fabee75fea907", "96b67c0934b689d9085c52967365d8c233ea321d"},
1818
},
1919
{
2020
name: "limit:1",

‎server/rest/operator_request_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func TestOperatorRequest(t *testing.T) {
1212
name: "basic",
1313
h: OperatorRequest{},
1414
selector: "operators.#.onestop_id",
15-
expectSelect: []string{"o-9q9-caltrain", "o-unknown-c~tran", "o-9q9-bayarearapidtransit", "o-dhv-hillsborougharearegionaltransit", "o-9qs-demotransitauthority"},
15+
expectSelect: []string{"o-9q9-caltrain", "o-unknown-c~tran", "o-unknown-hopelinktransportation", "o-9q9-bayarearapidtransit", "o-dhv-hillsborougharearegionaltransit", "o-9qs-demotransitauthority"},
1616
},
1717
{
1818
name: "feed_onestop_id",
@@ -153,7 +153,7 @@ func TestOperatorRequest_Pagination(t *testing.T) {
153153
name: "limit:1000",
154154
h: OperatorRequest{WithCursor: WithCursor{Limit: 1000}},
155155
selector: "operators.#.onestop_id",
156-
expectLength: 5,
156+
expectLength: 6,
157157
},
158158
}
159159
for _, tc := range testcases {

‎server/rest/route_request_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func ptr[T any](v T) *T {
1616
}
1717

1818
func TestRouteRequest(t *testing.T) {
19-
routeIds := []string{"1", "12", "14", "15", "16", "17", "19", "20", "24", "25", "275", "30", "31", "32", "33", "34", "35", "36", "360", "37", "38", "39", "400", "42", "45", "46", "48", "5", "51", "6", "60", "7", "75", "8", "9", "96", "97", "570", "571", "572", "573", "574", "800", "PWT", "SKY", "01", "03", "05", "07", "11", "19", "Bu-130", "Li-130", "Lo-130", "TaSj-130", "Gi-130", "Sp-130", "2bc6804f-9e24-4b91-8947-c73a2363e7b6", "68456f6e-2a04-4fcb-971b-fd57348e2ed7", "3dce5414-260d-4cdb-b3d8-b256802d35c5", "0553af3e-53b8-4f98-ba47-0fc03d2404de", "fb93d53e-bf9a-426b-adb2-c913e4d5ecfd", "424421e5-c7c4-4307-8893-5ab9c913cecf"}
19+
routeIds := []string{"1", "12", "14", "15", "16", "17", "19", "20", "24", "25", "275", "30", "31", "32", "33", "34", "35", "36", "360", "37", "38", "39", "400", "42", "45", "46", "48", "5", "51", "6", "60", "7", "75", "8", "9", "96", "97", "570", "571", "572", "573", "574", "800", "PWT", "SKY", "01", "03", "05", "07", "11", "19", "Bu-130", "Li-130", "Lo-130", "TaSj-130", "Gi-130", "Sp-130", "2bc6804f-9e24-4b91-8947-c73a2363e7b6", "68456f6e-2a04-4fcb-971b-fd57348e2ed7", "3dce5414-260d-4cdb-b3d8-b256802d35c5", "0553af3e-53b8-4f98-ba47-0fc03d2404de", "fb93d53e-bf9a-426b-adb2-c913e4d5ecfd", "424421e5-c7c4-4307-8893-5ab9c913cecf", "77684"}
2020
fv := "e535eb2b3b9ac3ef15d82c56575e914575e732e0"
2121
testcases := []testCase{
2222
{
@@ -180,7 +180,7 @@ func TestRouteRequest_Pagination(t *testing.T) {
180180
h: RouteRequest{WithCursor: WithCursor{Limit: 100}},
181181
selector: "routes.#.route_id",
182182
expectSelect: nil,
183-
expectLength: 63,
183+
expectLength: 64,
184184
},
185185
{
186186
name: "pagination exists",

0 commit comments

Comments
 (0)