Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update targets and misc cleanup #321

Merged
merged 12 commits into from
Nov 22, 2024
Merged

Update targets and misc cleanup #321

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0317c6f
Update targets
oschwald Nov 21, 2024
b218bf6
Bump language version to 13
oschwald Nov 21, 2024
8455eec
Update dependencies
oschwald Nov 21, 2024
a75dfd1
Do not handle nulls for non-null values
oschwald Nov 21, 2024
881a9e1
Fix typo
oschwald Nov 21, 2024
fcda66e
Clean up imports
oschwald Nov 21, 2024
dcdaef1
Remove workaround for old Mono versions
oschwald Nov 21, 2024
20afe09
Use collection expression
oschwald Nov 21, 2024
4beb240
Use raw strings
oschwald Nov 21, 2024
d467823
Clean up some conditionals
oschwald Nov 21, 2024
c9151d3
Only create JsonSerializerOptions once
oschwald Nov 21, 2024
e3c232e
Improve line wrapping
oschwald Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 17 additions & 24 deletions MaxMind.GeoIP2.UnitTests/WebServiceClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,43 +36,36 @@ public WebServiceClientTests()
public static readonly object[][] TestCases =
{
#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
new object[] {"country", (ClientRunner) (async (c, i) => c.Country(i)), typeof(CountryResponse)},
["country", (ClientRunner) (async (c, i) => c.Country(i)), typeof(CountryResponse)],
#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
new object[] {"city", (ClientRunner) (async (c, i) => c.City(i)), typeof(CityResponse)},
["city", (ClientRunner) (async (c, i) => c.City(i)), typeof(CityResponse)],
#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
new object[] {"insights", (ClientRunner) (async (c, i) => c.Insights(i)), typeof(InsightsResponse)},
["insights", (ClientRunner) (async (c, i) => c.Insights(i)), typeof(InsightsResponse)],
#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
new object[]
{"countryAsync", (ClientRunner) (async (c, i) => await c.CountryAsync(i)), typeof(CountryResponse)},
new object[] {"cityAsync", (ClientRunner) (async (c, i) => await c.CityAsync(i)), typeof(CityResponse)},
new object[]
{"insightsAsync", (ClientRunner) (async (c, i) => await c.InsightsAsync(i)), typeof(InsightsResponse)}
["countryAsync", (ClientRunner) (async (c, i) => await c.CountryAsync(i)), typeof(CountryResponse)],
["cityAsync", (ClientRunner) (async (c, i) => await c.CityAsync(i)), typeof(CityResponse)], ["insightsAsync", (ClientRunner) (async (c, i) => await c.InsightsAsync(i)), typeof(InsightsResponse)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the insightsAsync part be on its own line?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I did that.

]
};

public delegate Task<AbstractCountryResponse> MeClientRunner(WebServiceClient c);

public static readonly object[][] MeTestCases =
{
new object[]
{
[
[
"country", (MeClientRunner) (c => Task.FromResult<AbstractCountryResponse>(c.Country())),
typeof(CountryResponse)
},
new object[]
{
],
[
"city", (MeClientRunner) (c => Task.FromResult<AbstractCountryResponse>(c.City())), typeof(CityResponse)
},
new object[]
{
],
[
"insights", (MeClientRunner) (c => Task.FromResult<AbstractCountryResponse>(c.Insights())),
typeof(InsightsResponse)
},
new object[]
{"countryAsync", (MeClientRunner) (async c => await c.CountryAsync()), typeof(CountryResponse)},
new object[] {"cityAsync", (MeClientRunner) (async c => await c.CityAsync()), typeof(CityResponse)},
new object[]
{"insightsAsync", (MeClientRunner) (async c => await c.InsightsAsync()), typeof(InsightsResponse)}
};
],
["countryAsync", (MeClientRunner) (async c => await c.CountryAsync()), typeof(CountryResponse)],
["cityAsync", (MeClientRunner) (async c => await c.CityAsync()), typeof(CityResponse)],
["insightsAsync", (MeClientRunner) (async c => await c.InsightsAsync()), typeof(InsightsResponse)]
];
private bool _disposed;

private WebServiceClient CreateClient(string type, string ipAddress = "1.2.3.4",
Expand Down