Update NUnit to v3.5

xplicit · xplicit · commit c604b9236d61 · 2016-12-26T11:39:21.000+07:00
diff --git a/src/.nuget/NuGet.exe b/src/.nuget/NuGet.exe
diff --git a/tests/ServiceStack.Text.Tests/CsvSerializerTests.cs b/tests/ServiceStack.Text.Tests/CsvSerializerTests.cs
@@ -16,13 +16,13 @@ static CsvSerializerTests()
             NorthwindData.LoadData(false);
         }
 
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void TestFixtureSetUp()
         {
             JsConfig.SkipDateTimeConversion = true;
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TestFixtureTearDown()
         {
             JsConfig.Reset();
@@ -150,7 +150,7 @@ public void Does_serialize_partial_DTO_in_order_of_Headers()
             var csv = CsvSerializer.SerializeToString(subMovies);
 
             csv.Print();
-            Assert.That(csv, Is.StringStarting("ReleaseDate,Title,Rating,ImdbId\r\n"));
+            Assert.That(csv, Does.StartWith("ReleaseDate,Title,Rating,ImdbId\r\n"));
 
             var movies = csv.FromCsv<List<Movie>>();
 
diff --git a/tests/ServiceStack.Text.Tests/CsvTests/CustomHeaderTests.cs b/tests/ServiceStack.Text.Tests/CsvTests/CustomHeaderTests.cs
@@ -8,7 +8,7 @@ namespace ServiceStack.Text.Tests.CsvTests
 	[TestFixture]
 	public class CustomHeaderTests
 	{
-		[TestFixtureTearDown]
+		[OneTimeTearDown]
 		public void TestFixtureTearDown()
 		{
 			CsvConfig<TableItem>.Reset();
diff --git a/tests/ServiceStack.Text.Tests/CultureInfoTests.cs b/tests/ServiceStack.Text.Tests/CultureInfoTests.cs
@@ -13,7 +13,7 @@ public class CultureInfoTests
 
 		private CultureInfo previousCulture = CultureInfo.InvariantCulture;
 
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void TestFixtureSetUp()
 		{
 #if NETCORE
@@ -27,7 +27,7 @@ public void TestFixtureSetUp()
 #endif
 		}
 
-		[TestFixtureTearDown]
+		[OneTimeTearDown]
 		public void TestFixtureTearDown()
 		{
 #if NETCORE
@@ -104,9 +104,9 @@ public void Does_use_invariant_culture_for_numbers()
             dto.ToJsv().Print();
             dto.ToCsv().Print();
 
-            Assert.That(dto.ToJson(), Is.Not.StringContaining("1000,9"));
-            Assert.That(dto.ToJsv(), Is.Not.StringContaining("1000,9"));
-            Assert.That(dto.ToCsv(), Is.Not.StringContaining("1000,9"));
+            Assert.That(dto.ToJson(), Does.Not.Contain("1000,9"));
+            Assert.That(dto.ToJsv(), Does.Not.Contain("1000,9"));
+            Assert.That(dto.ToCsv(), Does.Not.Contain("1000,9"));
 	    }
 
 	}
diff --git a/tests/ServiceStack.Text.Tests/CustomCultureInfoTests.cs b/tests/ServiceStack.Text.Tests/CustomCultureInfoTests.cs
@@ -29,9 +29,9 @@ public void Does_not_use_custom_decimal()
             num.ToJsv().Print();
             num.ToCsv().Print();
 
-            Assert.That(num.ToJson(), Is.StringContaining("4444.4444"));
-            Assert.That(num.ToJsv(), Is.StringContaining("4444.4444"));
-            Assert.That(num.ToCsv(), Is.StringContaining("4444,4444"));
+            Assert.That(num.ToJson(), Does.Contain("4444.4444"));
+            Assert.That(num.ToJsv(), Does.Contain("4444.4444"));
+            Assert.That(num.ToCsv(), Does.Contain("4444,4444"));
 
             CsvConfig.RealNumberCultureInfo = null;
         }
diff --git a/tests/ServiceStack.Text.Tests/DateTimeOffsetAndTimeSpanTests.cs b/tests/ServiceStack.Text.Tests/DateTimeOffsetAndTimeSpanTests.cs
@@ -10,13 +10,13 @@ namespace ServiceStack.Text.Tests
     public class DateTimeOffsetAndTimeSpanTests : TestBase
     {
 #if !IOS && !NETCORE_SUPPORT
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void TestFixtureSetUp()
         {
             JsonDataContractSerializer.Instance.UseBcl = true;
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TestFixtureTearDown()
         {
             JsonDataContractSerializer.Instance.UseBcl = false;            
@@ -33,7 +33,7 @@ public void Can_Serializable_DateTimeOffset_Field()
             //DataContractSerializer.Instance.Parse(model).Print();
 
             var json = JsonSerializer.SerializeToString(model);
-            Assert.That(json, Is.StringContaining("\"TimeSpan\":\"PT0S\""));
+            Assert.That(json, Does.Contain("\"TimeSpan\":\"PT0S\""));
 
             var fromJson = json.FromJson<SampleModel>();
 
@@ -52,7 +52,7 @@ public void Can_serialize_TimeSpan_field()
 
             var model = new SampleModel { Id = 1, TimeSpan = period };
             var json = JsonSerializer.SerializeToString(model);
-            Assert.That(json, Is.StringContaining("\"TimeSpan\":\"P3652D\""));
+            Assert.That(json, Does.Contain("\"TimeSpan\":\"P3652D\""));
 
             //Behaviour of .NET's BCL classes
             //JsonDataContractSerializer.Instance.SerializeToString(model).Print();
@@ -70,7 +70,7 @@ public void Can_serialize_TimeSpan_field_with_StandardTimeSpanFormat()
 
                 var model = new SampleModel { Id = 1, TimeSpan = period };
                 var json = JsonSerializer.SerializeToString(model);
-                Assert.That(json, Is.StringContaining("\"TimeSpan\":\"00:01:10\""));
+                Assert.That(json, Does.Contain("\"TimeSpan\":\"00:01:10\""));
             }
         }
 
@@ -83,7 +83,7 @@ public void Can_serialize_NullableTimeSpan_field_with_StandardTimeSpanFormat()
 
                 var model = new NullableSampleModel { Id = 1, TimeSpan = period };
                 var json = JsonSerializer.SerializeToString(model);
-                Assert.That(json, Is.StringContaining("\"TimeSpan\":\"00:01:10\""));
+                Assert.That(json, Does.Contain("\"TimeSpan\":\"00:01:10\""));
             }
         }
 
@@ -94,7 +94,7 @@ public void Can_serialize_NullTimeSpan_field_with_StandardTimeSpanFormat()
             {
                 var model = new NullableSampleModel { Id = 1 };
                 var json = JsonSerializer.SerializeToString(model);
-                Assert.That(json, Is.Not.StringContaining("\"TimeSpan\""));
+                Assert.That(json, Does.Not.Contain("\"TimeSpan\""));
             }
         }
 
