diff options
author | Rob Mensching <rob@firegiant.com> | 2018-10-03 14:29:38 -0700 |
---|---|---|
committer | Rob Mensching <rob@robmensching.com> | 2018-10-03 14:41:49 -0700 |
commit | a0d67c99eb5be2ce6e83f9a8a46d52b61d9871dc (patch) | |
tree | adcb4a87903e66eb390d066a0315d309d4da3b58 /src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs | |
parent | 60587a146d228956ec2c750ebe7b3a76a21f8f26 (diff) | |
download | wix-a0d67c99eb5be2ce6e83f9a8a46d52b61d9871dc.tar.gz wix-a0d67c99eb5be2ce6e83f9a8a46d52b61d9871dc.tar.bz2 wix-a0d67c99eb5be2ce6e83f9a8a46d52b61d9871dc.zip |
Add WixRunnerResult to improve success assertion
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs')
-rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs index e96c2ddd..8e4bcd54 100644 --- a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs | |||
@@ -7,7 +7,6 @@ namespace WixToolsetTest.CoreIntegration | |||
7 | using System.Linq; | 7 | using System.Linq; |
8 | using Example.Extension; | 8 | using Example.Extension; |
9 | using WixBuildTools.TestSupport; | 9 | using WixBuildTools.TestSupport; |
10 | using WixToolset.Core; | ||
11 | using WixToolset.Core.TestPackage; | 10 | using WixToolset.Core.TestPackage; |
12 | using WixToolset.Data; | 11 | using WixToolset.Data; |
13 | using WixToolset.Data.Tuples; | 12 | using WixToolset.Data.Tuples; |
@@ -48,9 +47,9 @@ namespace WixToolsetTest.CoreIntegration | |||
48 | "-bindpath", Path.Combine(folder, "data"), | 47 | "-bindpath", Path.Combine(folder, "data"), |
49 | "-intermediateFolder", intermediateFolder, | 48 | "-intermediateFolder", intermediateFolder, |
50 | "-o", Path.Combine(intermediateFolder, @"bin\extest.msi") | 49 | "-o", Path.Combine(intermediateFolder, @"bin\extest.msi") |
51 | }, out var messages); | 50 | }); |
52 | 51 | ||
53 | Assert.Equal(0, result); | 52 | result.AssertSuccess(); |
54 | 53 | ||
55 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\extest.msi"))); | 54 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\extest.msi"))); |
56 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\extest.wixpdb"))); | 55 | Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\extest.wixpdb"))); |
@@ -91,9 +90,9 @@ namespace WixToolsetTest.CoreIntegration | |||
91 | "-intermediateFolder", intermediateFolder, | 90 | "-intermediateFolder", intermediateFolder, |
92 | "-example", "test", | 91 | "-example", "test", |
93 | "-o", Path.Combine(intermediateFolder, @"bin\extest.msi") | 92 | "-o", Path.Combine(intermediateFolder, @"bin\extest.msi") |
94 | }, out var messages); | 93 | }); |
95 | 94 | ||
96 | Assert.Equal(0, result); | 95 | result.AssertSuccess(); |
97 | 96 | ||
98 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"extest.wir")); | 97 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"extest.wir")); |
99 | var section = intermediate.Sections.Single(); | 98 | var section = intermediate.Sections.Single(); |
@@ -106,8 +105,8 @@ namespace WixToolsetTest.CoreIntegration | |||
106 | 105 | ||
107 | private static void Build(string[] args) | 106 | private static void Build(string[] args) |
108 | { | 107 | { |
109 | var result = WixRunner.Execute(args, out var messages); | 108 | var result = WixRunner.Execute(args) |
110 | Assert.Equal(0, result); | 109 | .AssertSuccess(); |
111 | } | 110 | } |
112 | } | 111 | } |
113 | } | 112 | } |