Skip to content

Fix not using invariant culture with duration text #1327

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

Merged
merged 2 commits into from
Jun 15, 2021
Merged

Fix not using invariant culture with duration text #1327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51118c8
Fix not using invariant culture with duration text
JamesNK Jun 15, 2021
cb405ff
Test
JamesNK Jun 15, 2021
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
2 changes: 1 addition & 1 deletion src/Grpc.Net.Client/Internal/Configuration/ConvertHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public static StatusCode ConvertStatusCode(string statusCode)

// This format is based on the Protobuf duration's JSON mapping.
// https://github.com/protocolbuffers/protobuf/blob/35bdcabdd6a05ce9ee738ad7df8c1299d9c7fc4b/src/google/protobuf/duration.proto#L92
return value.GetValueOrDefault().TotalSeconds + "s";
return value.GetValueOrDefault().TotalSeconds.ToString(CultureInfo.InvariantCulture) + "s";
}
}
}
18 changes: 15 additions & 3 deletions test/Grpc.Net.Client.Tests/ServiceConfigTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,18 @@ public class ServiceConfigTests
{
[Test]
public void ServiceConfig_CreateUnderlyingConfig()
{
CreateUnderlyingConfigCore();
}

[Test]
[SetCulture("fr-FR")]
public void ServiceConfig_CreateUnderlyingConfig_French()
{
CreateUnderlyingConfigCore();
}

private static void CreateUnderlyingConfigCore()
{
// Arrange & Act
var serviceConfig = new ServiceConfig
Expand All @@ -42,7 +54,7 @@ public void ServiceConfig_CreateUnderlyingConfig()
RetryPolicy = new RetryPolicy
{
MaxAttempts = 5,
InitialBackoff = TimeSpan.FromSeconds(1),
InitialBackoff = TimeSpan.FromSeconds(1.1),
RetryableStatusCodes = { StatusCode.Unavailable, StatusCode.Aborted }
}
}
Expand All @@ -53,7 +65,7 @@ public void ServiceConfig_CreateUnderlyingConfig()
Assert.AreEqual(1, serviceConfig.MethodConfigs.Count);
Assert.AreEqual(1, serviceConfig.MethodConfigs[0].Names.Count);
Assert.AreEqual(5, serviceConfig.MethodConfigs[0].RetryPolicy!.MaxAttempts);
Assert.AreEqual(TimeSpan.FromSeconds(1), serviceConfig.MethodConfigs[0].RetryPolicy!.InitialBackoff);
Assert.AreEqual(TimeSpan.FromSeconds(1.1), serviceConfig.MethodConfigs[0].RetryPolicy!.InitialBackoff);
Assert.AreEqual(StatusCode.Unavailable, serviceConfig.MethodConfigs[0].RetryPolicy!.RetryableStatusCodes[0]);
Assert.AreEqual(StatusCode.Aborted, serviceConfig.MethodConfigs[0].RetryPolicy!.RetryableStatusCodes[1]);

Expand All @@ -62,7 +74,7 @@ public void ServiceConfig_CreateUnderlyingConfig()
var allServices = (IDictionary<string, object>)methodConfigs[0];

Assert.AreEqual(5, (int)((IDictionary<string, object>)allServices["retryPolicy"])["maxAttempts"]);
Assert.AreEqual("1s", (string)((IDictionary<string, object>)allServices["retryPolicy"])["initialBackoff"]);
Assert.AreEqual("1.1s", (string)((IDictionary<string, object>)allServices["retryPolicy"])["initialBackoff"]);
Assert.AreEqual("UNAVAILABLE", (string)((IList<object>)((IDictionary<string, object>)allServices["retryPolicy"])["retryableStatusCodes"])[0]);
Assert.AreEqual("ABORTED", (string)((IList<object>)((IDictionary<string, object>)allServices["retryPolicy"])["retryableStatusCodes"])[1]);
}
Expand Down