From a0d67c99eb5be2ce6e83f9a8a46d52b61d9871dc Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 3 Oct 2018 14:29:38 -0700 Subject: Add WixRunnerResult to improve success assertion --- .../PreprocessorFixture.cs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs') diff --git a/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs b/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs index ebc713ed..f9a9fe83 100644 --- a/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs @@ -32,10 +32,11 @@ namespace WixToolsetTest.CoreIntegration "-bindpath", Path.Combine(folder, "data"), "-intermediateFolder", intermediateFolder, "-o", Path.Combine(baseFolder, @"bin\test.msi") - }, out var messages); - Assert.Equal(0, result); + }); - var warnings = messages.Where(message => message.Id == 1118); + result.AssertSuccess(); + + var warnings = result.Messages.Where(message => message.Id == 1118); Assert.Single(warnings); } } @@ -59,8 +60,9 @@ namespace WixToolsetTest.CoreIntegration "-bindpath", Path.Combine(folder, "data"), "-intermediateFolder", intermediateFolder, "-o", Path.Combine(baseFolder, @"bin\test.msi") - }, out var messages); - Assert.Equal(0, result); + }); + + result.AssertSuccess(); } } @@ -83,10 +85,10 @@ namespace WixToolsetTest.CoreIntegration "-bindpath", Path.Combine(folder, "data"), "-intermediateFolder", intermediateFolder, "-o", Path.Combine(baseFolder, @"bin\test.msi") - }, out var messages); + }); - Assert.Equal(147, result); - Assert.StartsWith("Found a ", messages.Single().ToString()); + Assert.Equal(147, result.ExitCode); + Assert.StartsWith("Found a ", result.Messages.Single().ToString()); } } } -- cgit v1.2.3-55-g6feb