Skip to content

Commit

Permalink
- All XCollection objects now store their query parameters inside them
Browse files Browse the repository at this point in the history
- Specifically, report collection type and tracker collection tracking code and carrier are stored for re-use on subsequent "get next page" calls
- Update unit tests, re-record cassettes as needed
  • Loading branch information
nwithan8 committed May 1, 2023
1 parent 93313bd commit 60366fe
Show file tree
Hide file tree
Showing 68 changed files with 826 additions and 760 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public async Task TestAllParameterHandOff()

ReportCollection reportCollection = await Client.Report.All(type, parameters);

Assert.Equal(type, reportCollection.Type);
Assert.Equal(type, ((BetaFeatures.Parameters.Reports.All)reportCollection.Filters!).ReportType);
}

#endregion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ public async Task TestAllParameterHandOff()
};
trackerCollection.Trackers.Add(fakeTracker);

Assert.Equal(filters.TrackingCode, trackerCollection.TrackingCode);
Assert.Equal(filters.Carrier, trackerCollection.Carrier);
Assert.Equal(filters.TrackingCode, ((BetaFeatures.Parameters.Trackers.All)trackerCollection.Filters!).TrackingCode);
Assert.Equal(filters.Carrier, ((BetaFeatures.Parameters.Trackers.All)trackerCollection.Filters!).Carrier);
}

#endregion
Expand Down
2 changes: 1 addition & 1 deletion EasyPost.Tests/ServicesTests/ReportServiceTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public async Task TestAllParameterHandOff()

ReportCollection reportCollection = await Client.Report.All(type, filters);

Assert.Equal(type, reportCollection.Type);
Assert.Equal(type, ((BetaFeatures.Parameters.Reports.All)reportCollection.Filters!).ReportType);
}

[Fact]
Expand Down
8 changes: 4 additions & 4 deletions EasyPost.Tests/ServicesTests/TrackerServiceTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ public async Task TestAllParameterHandOff()

TrackerCollection trackerCollection = await Client.Tracker.All(filters);

Assert.Equal(filters["tracking_code"], trackerCollection.TrackingCode);
Assert.Equal(filters["carrier"], trackerCollection.Carrier);
Assert.Equal(filters["tracking_code"], ((BetaFeatures.Parameters.Trackers.All)trackerCollection.Filters!).TrackingCode);
Assert.Equal(filters["carrier"], ((BetaFeatures.Parameters.Trackers.All)trackerCollection.Filters!).Carrier);
}

[Fact]
Expand Down Expand Up @@ -144,8 +144,8 @@ public async Task TestGetNextPageParameterHandOff()

BetaFeatures.Parameters.Trackers.All filtersForNextPage = trackerCollection.BuildNextPageParameters<BetaFeatures.Parameters.Trackers.All>(trackerCollection.Trackers);

Assert.Equal(trackerCollection.TrackingCode, filtersForNextPage.TrackingCode);
Assert.Equal(trackerCollection.Carrier, filtersForNextPage.Carrier);
Assert.Equal(((BetaFeatures.Parameters.Trackers.All)trackerCollection.Filters!).TrackingCode, filtersForNextPage.TrackingCode);
Assert.Equal(((BetaFeatures.Parameters.Trackers.All)trackerCollection.Filters!).Carrier, filtersForNextPage.Carrier);
}

[Fact]
Expand Down
43 changes: 22 additions & 21 deletions EasyPost.Tests/cassettes/net/address_service/get_next_page.json

Large diffs are not rendered by default.

43 changes: 22 additions & 21 deletions EasyPost.Tests/cassettes/net/base_service/get_next_page.json

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 60366fe

Please sign in to comment.