diff --git a/tests/ServiceStack.Text.Tests/DictionaryTests.cs b/tests/ServiceStack.Text.Tests/DictionaryTests.cs
@@ -11,7 +11,7 @@ namespace ServiceStack.Text.Tests
     public class DictionaryTests
         : TestBase
     {
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void SetUp()
         {
 #if IOS
diff --git a/tests/ServiceStack.Text.Tests/JsConfigTests.cs b/tests/ServiceStack.Text.Tests/JsConfigTests.cs
@@ -7,14 +7,14 @@ namespace ServiceStack.Text.Tests
     [TestFixture]
     public class JsConfigTests
     {
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void TestFixtureSetUp()
         {
             JsConfig.EmitLowercaseUnderscoreNames = true;
             JsConfig<Bar>.EmitLowercaseUnderscoreNames = false;
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TestFixtureTearDown()
         {
             JsConfig.Reset();
diff --git a/tests/ServiceStack.Text.Tests/JsonTests/ConditionalSerializationTests.cs b/tests/ServiceStack.Text.Tests/JsonTests/ConditionalSerializationTests.cs
@@ -14,7 +14,7 @@ public void TestSerializeRespected()
             var obj = new Foo { X = "abc", Z = "def" }; // don't touch Y...
 
             string json = JsonSerializer.SerializeToString(obj);
-            Assert.That(json, Is.StringMatching("{\"X\":\"abc\",\"Z\":\"def\"}"));   
+            Assert.That(json, Does.Match("{\"X\":\"abc\",\"Z\":\"def\"}"));   
         }
 
         [Test]
@@ -23,7 +23,7 @@ public void TestSerializeRespectedWithInheritance()
             var obj = new SuperFoo { X = "abc", Z = "def", A =123, C = 456 }; // don't touch Y or B...
 
             string json = JsonSerializer.SerializeToString(obj);
-            Assert.That(json, Is.StringMatching("{\"A\":123,\"C\":456,\"X\":\"abc\",\"Z\":\"def\"}"));
+            Assert.That(json, Does.Match("{\"A\":123,\"C\":456,\"X\":\"abc\",\"Z\":\"def\"}"));
         }
 
         [Test]
@@ -32,7 +32,7 @@ public void TestSerializeHasAttributeNull()
             var obj = new ByNameFoo { A = 123, B = 456 };
 
             string json = JsonSerializer.SerializeToString(obj);
-            Assert.That(json, Is.StringMatching("{\"A\":123,\"B\":456}"));
+            Assert.That(json, Does.Match("{\"A\":123,\"B\":456}"));
         }
 
         [Test]
@@ -41,7 +41,7 @@ public void TestSerializeHasAttributeSet()
             var obj = new ByNameFoo { A = 123, B = 456, hasAttribute = new HashSet<string> { "A" } };
 
             string json = JsonSerializer.SerializeToString(obj);
-            Assert.That(json, Is.StringMatching("{\"A\":123"));
+            Assert.That(json, Does.Match("{\"A\":123"));
 
             var cpy = JsonSerializer.DeserializeFromString<ByNameFoo>(json);
             Assert.That(cpy.A, Is.EqualTo(obj.A));
@@ -54,7 +54,7 @@ public void TestSerializeHasAttributeSetNullValue()
             var obj = new ByNameFoo { A = 123, B = null, hasAttribute = new HashSet<string> { "B" } };
 
             string json = JsonSerializer.SerializeToString(obj);
-            Assert.That(json, Is.StringMatching("{\"B\":null"));
+            Assert.That(json, Does.Match("{\"B\":null"));
 
             var cpy = JsonSerializer.DeserializeFromString<ByNameFoo>(json);
             Assert.That(cpy.A, Is.EqualTo(0));
diff --git a/tests/ServiceStack.Text.Tests/JsonTests/ContractByInterfaceTests.cs b/tests/ServiceStack.Text.Tests/JsonTests/ContractByInterfaceTests.cs
@@ -17,7 +17,7 @@ public void Prefer_interfaces_should_work_on_top_level_object_using_extension_me
             {
                 var json = new Concrete("boo", 1).ToJson();
 
-                Assert.That(json, Is.StringContaining("\"ServiceStack.Text.Tests.JsonTests.IContract, ServiceStack.Text.Tests\""));
+                Assert.That(json, Does.Contain("\"ServiceStack.Text.Tests.JsonTests.IContract, ServiceStack.Text.Tests\""));
             }
         }
 
@@ -30,7 +30,7 @@ public void Should_be_able_to_serialise_based_on_an_interface()
                 var json = JsonSerializer.SerializeToString(myConcrete, typeof(IContract));
 
                 Console.WriteLine(json);
-                Assert.That(json, Is.StringContaining("\"ServiceStack.Text.Tests.JsonTests.IContract, ServiceStack.Text.Tests\""));
+                Assert.That(json, Does.Contain("\"ServiceStack.Text.Tests.JsonTests.IContract, ServiceStack.Text.Tests\""));
             }
         }
 
