huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CodePointFilter parameterless ctor should be empty, not Basic Latin

This commit is contained in:
Levi B 2015-02-27 11:28:40 -08:00
parent 0ca24147a0
commit eb42bc51fb
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Microsoft.Framework.WebEncoders/CodePointFilter.cs
View File

@ -15,12 +15,11 @@ namespace Microsoft.Framework.WebEncoders
private AllowedCharsBitmap _allowedCharsBitmap; private AllowedCharsBitmap _allowedCharsBitmap;
/// <summary> /// <summary>
/// Instantiates the filter allowing only the 'Basic Latin' block of characters through. /// Instantiates an empty filter.
/// </summary> /// </summary>
public CodePointFilter() public CodePointFilter()
{ {
_allowedCharsBitmap = new AllowedCharsBitmap(); _allowedCharsBitmap = new AllowedCharsBitmap();
AllowBlock(UnicodeBlocks.BasicLatin);
} }
/// <summary> /// <summary>

2
src/Microsoft.Framework.WebEncoders/HtmlEncoder.cs
View File

@ -120,7 +120,7 @@ namespace Microsoft.Framework.WebEncoders
HtmlUnicodeEncoder encoder = Volatile.Read(ref _basicLatinSingleton); HtmlUnicodeEncoder encoder = Volatile.Read(ref _basicLatinSingleton);
if (encoder == null) if (encoder == null)
{ {
encoder = new HtmlUnicodeEncoder(new CodePointFilter()); encoder = new HtmlUnicodeEncoder(new CodePointFilter(UnicodeBlocks.BasicLatin));
Volatile.Write(ref _basicLatinSingleton, encoder); Volatile.Write(ref _basicLatinSingleton, encoder);
} }
return encoder; return encoder;

2
src/Microsoft.Framework.WebEncoders/JavaScriptStringEncoder.cs
View File

@ -124,7 +124,7 @@ namespace Microsoft.Framework.WebEncoders
JavaScriptStringUnicodeEncoder encoder = Volatile.Read(ref _basicLatinSingleton); JavaScriptStringUnicodeEncoder encoder = Volatile.Read(ref _basicLatinSingleton);
if (encoder == null) if (encoder == null)
{ {
encoder = new JavaScriptStringUnicodeEncoder(new CodePointFilter()); encoder = new JavaScriptStringUnicodeEncoder(new CodePointFilter(UnicodeBlocks.BasicLatin));
Volatile.Write(ref _basicLatinSingleton, encoder); Volatile.Write(ref _basicLatinSingleton, encoder);
} }
return encoder; return encoder;

2
src/Microsoft.Framework.WebEncoders/UrlEncoder.cs
View File

@ -163,7 +163,7 @@ namespace Microsoft.Framework.WebEncoders
UrlUnicodeEncoder encoder = Volatile.Read(ref _basicLatinSingleton); UrlUnicodeEncoder encoder = Volatile.Read(ref _basicLatinSingleton);
if (encoder == null) if (encoder == null)
{ {
encoder = new UrlUnicodeEncoder(new CodePointFilter()); encoder = new UrlUnicodeEncoder(new CodePointFilter(UnicodeBlocks.BasicLatin));
Volatile.Write(ref _basicLatinSingleton, encoder); Volatile.Write(ref _basicLatinSingleton, encoder);
} }
return encoder; return encoder;

8
test/Microsoft.Framework.WebEncoders.Tests/CodePointFilterTests.cs
View File

@ -11,17 +11,13 @@ namespace Microsoft.Framework.WebEncoders
public class CodePointFilterTests public class CodePointFilterTests
{ {
[Fact] [Fact]
public void Ctor_Parameterless_DefaultsToBasicLatin() public void Ctor_Parameterless_CreatesEmptyFilter()
{ {
// Act // Act
var filter = new CodePointFilter(); var filter = new CodePointFilter();
// Assert // Assert
for (int i = 0; i <= 0x007F; i++) for (int i = 0; i <= Char.MaxValue; i++)
{
Assert.True(filter.IsCharacterAllowed((char)i));
}
for (int i = 0x0080; i <= Char.MaxValue; i++)
{ {
Assert.False(filter.IsCharacterAllowed((char)i)); Assert.False(filter.IsCharacterAllowed((char)i));
} }