diff options
author | Rob Mensching <rob@firegiant.com> | 2022-10-04 14:51:02 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2022-10-04 15:40:26 -0700 |
commit | 3c11c1389f67824fb1f368cedacbaf566645e56f (patch) | |
tree | 923711f290b6c22a7f8d10dc09b053c675d1861c | |
parent | bec7063ae6bef19c4deb62afab7c529e739bbfa9 (diff) | |
download | wix-3c11c1389f67824fb1f368cedacbaf566645e56f.tar.gz wix-3c11c1389f67824fb1f368cedacbaf566645e56f.tar.bz2 wix-3c11c1389f67824fb1f368cedacbaf566645e56f.zip |
Attempt ordinal sort to fix CI test failure
-rw-r--r-- | src/wix/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs index 93f160f1..4a25d5e7 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs | |||
@@ -243,8 +243,7 @@ namespace WixToolsetTest.CoreIntegration | |||
243 | "-o", Path.Combine(baseFolder, @"bin\test.exe") | 243 | "-o", Path.Combine(baseFolder, @"bin\test.exe") |
244 | }); | 244 | }); |
245 | 245 | ||
246 | var warningMessages = result.Messages.Where(m => m.Level == MessageLevel.Warning).Select(m => m.ToString()).ToList(); | 246 | var warningMessages = result.Messages.Where(m => m.Level == MessageLevel.Warning).Select(m => m.ToString()).OrderBy(s => s, StringComparer.Ordinal).ToArray(); |
247 | warningMessages.Sort(); | ||
248 | 247 | ||
249 | WixAssert.CompareLineByLine(new[] | 248 | WixAssert.CompareLineByLine(new[] |
250 | { | 249 | { |
@@ -253,10 +252,9 @@ namespace WixToolsetTest.CoreIntegration | |||
253 | "ExePackage/@DetectCondition contains the built-in Variable 'WixBundleAction', which is not available when it is evaluated. (Unavailable Variables are: 'WixBundleAction'.). Rewrite the condition to avoid Variables that are never valid during its evaluation.", | 252 | "ExePackage/@DetectCondition contains the built-in Variable 'WixBundleAction', which is not available when it is evaluated. (Unavailable Variables are: 'WixBundleAction'.). Rewrite the condition to avoid Variables that are never valid during its evaluation.", |
254 | "The *Search/@Variable attribute's value begins with the reserved prefix 'Wix'. Some prefixes are reserved by the WiX toolset for well-known values. Change your attribute's value to not begin with the same prefix.", | 253 | "The *Search/@Variable attribute's value begins with the reserved prefix 'Wix'. Some prefixes are reserved by the WiX toolset for well-known values. Change your attribute's value to not begin with the same prefix.", |
255 | "The *Search/@Variable attribute's value references the well-known log Variable 'WixBundleLog' to change its value. This variable is set by the engine and is intended to be read-only. Change your attribute's value to reference a custom variable.", | 254 | "The *Search/@Variable attribute's value references the well-known log Variable 'WixBundleLog' to change its value. This variable is set by the engine and is intended to be read-only. Change your attribute's value to reference a custom variable.", |
256 | }, warningMessages.ToArray()); | 255 | }, warningMessages); |
257 | 256 | ||
258 | var errorMessages = result.Messages.Where(m => m.Level == MessageLevel.Error).Select(m => m.ToString()).ToList(); | 257 | var errorMessages = result.Messages.Where(m => m.Level == MessageLevel.Error).Select(m => m.ToString()).OrderBy(s => s, StringComparer.Ordinal).ToArray(); |
259 | errorMessages.Sort(); | ||
260 | 258 | ||
261 | WixAssert.CompareLineByLine(new[] | 259 | WixAssert.CompareLineByLine(new[] |
262 | { | 260 | { |
@@ -264,7 +262,7 @@ namespace WixToolsetTest.CoreIntegration | |||
264 | "The CommandLine/@Condition attribute's value '=' is not a valid bundle condition.", | 262 | "The CommandLine/@Condition attribute's value '=' is not a valid bundle condition.", |
265 | "The MsiPackage/@InstallCondition attribute's value '=' is not a valid bundle condition.", | 263 | "The MsiPackage/@InstallCondition attribute's value '=' is not a valid bundle condition.", |
266 | "The MsiProperty/@Condition attribute's value '=' is not a valid bundle condition.", | 264 | "The MsiProperty/@Condition attribute's value '=' is not a valid bundle condition.", |
267 | }, errorMessages.ToArray()); | 265 | }, errorMessages); |
268 | 266 | ||
269 | Assert.Equal(409, result.ExitCode); | 267 | Assert.Equal(409, result.ExitCode); |
270 | } | 268 | } |