@@ -43,7 +43,7 @@ public void Should_not_use_interface_type_if_concrete_specified()
                 var json = JsonSerializer.SerializeToString(myConcrete, typeof(IContract));
 
                 Console.WriteLine(json);
-                Assert.That(json, Is.StringContaining("\"ServiceStack.Text.Tests.JsonTests.Concrete, ServiceStack.Text.Tests\""));
+                Assert.That(json, Does.Contain("\"ServiceStack.Text.Tests.JsonTests.Concrete, ServiceStack.Text.Tests\""));
             }
         }
 
diff --git a/tests/ServiceStack.Text.Tests/JsonTests/CustomRawSerializerTests.cs b/tests/ServiceStack.Text.Tests/JsonTests/CustomRawSerializerTests.cs
@@ -8,7 +8,7 @@ namespace ServiceStack.Text.Tests.JsonTests
     [TestFixture]
     public class CustomRawSerializerTests
     {
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TestFixtureTearDown()
         {
             JsConfig.Reset();
@@ -59,7 +59,7 @@ public void Can_Serialize_bytes_as_Hex()
             };
 
             var json = dto.ToJson();
-            Assert.That(json, Is.StringContaining("FF-00-00"));
+            Assert.That(json, Does.Contain("FF-00-00"));
 
             var fromJson = json.FromJson<RealType>();
 
@@ -167,8 +167,8 @@ public void Does_call_RawSerializeFn_for_toplevel_types()
             var luxaryParentJson = luxaryParent.ToJson();
             var cheapParentJson = cheapParent.ToJson();
 
-            Assert.That(luxaryParentJson, Is.Not.StringContaining("__type"));
-            Assert.That(cheapParentJson, Is.Not.StringContaining("__type"));
+            Assert.That(luxaryParentJson, Does.Not.Contain("__type"));
+            Assert.That(cheapParentJson, Does.Not.Contain("__type"));
 
             ICar luxary = new LuxaryCar() { Sunroof = "Big" };
             ICar cheap = new CheapCar() { HasCupHolder = true };
@@ -177,8 +177,8 @@ public void Does_call_RawSerializeFn_for_toplevel_types()
             var luxaryJson = JsonSerializer.SerializeToString(luxary, typeof(ICar));
             var cheapJson = JsonSerializer.SerializeToString(cheap, typeof(ICar));
 
-            Assert.That(luxaryJson, Is.Not.StringContaining("__type"));
-            Assert.That(cheapJson, Is.Not.StringContaining("__type"));
+            Assert.That(luxaryJson, Does.Not.Contain("__type"));
+            Assert.That(cheapJson, Does.Not.Contain("__type"));
 
             JsConfig.Reset();
         }
