Skip to content
This repository has been archived by the owner on Dec 14, 2018. It is now read-only.

Add culture constructor to RouteValueProvider #5812

Merged
merged 1 commit into from
Feb 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,21 @@ public class RouteValueProvider : BindingSourceValueProvider
/// </summary>
/// <param name="bindingSource">The <see cref="BindingSource"/> of the data.</param>
/// <param name="values">The values.</param>
/// <remarks>Sets <see cref="Culture"/> to <see cref="CultureInfo.InvariantCulture" />.</remarks>
public RouteValueProvider(
BindingSource bindingSource,
RouteValueDictionary values)
: this(bindingSource, values, CultureInfo.InvariantCulture)
{
}

/// <summary>
/// Creates a new <see cref="RouteValueProvider"/>.
/// </summary>
/// <param name="bindingSource">The <see cref="BindingSource"/> of the data.</param>
/// <param name="values">The values.</param>
/// <param name="culture">The culture for route value.</param>
public RouteValueProvider(BindingSource bindingSource, RouteValueDictionary values, CultureInfo culture)
: base(bindingSource)
{
if (bindingSource == null)
Expand All @@ -36,7 +48,13 @@ public class RouteValueProvider : BindingSourceValueProvider
throw new ArgumentNullException(nameof(values));
}

if (culture == null)
{
throw new ArgumentNullException(nameof(culture));
}

_values = values;
Culture = culture;
}

protected PrefixContainer PrefixContainer
Expand All @@ -52,6 +70,8 @@ protected PrefixContainer PrefixContainer
}
}

protected CultureInfo Culture { get; }

/// <inheritdoc />
public override bool ContainsPrefix(string key)
{
Expand All @@ -70,7 +90,7 @@ public override ValueProviderResult GetValue(string key)
if (_values.TryGetValue(key, out value))
{
var stringValue = value as string ?? value?.ToString() ?? string.Empty;
return new ValueProviderResult(stringValue, CultureInfo.InvariantCulture);
return new ValueProviderResult(stringValue, Culture);
}
else
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Collections.Generic;
using System.Globalization;
using Microsoft.AspNetCore.Routing;
using Xunit;

Expand Down Expand Up @@ -61,6 +62,41 @@ public void ContainsPrefix_ReturnsNullValue_IfKeyIsPresent()
Assert.Equal(string.Empty, (string)result);
}

[Fact]
public void GetValue_ReturnsValue_WithDefaultCulture()
{
// Arrange
var values = new RouteValueDictionary(new Dictionary<string, object>
{
{ "test-key", "test-value"}
});
var provider = new RouteValueProvider(BindingSource.Query, values);

// Act
var result = provider.GetValue("test-key");

// Assert
Assert.Equal(CultureInfo.InvariantCulture, result.Culture);
}

[Fact]
public void GetValue_ReturnsValue_WithCulture()
{
// Arrange
var values = new RouteValueDictionary(new Dictionary<string, object>
{
{ "test-key", "test-value"}
});
var culture = new CultureInfo("fr-FR");
var provider = new RouteValueProvider(BindingSource.Query, values, culture);

// Act
var result = provider.GetValue("test-key");

// Assert
Assert.Equal(new CultureInfo("fr-FR"), result.Culture);
}

[Theory]
[InlineData("foo")]
[InlineData("bar")]
Expand Down