Skip to content

Removed Str.Encoding #245

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
ymh199478 merged 1 commit into from
Jun 25, 2019
Merged

Removed Str.Encoding #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 15 additions & 12 deletions src/CatLib.Core.Tests/Support/Stream/CombineStreamTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
using System.IO;
using System.Text;

#pragma warning disable CA1034

Expand All @@ -20,6 +21,8 @@ namespace CatLib.Support.Tests
[TestClass]
public class CombineStreamTests
{
public Encoding Encoding => Encoding.Default;

[TestMethod]
public void TestCombineStream()
{
Expand All @@ -39,9 +42,9 @@ public void TestCombineStream2()

var buffer = new byte[5];
Assert.AreEqual(5, stream.Read(buffer, 0, 5));
Assert.AreEqual("hello", Str.Encoding.GetString(buffer));
Assert.AreEqual("hello", Encoding.GetString(buffer));
Assert.AreEqual(5, stream.Read(buffer, 0, 5));
Assert.AreEqual("world", Str.Encoding.GetString(buffer));
Assert.AreEqual("world", Encoding.GetString(buffer));
}

[TestMethod]
Expand All @@ -53,20 +56,20 @@ public void TestCombineSeek()

var buffer = new byte[5];
Assert.AreEqual(5, stream.Read(buffer, 0, 5));
Assert.AreEqual("hello", Str.Encoding.GetString(buffer));
Assert.AreEqual("hello", Encoding.GetString(buffer));
Assert.AreEqual(5, stream.Read(buffer, 0, 5));
Assert.AreEqual("world", Str.Encoding.GetString(buffer));
Assert.AreEqual("world", Encoding.GetString(buffer));

stream.Seek(5, SeekOrigin.Begin);
Assert.AreEqual(5, stream.Read(buffer, 0, 5));
Assert.AreEqual("world", Str.Encoding.GetString(buffer));
Assert.AreEqual("world", Encoding.GetString(buffer));

stream.Seek(4, SeekOrigin.Begin);
Assert.AreEqual(5, stream.Read(buffer, 0, 5));
Assert.AreEqual("oworl", Str.Encoding.GetString(buffer));
Assert.AreEqual("oworl", Encoding.GetString(buffer));
stream.Seek(6, SeekOrigin.Begin);
Assert.AreEqual(4, stream.Read(buffer, 0, 5));
Assert.AreEqual("orld", Str.Encoding.GetString(buffer, 0, 4));
Assert.AreEqual("orld", Encoding.GetString(buffer, 0, 4));
stream.Seek(10, SeekOrigin.Begin);
Assert.AreEqual(0, stream.Read(buffer, 0, 5));
Assert.AreEqual(0, stream.Read(buffer, 0, 5));
Expand All @@ -81,13 +84,13 @@ public void TestCombineSeek2()

var buffer = new byte[5];
Assert.AreEqual(5, stream.Read(buffer, 0, 5));
Assert.AreEqual("hello", Str.Encoding.GetString(buffer));
Assert.AreEqual("hello", Encoding.GetString(buffer));
stream.Seek(2, SeekOrigin.Current);
Assert.AreEqual(3, stream.Read(buffer, 0, 5));
Assert.AreEqual("rld", Str.Encoding.GetString(buffer, 0, 3));
Assert.AreEqual("rld", Encoding.GetString(buffer, 0, 3));
stream.Seek(-3, SeekOrigin.End);
Assert.AreEqual(3, stream.Read(buffer, 0, 5));
Assert.AreEqual("rld", Str.Encoding.GetString(buffer, 0, 3));
Assert.AreEqual("rld", Encoding.GetString(buffer, 0, 3));
}

[TestMethod]
Expand All @@ -99,12 +102,12 @@ public void TestSetPosition()

var buffer = new byte[5];
Assert.AreEqual(5, stream.Read(buffer, 0, 5));
Assert.AreEqual("hello", Str.Encoding.GetString(buffer));
Assert.AreEqual("hello", Encoding.GetString(buffer));

Assert.AreEqual(5, stream.Position);
stream.Position = 0;
Assert.AreEqual(5, stream.Read(buffer, 0, 5));
Assert.AreEqual("hello", Str.Encoding.GetString(buffer));
Assert.AreEqual("hello", Encoding.GetString(buffer));
}

[TestMethod]
Expand Down
11 changes: 7 additions & 4 deletions src/CatLib.Core.Tests/Support/Stream/SegmentStreamTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
using System.IO;
using System.Text;

namespace CatLib.Support.Tests
{
[TestClass]
public class SegmentStreamTests
{
public Encoding Encoding => Encoding.Default;

[TestMethod]
public void TestRead()
{
Expand Down Expand Up @@ -101,7 +104,7 @@ public void TestReadBuffer()
var segmentStream = new SegmentStream(baseStream, 11);
var buffer = new byte[255];
Assert.AreEqual(11, segmentStream.Read(buffer, 0, 255));
Assert.AreEqual("hello world", Str.Encoding.GetString(buffer, 0, 11));
Assert.AreEqual("hello world", Encoding.GetString(buffer, 0, 11));
}

[TestMethod]
Expand All @@ -111,7 +114,7 @@ public void TestReadBufferEnd()
var segmentStream = new SegmentStream(baseStream, 11);
var buffer = new byte[255];
Assert.AreEqual(11, segmentStream.Read(buffer, 0, 255));
Assert.AreEqual("hello world", Str.Encoding.GetString(buffer, 0, 11));
Assert.AreEqual("hello world", Encoding.GetString(buffer, 0, 11));
Assert.AreEqual(0, segmentStream.Read(buffer, 0, 255));
}

Expand All @@ -122,7 +125,7 @@ public void TestReadBufferMin()
var segmentStream = new SegmentStream(baseStream, 11);
var buffer = new byte[5];
Assert.AreEqual(5, segmentStream.Read(buffer, 0, 5));
Assert.AreEqual("hello", Str.Encoding.GetString(buffer, 0, 5));
Assert.AreEqual("hello", Encoding.GetString(buffer, 0, 5));
}

[TestMethod]
Expand All @@ -140,7 +143,7 @@ public void TestWrite()
{
var baseStream = "hello world , my name is miaomiao".ToStream();
var segmentStream = new SegmentStream(baseStream, 11);
var buffer = Str.Encoding.GetBytes("hello world");
var buffer = Encoding.GetBytes("hello world");

segmentStream.Write(buffer, 0, buffer.Length);
}
Expand Down
2 changes: 1 addition & 1 deletion src/CatLib.Core/Support/Extension/ExtendStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public static string ToText(this Stream source, Encoding encoding = null, bool c
throw new LogicException($"Can not read stream, {nameof(source.CanRead)} == false");
}

encoding = encoding ?? Str.Encoding;
encoding = encoding ?? Encoding.Default;
var memoryStream = source as MemoryStream;
if (memoryStream != null)
{
Expand Down
2 changes: 1 addition & 1 deletion src/CatLib.Core/Support/Extension/ExtendString.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public static class ExtendString
/// <returns>The stream instance.</returns>
public static Stream ToStream(this string str, Encoding encoding = null)
{
return new MemoryStream((encoding ?? Str.Encoding).GetBytes(str));
return new MemoryStream((encoding ?? Encoding.Default).GetBytes(str));
}
}
}
5 changes: 0 additions & 5 deletions src/CatLib.Core/Support/Str.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ public enum PadType
Right,
}

/// <summary>
/// Gets or sets string encoding.
/// </summary>
public static Encoding Encoding { get; set; } = Encoding.UTF8;

/// <summary>
/// Get the function name expressed by the string.
/// </summary>
Expand Down