Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit edb3ccf

Browse files
mythzmythz
committed
Merge branch 'master' of github.com:ServiceStack/ServiceStack.Text
2 parents b13002b + 134f2f4 commit edb3ccf

26 files changed

+114
-64
lines changed

‎.vscode/launch.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
"type": "coreclr",
77
"request": "launch",
88
"preLaunchTask": "build",
9-
"program": "${workspaceRoot}/tests/ServiceStack.Text.Tests/bin/Debug/netcoreapp1.0/ServiceStack.Text.Tests.dll",
10-
//"args": ["--test=ServiceStack.Text.Tests.AutoMappingTests.Can_create_Dictionary_default_value"],
9+
"program": "${workspaceRoot}/tests/ServiceStack.Text.Tests/bin/Debug/netcoreapp1.1/ServiceStack.Text.Tests.dll",
10+
//"args": ["--test=ServiceStack.Text.Tests.ReflectionExtensionTests", "--labels=All"],
11+
"args": ["--labels=All"],
1112
"cwd": "${workspaceRoot}",
1213
"stopAtEntry": false,
1314
"externalConsole": false

‎src/.nuget/NuGet.exe

2.54 MB
Binary file not shown.

‎src/ServiceStack.Text/PlatformExtensions.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,19 @@ public static MethodInfo GetStaticMethod(this Type type, string methodName, Type
795795
public static MethodInfo GetMethodInfo(this Type type, string methodName, Type[] types = null)
796796
{
797797
#if (NETFX_CORE || PCL || NETSTANDARD1_1)
798-
return type.GetRuntimeMethods().FirstOrDefault(p => p.Name.Equals(methodName));
798+
if (types == null)
799+
return type.GetRuntimeMethods().FirstOrDefault(p => p.Name.Equals(methodName));
800+
801+
foreach(var mi in type.GetRuntimeMethods().Where(p => p.Name.Equals(methodName)))
802+
{
803+
var methodParams = mi.GetParameters().Select(p => p.ParameterType);
804+
if (methodParams.SequenceEqual(types))
805+
{
806+
return mi;
807+
}
808+
}
809+
810+
return null;
799811
#else
800812
return types == null
801813
? type.GetMethod(methodName)

‎tests/ServiceStack.Text.Tests/CsvSerializerTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ static CsvSerializerTests()
1616
NorthwindData.LoadData(false);
1717
}
1818

19-
[TestFixtureSetUp]
19+
[OneTimeSetUp]
2020
public void TestFixtureSetUp()
2121
{
2222
JsConfig.SkipDateTimeConversion = true;
2323
}
2424

25-
[TestFixtureTearDown]
25+
[OneTimeTearDown]
2626
public void TestFixtureTearDown()
2727
{
2828
JsConfig.Reset();
@@ -150,7 +150,7 @@ public void Does_serialize_partial_DTO_in_order_of_Headers()
150150
var csv = CsvSerializer.SerializeToString(subMovies);
151151

152152
csv.Print();
153-
Assert.That(csv, Is.StringStarting("ReleaseDate,Title,Rating,ImdbId\r\n"));
153+
Assert.That(csv, Does.StartWith("ReleaseDate,Title,Rating,ImdbId\r\n"));
154154

155155
var movies = csv.FromCsv<List<Movie>>();
156156

‎tests/ServiceStack.Text.Tests/CsvTests/CustomHeaderTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace ServiceStack.Text.Tests.CsvTests
88
[TestFixture]
99
public class CustomHeaderTests
1010
{
11-
[TestFixtureTearDown]
11+
[OneTimeTearDown]
1212
public void TestFixtureTearDown()
1313
{
1414
CsvConfig<TableItem>.Reset();

‎tests/ServiceStack.Text.Tests/CultureInfoTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class CultureInfoTests
1313

1414
private CultureInfo previousCulture = CultureInfo.InvariantCulture;
1515

16-
[TestFixtureSetUp]
16+
[OneTimeSetUp]
1717
public void TestFixtureSetUp()
1818
{
1919
#if NETCORE
@@ -27,7 +27,7 @@ public void TestFixtureSetUp()
2727
#endif
2828
}
2929

30-
[TestFixtureTearDown]
30+
[OneTimeTearDown]
3131
public void TestFixtureTearDown()
3232
{
3333
#if NETCORE
@@ -104,9 +104,9 @@ public void Does_use_invariant_culture_for_numbers()
104104
dto.ToJsv().Print();
105105
dto.ToCsv().Print();
106106

107-
Assert.That(dto.ToJson(), Is.Not.StringContaining("1000,9"));
108-
Assert.That(dto.ToJsv(), Is.Not.StringContaining("1000,9"));
109-
Assert.That(dto.ToCsv(), Is.Not.StringContaining("1000,9"));
107+
Assert.That(dto.ToJson(), Does.Not.Contain("1000,9"));
108+
Assert.That(dto.ToJsv(), Does.Not.Contain("1000,9"));
109+
Assert.That(dto.ToCsv(), Does.Not.Contain("1000,9"));
110110
}
111111

112112
}

‎tests/ServiceStack.Text.Tests/CustomCultureInfoTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ public void Does_not_use_custom_decimal()
2929
num.ToJsv().Print();
3030
num.ToCsv().Print();
3131

32-
Assert.That(num.ToJson(), Is.StringContaining("4444.4444"));
33-
Assert.That(num.ToJsv(), Is.StringContaining("4444.4444"));
34-
Assert.That(num.ToCsv(), Is.StringContaining("4444,4444"));
32+
Assert.That(num.ToJson(), Does.Contain("4444.4444"));
33+
Assert.That(num.ToJsv(), Does.Contain("4444.4444"));
34+
Assert.That(num.ToCsv(), Does.Contain("4444,4444"));
3535

3636
CsvConfig.RealNumberCultureInfo = null;
3737
}

‎tests/ServiceStack.Text.Tests/DateTimeOffsetAndTimeSpanTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ namespace ServiceStack.Text.Tests
1010
public class DateTimeOffsetAndTimeSpanTests : TestBase
1111
{
1212
#if !IOS && !NETCORE_SUPPORT
13-
[TestFixtureSetUp]
13+
[OneTimeSetUp]
1414
public void TestFixtureSetUp()
1515
{
1616
JsonDataContractSerializer.Instance.UseBcl = true;
1717
}
1818

19-
[TestFixtureTearDown]
19+
[OneTimeTearDown]
2020
public void TestFixtureTearDown()
2121
{
2222
JsonDataContractSerializer.Instance.UseBcl = false;
@@ -33,7 +33,7 @@ public void Can_Serializable_DateTimeOffset_Field()
3333
//DataContractSerializer.Instance.Parse(model).Print();
3434

3535
var json = JsonSerializer.SerializeToString(model);
36-
Assert.That(json, Is.StringContaining("\"TimeSpan\":\"PT0S\""));
36+
Assert.That(json, Does.Contain("\"TimeSpan\":\"PT0S\""));
3737

3838
var fromJson = json.FromJson<SampleModel>();
3939

@@ -52,7 +52,7 @@ public void Can_serialize_TimeSpan_field()
5252

5353
var model = new SampleModel { Id = 1, TimeSpan = period };
5454
var json = JsonSerializer.SerializeToString(model);
55-
Assert.That(json, Is.StringContaining("\"TimeSpan\":\"P3652D\""));
55+
Assert.That(json, Does.Contain("\"TimeSpan\":\"P3652D\""));
5656

5757
//Behaviour of .NET's BCL classes
5858
//JsonDataContractSerializer.Instance.SerializeToString(model).Print();
@@ -70,7 +70,7 @@ public void Can_serialize_TimeSpan_field_with_StandardTimeSpanFormat()
7070

7171
var model = new SampleModel { Id = 1, TimeSpan = period };
7272
var json = JsonSerializer.SerializeToString(model);
73-
Assert.That(json, Is.StringContaining("\"TimeSpan\":\"00:01:10\""));
73+
Assert.That(json, Does.Contain("\"TimeSpan\":\"00:01:10\""));
7474
}
7575
}
7676

@@ -83,7 +83,7 @@ public void Can_serialize_NullableTimeSpan_field_with_StandardTimeSpanFormat()
8383

8484
var model = new NullableSampleModel { Id = 1, TimeSpan = period };
8585
var json = JsonSerializer.SerializeToString(model);
86-
Assert.That(json, Is.StringContaining("\"TimeSpan\":\"00:01:10\""));
86+
Assert.That(json, Does.Contain("\"TimeSpan\":\"00:01:10\""));
8787
}
8888
}
8989

