diff --git a/pkg/http/api_pagination_test.go b/pkg/http/api_pagination_test.go index 58818d4..238fc4a 100644 --- a/pkg/http/api_pagination_test.go +++ b/pkg/http/api_pagination_test.go @@ -8,16 +8,16 @@ import ( func TestApiRoutesPagination(t *testing.T) { routes := api.Routes{ - &api.Route{ID: "r01"}, - &api.Route{ID: "r02"}, - &api.Route{ID: "r03"}, - &api.Route{ID: "r04"}, - &api.Route{ID: "r05"}, - &api.Route{ID: "r06"}, - &api.Route{ID: "r07"}, - &api.Route{ID: "r08"}, - &api.Route{ID: "r09"}, - &api.Route{ID: "r10"}, + &api.Route{Network: "r01"}, + &api.Route{Network: "r02"}, + &api.Route{Network: "r03"}, + &api.Route{Network: "r04"}, + &api.Route{Network: "r05"}, + &api.Route{Network: "r06"}, + &api.Route{Network: "r07"}, + &api.Route{Network: "r08"}, + &api.Route{Network: "r09"}, + &api.Route{Network: "r10"}, } paginated, pagination := apiPaginateRoutes(routes, 0, 8) @@ -36,13 +36,13 @@ func TestApiRoutesPagination(t *testing.T) { // Check paginated slicing r := paginated[0] - if r.ID != "r01" { - t.Error("First route on page 0 should be r01, got:", r.ID) + if r.Network != "r01" { + t.Error("First route on page 0 should be r01, got:", r.Network) } r = paginated[len(paginated)-1] - if r.ID != "r08" { - t.Error("Last route should be r08, but got:", r.ID) + if r.Network != "r08" { + t.Error("Last route should be r08, but got:", r.Network) } // Second page @@ -52,13 +52,13 @@ func TestApiRoutesPagination(t *testing.T) { } r = paginated[0] - if r.ID != "r09" { - t.Error("First route on page 1 should be r09, got:", r.ID) + if r.Network != "r09" { + t.Error("First route on page 1 should be r09, got:", r.Network) } r = paginated[len(paginated)-1] - if r.ID != "r10" { - t.Error("Last route should be r10, but got:", r.ID) + if r.Network != "r10" { + t.Error("Last route should be r10, but got:", r.Network) } // Access out of bound page diff --git a/pkg/http/api_query_test.go b/pkg/http/api_query_test.go index 26a0cbc..6898251 100644 --- a/pkg/http/api_query_test.go +++ b/pkg/http/api_query_test.go @@ -20,19 +20,16 @@ func makeQueryRequest(q string) *http.Request { func makeQueryRoutes() api.Routes { routes := api.Routes{ &api.Route{ - ID: "route_01", NeighborID: pools.Neighbors.Acquire("n01"), Network: "123.42.43.0/24", Gateway: pools.Gateways4.Acquire("23.42.42.1"), }, &api.Route{ - ID: "route_02", NeighborID: pools.Neighbors.Acquire("n01"), Network: "142.23.0.0/16", Gateway: pools.Gateways4.Acquire("42.42.42.1"), }, &api.Route{ - ID: "route_03", NeighborID: pools.Neighbors.Acquire("n01"), Network: "123.43.0.0/16", Gateway: pools.Gateways4.Acquire("23.42.43.1"), @@ -55,11 +52,11 @@ func TestApiQueryFilterNextHopGateway(t *testing.T) { } // Check presence of route_01 and _03, matching prefix 123. - if filtered[0].ID != "route_01" { - t.Error("Expected route_01, got:", filtered[0].ID) + if filtered[0].Network != "123.42.43.0/24" { + t.Error("Expected 123.42.43.0/24 got:", filtered[0].Network) } - if filtered[1].ID != "route_03" { - t.Error("Expected route_03, got:", filtered[1].ID) + if filtered[1].Network != "123.43.0.0/16" { + t.Error("Expected 123.43.0.0/16, got:", filtered[1].Network) } // Test another query matching the gateway only @@ -72,7 +69,7 @@ func TestApiQueryFilterNextHopGateway(t *testing.T) { t.Error("Expected only one result") } - if filtered[0].ID != "route_02" { - t.Error("Expected route_02 to match criteria, got:", filtered[0]) + if filtered[0].Network != "142.23.0.0/16" { + t.Error("Expected 142.23.0.0/16 to match criteria, got:", filtered[0]) } }