Make tests compatible with NUnit 3.5

xplicit · xplicit · commit 94de4d942e23 · 2016-11-15T19:17:19.000+07:00
diff --git a/tests/ServiceStack.ServiceHost.Tests/Formats_Razor/PrecompiledRazorEngineTests.cs b/tests/ServiceStack.ServiceHost.Tests/Formats_Razor/PrecompiledRazorEngineTests.cs
@@ -54,14 +54,15 @@ public void Pages_with_errors_dont_cause_exceptions_on_thread_starting_the_preco
             Assert.That(page.CompileException, Is.Not.Null);
         }
 
-        [ExpectedException(typeof(HttpCompileException))]
         [Test]
         public void Pages_with_errors_still_throw_exceptions_when_rendering()
         {
             const string template = "This is a bad template, Hello @SomeInvalidMember.Name!";
-            RazorFormat.AddFileAndPage("/simple.cshtml", template);
 
-            RazorFormat.RenderToHtml("/simple.cshtml", new { Name = "World" });
+            Assert.Throws<HttpCompileException>(() => {
+                RazorFormat.AddFileAndPage("/simple.cshtml", template);
+                RazorFormat.RenderToHtml("/simple.cshtml", new { Name = "World" });
+            });
         }
     }
 
diff --git a/tests/ServiceStack.ServiceHost.Tests/RestPathTests.cs b/tests/ServiceStack.ServiceHost.Tests/RestPathTests.cs
@@ -275,11 +275,12 @@ private static void AssertNoMatch(string definitionPath, string requestPath)
         }
 
         [Test]
-        [ExpectedException(typeof(ArgumentException))]
         public void Cannot_have_variable_after_wildcard()
         {
-            AssertMatch("/content/{Slug*}/{Version}",
-                "/content/wildcard/slug/path/1", "*/content", new SlugRequest(), -1);
+            Assert.Throws<ArgumentException>(() => {
+                AssertMatch("/content/{Slug*}/{Version}",
+                    "/content/wildcard/slug/path/1", "*/content", new SlugRequest(), -1);
+            });
         }
 
         [Test]
diff --git a/tests/ServiceStack.ServiceHost.Tests/UseCase/CustomerUseCase.cs b/tests/ServiceStack.ServiceHost.Tests/UseCase/CustomerUseCase.cs
@@ -16,7 +16,7 @@
 
 namespace ServiceStack.ServiceHost.Tests.UseCase
 {
-    [Ignore]
+    [Ignore("Performance tests")]
     [TestFixture]
     public class CustomerUseCase
     {
diff --git a/tests/ServiceStack.ServiceModel.Tests/XlinqExtensionsTests.cs b/tests/ServiceStack.ServiceModel.Tests/XlinqExtensionsTests.cs
@@ -28,21 +28,21 @@ public void xelement_get_int_test()
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void xelement_get_int_null_throws_exception_test()
 		{
-			var el = CreateEmptyChildElement();
-			el.GetInt("child");
-			Assert.Fail("Expected ArgumentNullException");
+			Assert.Throws<ArgumentNullException>(() => {
+				var el = CreateEmptyChildElement();
+				el.GetInt("child");
+			});
 		}
 
 		[Test]
-		[ExpectedException(typeof(FormatException))]
 		public void xelement_get_int_text_throws_exception_test()
 		{
-			var el = CreateChildElement("Non int value");
-			el.GetInt("child");
-			Assert.Fail("Expected FormatException");
+			Assert.Throws<FormatException>(() => {
+				var el = CreateChildElement("Non int value");
+				el.GetInt("child");
+			});
 		}
 
 		[Test]

Original file line number	Diff line number	Diff line change
`@@ -54,14 +54,15 @@ public void Pages_with_errors_dont_cause_exceptions_on_thread_starting_the_preco`
`54`	`54`	`Assert.That(page.CompileException, Is.Not.Null);`
`55`	`55`	`}`
`56`	`56`
`57`		`- [ExpectedException(typeof(HttpCompileException))]`
`58`	`57`	`[Test]`
`59`	`58`	`public void Pages_with_errors_still_throw_exceptions_when_rendering()`
`60`	`59`	`{`
`61`	`60`	`const string template = "This is a bad template, Hello @SomeInvalidMember.Name!";`
`62`		`- RazorFormat.AddFileAndPage("/simple.cshtml", template);`
`63`	`61`
`64`		`- RazorFormat.RenderToHtml("/simple.cshtml", new { Name = "World" });`
	`62`	`+ Assert.Throws<HttpCompileException>(() => {`
	`63`	`+ RazorFormat.AddFileAndPage("/simple.cshtml", template);`
	`64`	`+ RazorFormat.RenderToHtml("/simple.cshtml", new { Name = "World" });`
	`65`	`+ });`
`65`	`66`	`}`
`66`	`67`	`}`
`67`	`68`
Original file line number	Diff line number	Diff line change
`@@ -275,11 +275,12 @@ private static void AssertNoMatch(string definitionPath, string requestPath)`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`[Test]`
`278`		`- [ExpectedException(typeof(ArgumentException))]`
`279`	`278`	`public void Cannot_have_variable_after_wildcard()`
`280`	`279`	`{`
`281`		`- AssertMatch("/content/{Slug*}/{Version}",`
`282`		`- "/content/wildcard/slug/path/1", "*/content", new SlugRequest(), -1);`
	`280`	`+ Assert.Throws<ArgumentException>(() => {`
	`281`	`+ AssertMatch("/content/{Slug*}/{Version}",`
	`282`	`+ "/content/wildcard/slug/path/1", "*/content", new SlugRequest(), -1);`
	`283`	`+ });`
`283`	`284`	`}`
`284`	`285`
`285`	`286`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`namespace ServiceStack.ServiceHost.Tests.UseCase`
`18`	`18`	`{`
`19`		`- [Ignore]`
	`19`	`+ [Ignore("Performance tests")]`
`20`	`20`	`[TestFixture]`
`21`	`21`	`public class CustomerUseCase`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,21 +28,21 @@ public void xelement_get_int_test()`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`[Test]`
`31`		`- [ExpectedException(typeof(ArgumentNullException))]`
`32`	`31`	`public void xelement_get_int_null_throws_exception_test()`
`33`	`32`	`{`
`34`		`- var el = CreateEmptyChildElement();`
`35`		`- el.GetInt("child");`
`36`		`- Assert.Fail("Expected ArgumentNullException");`
	`33`	`+ Assert.Throws<ArgumentNullException>(() => {`
	`34`	`+ var el = CreateEmptyChildElement();`
	`35`	`+ el.GetInt("child");`
	`36`	`+ });`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`[Test]`
`40`		`- [ExpectedException(typeof(FormatException))]`
`41`	`40`	`public void xelement_get_int_text_throws_exception_test()`
`42`	`41`	`{`
`43`		`- var el = CreateChildElement("Non int value");`
`44`		`- el.GetInt("child");`
`45`		`- Assert.Fail("Expected FormatException");`
	`42`	`+ Assert.Throws<FormatException>(() => {`
	`43`	`+ var el = CreateChildElement("Non int value");`
	`44`	`+ el.GetInt("child");`
	`45`	`+ });`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`[Test]`