@@ -94,7 +94,7 @@ public void Can_serialize_NullTimeSpan_field_with_StandardTimeSpanFormat()
9494
{
9595
var model = new NullableSampleModel { Id = 1 };
9696
var json = JsonSerializer.SerializeToString(model);
97-
Assert.That(json, Is.Not.StringContaining("\"TimeSpan\""));
97+
Assert.That(json, Does.Not.Contain("\"TimeSpan\""));
9898
}
9999
}
100100

‎tests/ServiceStack.Text.Tests/DictionaryTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace ServiceStack.Text.Tests
1111
public class DictionaryTests
1212
: TestBase
1313
{
14-
[TestFixtureSetUp]
14+
[OneTimeSetUp]
1515
public void SetUp()
1616
{
1717
#if IOS

‎tests/ServiceStack.Text.Tests/JsConfigTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ namespace ServiceStack.Text.Tests
77
[TestFixture]
88
public class JsConfigTests
99
{
10-
[TestFixtureSetUp]
10+
[OneTimeSetUp]
1111
public void TestFixtureSetUp()
1212
{
1313
JsConfig.EmitLowercaseUnderscoreNames = true;
1414
JsConfig<Bar>.EmitLowercaseUnderscoreNames = false;
1515
}
1616

17-
[TestFixtureTearDown]
17+
[OneTimeTearDown]
1818
public void TestFixtureTearDown()
1919
{
2020
JsConfig.Reset();

0 commit comments

Comments
 (0)