@@ -202,7 +202,7 @@ public void Does_call_RawSerializeFn_for_toplevel_concrete_type()
 
             var luxaryJson = luxary.ToJson();
 
-            Assert.That(luxaryJson, Is.StringContaining("foo"));
+            Assert.That(luxaryJson, Does.Contain("foo"));
 
             JsConfig.Reset();
         }
diff --git a/tests/ServiceStack.Text.Tests/JsonTests/CustomSerializerTests.cs b/tests/ServiceStack.Text.Tests/JsonTests/CustomSerializerTests.cs
@@ -15,7 +15,7 @@ static CustomSerializerTests()
             JsConfig<EntityWithValues>.RawDeserializeFn = DeserializeEntity;
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TestFixtureTearDown()
         {
             JsConfig.Reset();
diff --git a/tests/ServiceStack.Text.Tests/JsvTests/TypeSerializerToStringDictionaryTests.cs b/tests/ServiceStack.Text.Tests/JsvTests/TypeSerializerToStringDictionaryTests.cs
@@ -10,7 +10,7 @@ namespace ServiceStack.Text.Tests.JsvTests
 	[TestFixture]
 	public class TypeSerializerToStringDictionaryTests
 	{
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void TestFixtureSetUp()
 		{
 			NorthwindData.LoadData(false);
diff --git a/tests/ServiceStack.Text.Tests/LicensingTests.cs b/tests/ServiceStack.Text.Tests/LicensingTests.cs
@@ -150,7 +150,7 @@ public void Expired_licenses_throws_LicenseException()
             catch (LicenseException ex)
             {
                 ex.Message.Print();
-                Assert.That(ex.Message, Is.StringStarting("This license has expired"));
+                Assert.That(ex.Message, Does.StartWith("This license has expired"));
             }
 
             try
@@ -161,7 +161,7 @@ public void Expired_licenses_throws_LicenseException()
             catch (LicenseException ex)
             {
                 ex.Message.Print();
-                Assert.That(ex.Message, Is.StringStarting("This license has expired"));
+                Assert.That(ex.Message, Does.StartWith("This license has expired"));
             }
 
             try
@@ -172,8 +172,8 @@ public void Expired_licenses_throws_LicenseException()
             catch (LicenseException ex)
             {
                 ex.Message.Print();
-                Assert.That(ex.Message, Is.StringStarting("This trial license has expired")
-                                       .Or.StringStarting("This license has expired"));
+                Assert.That(ex.Message, Does.StartWith("This trial license has expired")
+                                       .Or.StartWith("This license has expired"));
             }
         }
 
diff --git a/tests/ServiceStack.Text.Tests/SerializationDelegatePerformanceTests.cs b/tests/ServiceStack.Text.Tests/SerializationDelegatePerformanceTests.cs
@@ -9,7 +9,7 @@ namespace ServiceStack.Text.Tests
     public class SerializationDelegatePerformanceTests
         : TestBase
     {
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void SetUp()
         {
             AddSerializeHooksForType<PerformanceTestHookClass>();
diff --git a/tests/ServiceStack.Text.Tests/SerializationHookTests.cs b/tests/ServiceStack.Text.Tests/SerializationHookTests.cs
@@ -9,7 +9,7 @@ namespace ServiceStack.Text.Tests
     public class SerializationHookTests
         : TestBase
     {
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void SetUp()
         {
             AddSerializeHooksForType<HookTestClass>();
diff --git a/tests/ServiceStack.Text.Tests/ServiceStack.Text.Tests.csproj b/tests/ServiceStack.Text.Tests/ServiceStack.Text.Tests.csproj
@@ -132,9 +132,10 @@
     <Reference Include="Northwind.Common">
       <HintPath>..\..\lib\tests\Northwind.Common.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\src\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+      <HintPath>..\..\src\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="ServiceStack">
       <HintPath>..\..\lib\tests\ServiceStack.dll</HintPath>
diff --git a/tests/ServiceStack.Text.Tests/StringSerializerNorthwindDatabaseTests.cs b/tests/ServiceStack.Text.Tests/StringSerializerNorthwindDatabaseTests.cs
@@ -9,7 +9,7 @@ namespace ServiceStack.Text.Tests
 	public class StringSerializerNorthwindDatabaseTests
 		: TestBase
 	{
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void TestFixtureSetUp()
 		{
 			NorthwindData.LoadData(false);
diff --git a/tests/ServiceStack.Text.Tests/StringSerializerTests.cs b/tests/ServiceStack.Text.Tests/StringSerializerTests.cs
@@ -12,7 +12,7 @@ namespace ServiceStack.Text.Tests
 	public class StringSerializerTests
 		: TestBase
 	{
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void TestFixtureSetUp()
 		{
 			NorthwindData.LoadData(false);
diff --git a/tests/ServiceStack.Text.Tests/StructTests.cs b/tests/ServiceStack.Text.Tests/StructTests.cs
@@ -59,7 +59,7 @@ public override string ToString()
             }
         }
 
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void SetUp()
         {
 #if IOS
diff --git a/tests/ServiceStack.Text.Tests/UseCases/StripeSerializationTests.cs b/tests/ServiceStack.Text.Tests/UseCases/StripeSerializationTests.cs
diff --git a/tests/ServiceStack.Text.Tests/Utils/DateTimeSerializerTests.cs b/tests/ServiceStack.Text.Tests/Utils/DateTimeSerializerTests.cs
diff --git a/tests/ServiceStack.Text.Tests/packages.config b/tests/ServiceStack.Text.Tests/packages.config

Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,13 @@ static CsvSerializerTests()`
`16`	`16`	`NorthwindData.LoadData(false);`
`17`	`17`	`}`
`18`	`18`
`19`		`- [TestFixtureSetUp]`
	`19`	`+ [OneTimeSetUp]`
`20`	`20`	`public void TestFixtureSetUp()`
`21`	`21`	`{`
`22`	`22`	`JsConfig.SkipDateTimeConversion = true;`
`23`	`23`	`}`
`24`	`24`
`25`		`- [TestFixtureTearDown]`
	`25`	`+ [OneTimeTearDown]`
`26`	`26`	`public void TestFixtureTearDown()`
`27`	`27`	`{`
`28`	`28`	`JsConfig.Reset();`
`@@ -150,7 +150,7 @@ public void Does_serialize_partial_DTO_in_order_of_Headers()`
`150`	`150`	`var csv = CsvSerializer.SerializeToString(subMovies);`
`151`	`151`
`152`	`152`	`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"));`
`154`	`154`
`155`	`155`	`var movies = csv.FromCsv<List<Movie>>();`
`156`	`156`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace ServiceStack.Text.Tests.CsvTests`
`8`	`8`	`[TestFixture]`
`9`	`9`	`public class CustomHeaderTests`
`10`	`10`	`{`
`11`		`- [TestFixtureTearDown]`
	`11`	`+ [OneTimeTearDown]`
`12`	`12`	`public void TestFixtureTearDown()`
`13`	`13`	`{`
`14`	`14`	`CsvConfig<TableItem>.Reset();`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class CultureInfoTests`
`13`	`13`
`14`	`14`	`private CultureInfo previousCulture = CultureInfo.InvariantCulture;`
`15`	`15`
`16`		`- [TestFixtureSetUp]`
	`16`	`+ [OneTimeSetUp]`
`17`	`17`	`public void TestFixtureSetUp()`
`18`	`18`	`{`
`19`	`19`	`#if NETCORE`
`@@ -27,7 +27,7 @@ public void TestFixtureSetUp()`
`27`	`27`	`#endif`
`28`	`28`	`}`
`29`	`29`
`30`		`- [TestFixtureTearDown]`
	`30`	`+ [OneTimeTearDown]`
`31`	`31`	`public void TestFixtureTearDown()`
`32`	`32`	`{`
`33`	`33`	`#if NETCORE`
`@@ -104,9 +104,9 @@ public void Does_use_invariant_culture_for_numbers()`
`104`	`104`	`dto.ToJsv().Print();`
`105`	`105`	`dto.ToCsv().Print();`
`106`	`106`
`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"));`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,13 @@ namespace ServiceStack.Text.Tests`
`10`	`10`	`public class DateTimeOffsetAndTimeSpanTests : TestBase`
`11`	`11`	`{`
`12`	`12`	`#if !IOS && !NETCORE_SUPPORT`
`13`		`- [TestFixtureSetUp]`
	`13`	`+ [OneTimeSetUp]`
`14`	`14`	`public void TestFixtureSetUp()`
`15`	`15`	`{`
`16`	`16`	`JsonDataContractSerializer.Instance.UseBcl = true;`
`17`	`17`	`}`
`18`	`18`
`19`		`- [TestFixtureTearDown]`
	`19`	`+ [OneTimeTearDown]`
`20`	`20`	`public void TestFixtureTearDown()`
`21`	`21`	`{`
`22`	`22`	`JsonDataContractSerializer.Instance.UseBcl = false;`
`@@ -33,7 +33,7 @@ public void Can_Serializable_DateTimeOffset_Field()`
`33`	`33`	`//DataContractSerializer.Instance.Parse(model).Print();`
`34`	`34`
`35`	`35`	`var json = JsonSerializer.SerializeToString(model);`
`36`		`- Assert.That(json, Is.StringContaining("\"TimeSpan\":\"PT0S\""));`
	`36`	`+ Assert.That(json, Does.Contain("\"TimeSpan\":\"PT0S\""));`
`37`	`37`
`38`	`38`	`var fromJson = json.FromJson<SampleModel>();`
`39`	`39`
`@@ -52,7 +52,7 @@ public void Can_serialize_TimeSpan_field()`
`52`	`52`
`53`	`53`	`var model = new SampleModel { Id = 1, TimeSpan = period };`
`54`	`54`	`var json = JsonSerializer.SerializeToString(model);`
`55`		`- Assert.That(json, Is.StringContaining("\"TimeSpan\":\"P3652D\""));`
	`55`	`+ Assert.That(json, Does.Contain("\"TimeSpan\":\"P3652D\""));`
`56`	`56`
`57`	`57`	`//Behaviour of .NET's BCL classes`
`58`	`58`	`//JsonDataContractSerializer.Instance.SerializeToString(model).Print();`
`@@ -70,7 +70,7 @@ public void Can_serialize_TimeSpan_field_with_StandardTimeSpanFormat()`
`70`	`70`
`71`	`71`	`var model = new SampleModel { Id = 1, TimeSpan = period };`
`72`	`72`	`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\""));`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`@@ -83,7 +83,7 @@ public void Can_serialize_NullableTimeSpan_field_with_StandardTimeSpanFormat()`
`83`	`83`
`84`	`84`	`var model = new NullableSampleModel { Id = 1, TimeSpan = period };`
`85`	`85`	`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\""));`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`@@ -94,7 +94,7 @@ public void Can_serialize_NullTimeSpan_field_with_StandardTimeSpanFormat()`
`94`	`94`	`{`
`95`	`95`	`var model = new NullableSampleModel { Id = 1 };`
`96`	`96`	`var json = JsonSerializer.SerializeToString(model);`
`97`		`- Assert.That(json, Is.Not.StringContaining("\"TimeSpan\""));`
	`97`	`+ Assert.That(json, Does.Not.Contain("\"TimeSpan\""));`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace ServiceStack.Text.Tests`
`11`	`11`	`public class DictionaryTests`
`12`	`12`	`: TestBase`
`13`	`13`	`{`
`14`		`- [TestFixtureSetUp]`
	`14`	`+ [OneTimeSetUp]`
`15`	`15`	`public void SetUp()`
`16`	`16`	`{`
`17`	`17`	`#if IOS`
Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,14 @@ namespace ServiceStack.Text.Tests`
`7`	`7`	`[TestFixture]`
`8`	`8`	`public class JsConfigTests`
`9`	`9`	`{`
`10`		`- [TestFixtureSetUp]`
	`10`	`+ [OneTimeSetUp]`
`11`	`11`	`public void TestFixtureSetUp()`
`12`	`12`	`{`
`13`	`13`	`JsConfig.EmitLowercaseUnderscoreNames = true;`
`14`	`14`	`JsConfig<Bar>.EmitLowercaseUnderscoreNames = false;`
`15`	`15`	`}`
`16`	`16`
`17`		`- [TestFixtureTearDown]`
	`17`	`+ [OneTimeTearDown]`
`18`	`18`	`public void TestFixtureTearDown()`
`19`	`19`	`{`
`20`	`20`	`JsConfig.Reset();`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public void Prefer_interfaces_should_work_on_top_level_object_using_extension_me`
`17`	`17`	`{`
`18`	`18`	`var json = new Concrete("boo", 1).ToJson();`
`19`	`19`
`20`		`- Assert.That(json, Is.StringContaining("\"ServiceStack.Text.Tests.JsonTests.IContract, ServiceStack.Text.Tests\""));`
	`20`	`+ Assert.That(json, Does.Contain("\"ServiceStack.Text.Tests.JsonTests.IContract, ServiceStack.Text.Tests\""));`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`@@ -30,7 +30,7 @@ public void Should_be_able_to_serialise_based_on_an_interface()`
`30`	`30`	`var json = JsonSerializer.SerializeToString(myConcrete, typeof(IContract));`
`31`	`31`
`32`	`32`	`Console.WriteLine(json);`
`33`		`- Assert.That(json, Is.StringContaining("\"ServiceStack.Text.Tests.JsonTests.IContract, ServiceStack.Text.Tests\""));`
	`33`	`+ Assert.That(json, Does.Contain("\"ServiceStack.Text.Tests.JsonTests.IContract, ServiceStack.Text.Tests\""));`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`@@ -43,7 +43,7 @@ public void Should_not_use_interface_type_if_concrete_specified()`
`43`	`43`	`var json = JsonSerializer.SerializeToString(myConcrete, typeof(IContract));`
`44`	`44`
`45`	`45`	`Console.WriteLine(json);`
`46`		`- Assert.That(json, Is.StringContaining("\"ServiceStack.Text.Tests.JsonTests.Concrete, ServiceStack.Text.Tests\""));`
	`46`	`+ Assert.That(json, Does.Contain("\"ServiceStack.Text.Tests.JsonTests.Concrete, ServiceStack.Text.Tests\""));`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`