diff --git a/AspNetCoreSdkTests/TemplateTests.cs b/AspNetCoreSdkTests/TemplateTests.cs index b12726b405..c83a519ef7 100644 --- a/AspNetCoreSdkTests/TemplateTests.cs +++ b/AspNetCoreSdkTests/TemplateTests.cs @@ -1,5 +1,6 @@ using AspNetCoreSdkTests.Templates; using NUnit.Framework; +using System; using System.Collections.Generic; using System.Linq; using System.Net; @@ -36,19 +37,51 @@ namespace AspNetCoreSdkTests [TestCaseSource(nameof(RunData))] public void Run(Template template) { - Assert.AreEqual(HttpStatusCode.OK, template.HttpResponseAfterRun.StatusCode); - Assert.AreEqual(HttpStatusCode.OK, template.HttpsResponseAfterRun.StatusCode); + var statusCode = template.HttpResponseAfterRun.StatusCode; + Assert.AreEqual(HttpStatusCode.OK, statusCode, + GetMessage(statusCode, template.ServerOutputAfterRun, template.ServerErrorAfterRun)); + + statusCode = template.HttpsResponseAfterRun.StatusCode; + Assert.AreEqual(HttpStatusCode.OK, statusCode, + GetMessage(statusCode, template.ServerOutputAfterRun, template.ServerErrorAfterRun)); + } + + [NonParallelizable] + [Test] + [TestCaseSource(nameof(RunNonParallelizableData))] + public void RunNonParallelizable(Template template) + { + Run(template); } [Test] [TestCaseSource(nameof(ExecData))] public void Exec(Template template) { - Assert.AreEqual(HttpStatusCode.OK, template.HttpResponseAfterExec.StatusCode); - Assert.AreEqual(HttpStatusCode.OK, template.HttpsResponseAfterExec.StatusCode); + var statusCode = template.HttpResponseAfterExec.StatusCode; + Assert.AreEqual(HttpStatusCode.OK, statusCode, + GetMessage(statusCode, template.ServerOutputAfterExec, template.ServerErrorAfterExec)); + + statusCode = template.HttpsResponseAfterExec.StatusCode; + Assert.AreEqual(HttpStatusCode.OK, statusCode, + GetMessage(statusCode, template.ServerOutputAfterExec, template.ServerErrorAfterExec)); } - private static IEnumerable