From 09501680d4fcef277b33200c702ce409e9f9c1ef Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 15 Jun 2022 17:07:46 -0500 Subject: Use WixAssert in more places. --- .../WindowsInstallerTableDefinitionsFixture.cs | 3 +- .../test/WixToolsetTest.Bal/BalExtensionFixture.cs | 26 ++-- .../ExtractBAContainerResult.cs | 34 +++++ .../XmlNodeExtensions.cs | 14 ++ .../WixBuildTaskFixture.cs | 4 +- .../ConvertSymbolsFixture.cs | 6 +- .../BaseConverterFixture.cs | 1 - .../WixToolsetTest.Converters/ConverterFixture.cs | 151 +++++++++++++-------- .../ConverterIntegrationFixture.cs | 10 +- .../CustomActionFixture.cs | 23 ++-- .../CustomTableFixture.cs | 60 ++++---- .../WixToolsetTest.Converters/PropertyFixture.cs | 31 +++-- .../WixToolsetTest.Core.Native/CabinetFixture.cs | 4 +- .../CertificateHashesFixture.cs | 15 +- .../WixToolsetTest.Core.Native.csproj | 4 + .../WixToolsetTest.Core/ParserHelperFixture.cs | 13 +- .../BindVariablesFixture.cs | 10 +- .../BundleFixture.cs | 82 ++++++----- .../BundleManifestFixture.cs | 146 ++++++++++++-------- .../BundlePackageFixture.cs | 91 ++++--------- .../WixToolsetTest.CoreIntegration/CabFixture.cs | 4 +- .../ContainerFixture.cs | 69 ++++------ .../CopyFileFixture.cs | 4 +- .../CustomActionFixture.cs | 4 +- .../DependencyExtensionFixture.cs | 23 +--- .../ExePackageFixture.cs | 20 +-- .../ExtensionFixture.cs | 16 +-- .../LinkerFixture.cs | 6 +- .../ModuleFixture.cs | 5 - .../WixToolsetTest.CoreIntegration/MsiFixture.cs | 46 +++---- .../MsiTransactionFixture.cs | 10 +- .../PackagePayloadFixture.cs | 33 ++--- .../WixToolsetTest.CoreIntegration/PatchFixture.cs | 22 ++- .../PayloadFixture.cs | 23 ++-- .../PreprocessorFixture.cs | 6 +- .../RegistryFixture.cs | 3 - .../RollbackBoundaryFixture.cs | 14 +- .../SoftwareTagFixture.cs | 4 +- .../TestXmlFixture.cs | 11 +- .../TransformFixture.cs | 4 +- .../UpgradeFixture.cs | 9 +- .../VariableResolverFixture.cs | 19 +-- .../VersionFixture.cs | 13 +- .../WixiplFixture.cs | 16 +-- .../WixlibFixture.cs | 24 ++-- src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs | 2 +- .../test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs | 6 +- 47 files changed, 605 insertions(+), 539 deletions(-) (limited to 'src') diff --git a/src/api/wix/test/WixToolsetTest.Data/WindowsInstallerTableDefinitionsFixture.cs b/src/api/wix/test/WixToolsetTest.Data/WindowsInstallerTableDefinitionsFixture.cs index 5621a756..efb777ee 100644 --- a/src/api/wix/test/WixToolsetTest.Data/WindowsInstallerTableDefinitionsFixture.cs +++ b/src/api/wix/test/WixToolsetTest.Data/WindowsInstallerTableDefinitionsFixture.cs @@ -2,6 +2,7 @@ namespace WixToolsetTest.Data { + using WixBuildTools.TestSupport; using WixToolset.Data.WindowsInstaller; using Xunit; @@ -21,7 +22,7 @@ namespace WixToolsetTest.Data Assert.Equal(expectedRowType, rowFromTableDefinition.GetType()); if (typeof(Row) != expectedRowType) { - Assert.Equal(expectedRowTypeName, expectedRowType.Name); + WixAssert.StringEqual(expectedRowTypeName, expectedRowType.Name); } } } diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs index 43484855..d8197467 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ b/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs @@ -41,9 +41,11 @@ namespace WixToolsetTest.Bal var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var balPackageInfos = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); - var balPackageInfo = (XmlNode)Assert.Single(balPackageInfos); - Assert.Equal("", balPackageInfo.GetTestXml()); + var balPackageInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); + WixAssert.CompareLineByLine(new string[] + { + "", + }, balPackageInfos); Assert.True(File.Exists(Path.Combine(baFolderPath, "thm.wxl"))); } @@ -76,9 +78,11 @@ namespace WixToolsetTest.Bal var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var balOverridableVariables = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixStdbaOverridableVariable"); - var balOverridableVariable = (XmlNode)Assert.Single(balOverridableVariables); - Assert.Equal("", balOverridableVariable.GetTestXml()); + var balOverridableVariables = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixStdbaOverridableVariable"); + WixAssert.CompareLineByLine(new[] + { + "", + }, balOverridableVariables); } } @@ -134,9 +138,11 @@ namespace WixToolsetTest.Bal var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var wixMbaPrereqOptionsElements = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixMbaPrereqOptions"); - var wixMbaPrereqOptions = (XmlNode)Assert.Single(wixMbaPrereqOptionsElements); - Assert.Equal("", wixMbaPrereqOptions.GetTestXml()); + var wixMbaPrereqOptionsElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixMbaPrereqOptions"); + WixAssert.CompareLineByLine(new[] + { + "", + }, wixMbaPrereqOptionsElements); } } @@ -159,7 +165,7 @@ namespace WixToolsetTest.Bal "-o", bundleFile, }); Assert.Equal(6802, compileResult.ExitCode); - Assert.Equal("There must be at least one PrereqPackage when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups.", compileResult.Messages[0].ToString()); + WixAssert.StringEqual("There must be at least one PrereqPackage when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups.", compileResult.Messages[0].ToString()); Assert.False(File.Exists(bundleFile)); Assert.False(File.Exists(Path.Combine(intermediateFolder, "test.exe"))); diff --git a/src/wix/WixToolset.Core.TestPackage/ExtractBAContainerResult.cs b/src/wix/WixToolset.Core.TestPackage/ExtractBAContainerResult.cs index 65528fe0..5f4a5369 100644 --- a/src/wix/WixToolset.Core.TestPackage/ExtractBAContainerResult.cs +++ b/src/wix/WixToolset.Core.TestPackage/ExtractBAContainerResult.cs @@ -2,6 +2,7 @@ namespace WixToolset.Core.TestPackage { + using System.Collections.Generic; using System.IO; using System.Xml; using Xunit; @@ -99,6 +100,17 @@ namespace WixToolset.Core.TestPackage return this.BADataDocument.SelectNodes(xpath, this.BADataNamespaceManager); } + /// + /// + /// + /// elements must have the 'ba' prefix + /// Attributes for which the value should be set to '*'. + /// + public string[] GetBADataTestXmlLines(string xpath, Dictionary> ignoredAttributesByElementName = null) + { + return this.SelectBADataNodes(xpath).GetTestXmlLines(ignoredAttributesByElementName); + } + /// /// /// @@ -109,6 +121,17 @@ namespace WixToolset.Core.TestPackage return this.BundleExtensionDataDocument.SelectNodes(xpath, this.BundleExtensionDataNamespaceManager); } + /// + /// + /// + /// elements must have the 'be' prefix + /// Attributes for which the value should be set to '*'. + /// + public string[] GetBundleExtensionTestXmlLines(string xpath, Dictionary> ignoredAttributesByElementName = null) + { + return this.SelectBundleExtensionDataNodes(xpath).GetTestXmlLines(ignoredAttributesByElementName); + } + /// /// /// @@ -118,5 +141,16 @@ namespace WixToolset.Core.TestPackage { return this.ManifestDocument.SelectNodes(xpath, this.ManifestNamespaceManager); } + + /// + /// + /// + /// elements must have the 'burn' prefix + /// Attributes for which the value should be set to '*'. + /// + public string[] GetManifestTestXmlLines(string xpath, Dictionary> ignoredAttributesByElementName = null) + { + return this.SelectManifestNodes(xpath).GetTestXmlLines(ignoredAttributesByElementName); + } } } diff --git a/src/wix/WixToolset.Core.TestPackage/XmlNodeExtensions.cs b/src/wix/WixToolset.Core.TestPackage/XmlNodeExtensions.cs index b269fb25..2f4c1aa3 100644 --- a/src/wix/WixToolset.Core.TestPackage/XmlNodeExtensions.cs +++ b/src/wix/WixToolset.Core.TestPackage/XmlNodeExtensions.cs @@ -4,6 +4,7 @@ namespace WixToolset.Core.TestPackage { using System.Collections.Generic; using System.IO; + using System.Linq; using System.Text.RegularExpressions; using System.Xml; @@ -61,6 +62,19 @@ namespace WixToolset.Core.TestPackage return Regex.Replace(formattedXml, " xmlns(:[^=]+)?='[^']*'", ""); } + /// + /// Returns the XML for each node using single quotes and stripping all namespaces. + /// + /// + /// Attributes for which the value should be set to '*'. + /// + public static string[] GetTestXmlLines(this XmlNodeList nodeList, Dictionary> ignoredAttributesByElementName = null) + { + return nodeList.Cast() + .Select(x => x.GetTestXml(ignoredAttributesByElementName)) + .ToArray(); + } + private static void HandleIgnoredAttributes(XmlNode node, Dictionary> ignoredAttributesByElementName) { if (node.Attributes != null && ignoredAttributesByElementName.TryGetValue(node.LocalName, out var ignoredAttributes)) diff --git a/src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs b/src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs index 9d132f66..f158e3f2 100644 --- a/src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs +++ b/src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs @@ -59,8 +59,8 @@ namespace WixToolsetTest.BuildTasks var section = intermediate.Sections.Single(); var fileSymbol = section.Symbols.OfType().Single(); - Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); - Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); + WixAssert.StringEqual(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + WixAssert.StringEqual(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); } } } diff --git a/src/wix/test/WixToolsetTest.Converters.Symbolizer/ConvertSymbolsFixture.cs b/src/wix/test/WixToolsetTest.Converters.Symbolizer/ConvertSymbolsFixture.cs index 01213524..9fb47a9a 100644 --- a/src/wix/test/WixToolsetTest.Converters.Symbolizer/ConvertSymbolsFixture.cs +++ b/src/wix/test/WixToolsetTest.Converters.Symbolizer/ConvertSymbolsFixture.cs @@ -63,8 +63,8 @@ namespace WixToolsetTest.Converters.Symbolizer .OrderBy(s => s) .ToArray(); -#if false - Assert.Equal(wix3Dump, wix4Dump); +#if true + WixAssert.CompareLineByLine(wix3Dump, wix4Dump); #else // useful when you want to diff the outputs with another diff tool. var wix3TextDump = String.Join(Environment.NewLine, wix3Dump); var wix4TextDump = String.Join(Environment.NewLine, wix4Dump); @@ -75,7 +75,7 @@ namespace WixToolsetTest.Converters.Symbolizer File.WriteAllText(path3, wix3TextDump); File.WriteAllText(path4, wix4TextDump); - Assert.Equal(wix3TextDump, wix4TextDump); + WixAssert.StringEqual(wix3TextDump, wix4TextDump); #endif } } diff --git a/src/wix/test/WixToolsetTest.Converters/BaseConverterFixture.cs b/src/wix/test/WixToolsetTest.Converters/BaseConverterFixture.cs index 2421d73b..c6176973 100644 --- a/src/wix/test/WixToolsetTest.Converters/BaseConverterFixture.cs +++ b/src/wix/test/WixToolsetTest.Converters/BaseConverterFixture.cs @@ -7,7 +7,6 @@ namespace WixToolsetTest.Converters using System.Text; using System.Xml; using System.Xml.Linq; - using Xunit; public abstract class BaseConverterFixture { diff --git a/src/wix/test/WixToolsetTest.Converters/ConverterFixture.cs b/src/wix/test/WixToolsetTest.Converters/ConverterFixture.cs index 13df9da7..d186931b 100644 --- a/src/wix/test/WixToolsetTest.Converters/ConverterFixture.cs +++ b/src/wix/test/WixToolsetTest.Converters/ConverterFixture.cs @@ -4,6 +4,7 @@ namespace WixToolsetTest.Converters { using System; using System.Xml.Linq; + using WixBuildTools.TestSupport; using WixToolset.Converters; using WixToolsetTest.Converters.Mocks; using Xunit; @@ -21,10 +22,12 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -33,10 +36,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(1, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); } [Fact] @@ -48,11 +51,13 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", "", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -61,10 +66,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document, omitXmlDeclaration: false); + var actual = UnformattedDocumentLines(document, omitXmlDeclaration: false); Assert.Equal(0, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); } [Fact] @@ -76,10 +81,12 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -88,11 +95,11 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(2, errors); //Assert.Equal(Wix4Namespace, document.Root.GetDefaultNamespace()); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); } [Fact] @@ -104,10 +111,12 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -116,10 +125,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(2, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); Assert.Equal(Wix4Namespace, document.Root.GetNamespaceOfPrefix("w")); } @@ -134,12 +143,14 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", " ", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -148,9 +159,9 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); Assert.Equal(3, errors); Assert.Equal(Wix4Namespace, document.Root.GetNamespaceOfPrefix("w")); Assert.Equal("http://wixtoolset.org/schemas/v4/wxs/util", document.Root.GetDefaultNamespace()); @@ -165,10 +176,12 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -177,10 +190,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(4, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); Assert.Equal(Wix4Namespace, document.Root.GetDefaultNamespace()); } @@ -193,10 +206,12 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -205,10 +220,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(2, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); Assert.Equal(Wix4Namespace, document.Root.GetDefaultNamespace()); } @@ -226,7 +241,8 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", " ", @@ -234,7 +250,8 @@ namespace WixToolsetTest.Converters " ", " ", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -243,10 +260,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(2, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); Assert.Equal(Wix4Namespace, document.Root.GetDefaultNamespace()); } @@ -259,10 +276,12 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -271,10 +290,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(3, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); } [Fact] @@ -286,10 +305,12 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -298,10 +319,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(2, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); } [Fact] @@ -312,10 +333,12 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -324,10 +347,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(1, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); } [Fact] @@ -338,10 +361,12 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -350,10 +375,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(1, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); } [Fact] @@ -364,10 +389,12 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -376,10 +403,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(1, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); } [Fact] @@ -390,10 +417,12 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -402,10 +431,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(2, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); } [Fact] @@ -422,7 +451,8 @@ namespace WixToolsetTest.Converters "", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", "", "", @@ -431,7 +461,8 @@ namespace WixToolsetTest.Converters "", "", "", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -440,10 +471,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(3, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); } } } diff --git a/src/wix/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs b/src/wix/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs index a39f6243..a8908df7 100644 --- a/src/wix/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs +++ b/src/wix/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs @@ -35,7 +35,7 @@ namespace WixToolsetTest.Converters var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n"); - Assert.Equal(expected, actual); + WixAssert.StringEqual(expected, actual); EnsureFixed(targetFile); } @@ -62,7 +62,7 @@ namespace WixToolsetTest.Converters var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n"); - Assert.Equal(expected, actual); + WixAssert.StringEqual(expected, actual); EnsureFixed(targetFile); } @@ -111,7 +111,7 @@ namespace WixToolsetTest.Converters var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n"); - Assert.Equal(expected, actual); + WixAssert.StringEqual(expected, actual); EnsureFixed(targetFile); } @@ -135,7 +135,7 @@ namespace WixToolsetTest.Converters var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n"); - Assert.Equal(expected, actual); + WixAssert.StringEqual(expected, actual); EnsureFixed(targetFile); } @@ -161,7 +161,7 @@ namespace WixToolsetTest.Converters var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n"); - Assert.Equal(expected, actual); + WixAssert.StringEqual(expected, actual); // still fails because QtExecCmdTimeoutAmbiguous is unfixable var result2 = RunConversion(targetFile); diff --git a/src/wix/test/WixToolsetTest.Converters/CustomActionFixture.cs b/src/wix/test/WixToolsetTest.Converters/CustomActionFixture.cs index eafc171a..7389bc35 100644 --- a/src/wix/test/WixToolsetTest.Converters/CustomActionFixture.cs +++ b/src/wix/test/WixToolsetTest.Converters/CustomActionFixture.cs @@ -5,6 +5,7 @@ namespace WixToolsetTest.Converters using System; using System.IO; using System.Xml.Linq; + using WixBuildTools.TestSupport; using WixToolset.Converters; using WixToolsetTest.Converters.Mocks; using Xunit; @@ -23,13 +24,15 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", " ", " ", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -38,10 +41,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(11, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); } [Fact] @@ -58,10 +61,12 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", - ""); + "", + }; var expectedScript = String.Join("\n", "function() {", @@ -76,13 +81,13 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(2, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); var script = File.ReadAllText("Foo.js"); - Assert.Equal(expectedScript, script); + WixAssert.StringEqual(expectedScript, script); } } } diff --git a/src/wix/test/WixToolsetTest.Converters/CustomTableFixture.cs b/src/wix/test/WixToolsetTest.Converters/CustomTableFixture.cs index 2b81a863..6dd3da97 100644 --- a/src/wix/test/WixToolsetTest.Converters/CustomTableFixture.cs +++ b/src/wix/test/WixToolsetTest.Converters/CustomTableFixture.cs @@ -181,7 +181,8 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", " ", @@ -189,7 +190,8 @@ namespace WixToolsetTest.Converters " ", " ", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -198,10 +200,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(2, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); } [Fact] @@ -216,14 +218,16 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", " ", " ", " ", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -232,10 +236,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(2, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); } [Fact] @@ -251,7 +255,8 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", " ", @@ -259,7 +264,8 @@ namespace WixToolsetTest.Converters " ", " ", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -268,10 +274,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(2, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); } [Fact] @@ -286,14 +292,16 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", " ", " ", " ", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -302,10 +310,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(2, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); } [Fact] @@ -316,10 +324,12 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -328,10 +338,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(1, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); } [Fact] @@ -342,10 +352,12 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -354,10 +366,10 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); Assert.Equal(1, errors); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); } } } diff --git a/src/wix/test/WixToolsetTest.Converters/PropertyFixture.cs b/src/wix/test/WixToolsetTest.Converters/PropertyFixture.cs index e50a6518..e9ace163 100644 --- a/src/wix/test/WixToolsetTest.Converters/PropertyFixture.cs +++ b/src/wix/test/WixToolsetTest.Converters/PropertyFixture.cs @@ -4,6 +4,7 @@ namespace WixToolsetTest.Converters { using System; using System.Xml.Linq; + using WixBuildTools.TestSupport; using WixToolset.Converters; using WixToolsetTest.Converters.Mocks; using Xunit; @@ -22,12 +23,14 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", " ", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -36,9 +39,9 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); Assert.Equal(1, errors); } @@ -56,12 +59,14 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", " ", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -70,9 +75,9 @@ namespace WixToolsetTest.Converters var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); Assert.Equal(1, errors); } @@ -86,12 +91,14 @@ namespace WixToolsetTest.Converters " ", ""); - var expected = String.Join(Environment.NewLine, + var expected = new[] + { "", " ", " ", " ", - ""); + "", + }; var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -99,9 +106,9 @@ namespace WixToolsetTest.Converters var converter = new WixConverter(messaging, 2, null, null); var errors = converter.ConvertDocument(document); - var actual = UnformattedDocumentString(document); + var actual = UnformattedDocumentLines(document); - Assert.Equal(expected, actual); + WixAssert.CompareLineByLine(expected, actual); Assert.Equal(1, errors); } } diff --git a/src/wix/test/WixToolsetTest.Core.Native/CabinetFixture.cs b/src/wix/test/WixToolsetTest.Core.Native/CabinetFixture.cs index 2e43dce4..0d5d777d 100644 --- a/src/wix/test/WixToolsetTest.Core.Native/CabinetFixture.cs +++ b/src/wix/test/WixToolsetTest.Core.Native/CabinetFixture.cs @@ -5,8 +5,8 @@ namespace WixToolsetTest.CoreNative using System.IO; using System.Linq; using WixToolset.Core.Native; - using WixToolsetTest.CoreNative.Utility; using WixToolset.Data; + using WixToolsetTest.CoreNative.Utility; using Xunit; public class CabinetFixture @@ -85,7 +85,7 @@ namespace WixToolsetTest.CoreNative var cabFileInfo = enumerated[i]; var fileInfo = new FileInfo(files[i]); - Assert.Equal(cabFileInfo.FileId, fileInfo.Name); + WixBuildTools.TestSupport.WixAssert.StringEqual(cabFileInfo.FileId, fileInfo.Name); Assert.Equal(cabFileInfo.Size, fileInfo.Length); Assert.True(cabFileInfo.SameAsDateTime(fileInfo.CreationTime)); } diff --git a/src/wix/test/WixToolsetTest.Core.Native/CertificateHashesFixture.cs b/src/wix/test/WixToolsetTest.Core.Native/CertificateHashesFixture.cs index 5783445b..beb5224c 100644 --- a/src/wix/test/WixToolsetTest.Core.Native/CertificateHashesFixture.cs +++ b/src/wix/test/WixToolsetTest.Core.Native/CertificateHashesFixture.cs @@ -2,7 +2,6 @@ namespace WixToolsetTest.CoreNative { - using System.ComponentModel; using System.Linq; using WixToolset.Core.Native; using WixToolsetTest.CoreNative.Utility; @@ -18,9 +17,9 @@ namespace WixToolsetTest.CoreNative var hashes = CertificateHashes.Read(new[] { cabFile }); var hash = hashes.Single(); - Assert.Equal(cabFile, hash.Path); - Assert.Equal("7EC90B3FC3D580EB571210011F1095E149DCC6BB", hash.PublicKey); - Assert.Equal("0B13494DB50BC185A34389BBBAA01EDD1CF56350", hash.Thumbprint); + WixBuildTools.TestSupport.WixAssert.StringEqual(cabFile, hash.Path); + WixBuildTools.TestSupport.WixAssert.StringEqual("7EC90B3FC3D580EB571210011F1095E149DCC6BB", hash.PublicKey); + WixBuildTools.TestSupport.WixAssert.StringEqual("0B13494DB50BC185A34389BBBAA01EDD1CF56350", hash.Thumbprint); Assert.Null(hash.Exception); } @@ -32,7 +31,7 @@ namespace WixToolsetTest.CoreNative var hashes = CertificateHashes.Read(new[] { txtFile }); var hash = hashes.Single(); - Assert.Equal(txtFile, hash.Path); + WixBuildTools.TestSupport.WixAssert.StringEqual(txtFile, hash.Path); Assert.Null(hash.Exception); } @@ -44,9 +43,9 @@ namespace WixToolsetTest.CoreNative var hashes = CertificateHashes.Read(new[] { cabFile, txtFile }); - Assert.Equal(cabFile, hashes[0].Path); - Assert.Equal("7EC90B3FC3D580EB571210011F1095E149DCC6BB", hashes[0].PublicKey); - Assert.Equal("0B13494DB50BC185A34389BBBAA01EDD1CF56350", hashes[0].Thumbprint); + WixBuildTools.TestSupport.WixAssert.StringEqual(cabFile, hashes[0].Path); + WixBuildTools.TestSupport.WixAssert.StringEqual("7EC90B3FC3D580EB571210011F1095E149DCC6BB", hashes[0].PublicKey); + WixBuildTools.TestSupport.WixAssert.StringEqual("0B13494DB50BC185A34389BBBAA01EDD1CF56350", hashes[0].Thumbprint); Assert.Null(hashes[0].Exception); Assert.Equal(txtFile, hashes[1].Path); diff --git a/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj b/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj index 66273be7..e3ad52df 100644 --- a/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj +++ b/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj @@ -18,6 +18,10 @@ + + + + diff --git a/src/wix/test/WixToolsetTest.Core/ParserHelperFixture.cs b/src/wix/test/WixToolsetTest.Core/ParserHelperFixture.cs index 95433ab3..336e6e21 100644 --- a/src/wix/test/WixToolsetTest.Core/ParserHelperFixture.cs +++ b/src/wix/test/WixToolsetTest.Core/ParserHelperFixture.cs @@ -4,6 +4,7 @@ namespace WixToolsetTest.Core { using System; using System.Xml.Linq; + using WixBuildTools.TestSupport; using WixToolset.Core; using WixToolset.Data; using WixToolset.Extensibility.Services; @@ -19,7 +20,7 @@ namespace WixToolsetTest.Core var attribute = CreateAttribute("1.2.3.4"); var result = helper.GetAttributeVersionValue(null, attribute); - Assert.Equal("1.2.3.4", result); + WixAssert.StringEqual("1.2.3.4", result); } [Fact] @@ -29,7 +30,7 @@ namespace WixToolsetTest.Core var attribute = CreateAttribute("1.2.3.4.5"); var exception = Assert.Throws(() => { helper.GetAttributeVersionValue(null, attribute); }); - Assert.Equal("The Test/@Value attribute's value, '1.2.3.4.5', is not a valid version. Specify a four-part version or semantic version, such as '#.#.#.#' or '#.#.#-label.#'.", exception.Message); + WixAssert.StringEqual("The Test/@Value attribute's value, '1.2.3.4.5', is not a valid version. Specify a four-part version or semantic version, such as '#.#.#.#' or '#.#.#-label.#'.", exception.Message); } [Fact] @@ -44,7 +45,7 @@ namespace WixToolsetTest.Core var helper = GetParserHelper(); var attribute = CreateAttribute(version); var exception = Assert.Throws(() => { helper.GetAttributeVersionValue(null, attribute); }); - Assert.Equal($"The Test/@Value attribute's value, '{version}', is not a valid version. Specify a four-part version or semantic version, such as '#.#.#.#' or '#.#.#-label.#'.", exception.Message); + WixAssert.StringEqual($"The Test/@Value attribute's value, '{version}', is not a valid version. Specify a four-part version or semantic version, such as '#.#.#.#' or '#.#.#-label.#'.", exception.Message); } [Fact] @@ -55,7 +56,7 @@ namespace WixToolsetTest.Core var attribute = CreateAttribute("10.99.444-preview.0"); var result = helper.GetAttributeVersionValue(null, attribute); - Assert.Equal("10.99.444-preview.0", result); + WixAssert.StringEqual("10.99.444-preview.0", result); } [Fact] @@ -66,7 +67,7 @@ namespace WixToolsetTest.Core var attribute = CreateAttribute("1.2.3.4-meta.123-other.456"); var result = helper.GetAttributeVersionValue(null, attribute); - Assert.Equal("1.2.3.4-meta.123-other.456", result); + WixAssert.StringEqual("1.2.3.4-meta.123-other.456", result); } [Fact] @@ -77,7 +78,7 @@ namespace WixToolsetTest.Core var attribute = CreateAttribute("v1.2.3.4"); var result = helper.GetAttributeVersionValue(null, attribute); - Assert.Equal("1.2.3.4", result); + WixAssert.StringEqual("1.2.3.4", result); } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BindVariablesFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BindVariablesFixture.cs index 820f1707..e7752a2a 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BindVariablesFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BindVariablesFixture.cs @@ -64,11 +64,11 @@ namespace WixToolsetTest.CoreIntegration result.AssertSuccess(); var queryResults = Query.QueryDatabase(msiPath, new[] { "Property" }).ToDictionary(s => s.Split('\t')[0]); - Assert.Equal("Property:ProductVersion\t3.14.1703.0", queryResults["Property:ProductVersion"]); - Assert.Equal("Property:TestPackageManufacturer\tExample Corporation", queryResults["Property:TestPackageManufacturer"]); - Assert.Equal("Property:TestPackageName\tPacakgeWithBindVariables", queryResults["Property:TestPackageName"]); - Assert.Equal("Property:TestPackageVersion\t3.14.1703.0", queryResults["Property:TestPackageVersion"]); - Assert.Equal("Property:TestTextVersion\tv", queryResults["Property:TestTextVersion"]); + WixAssert.StringEqual("Property:ProductVersion\t3.14.1703.0", queryResults["Property:ProductVersion"]); + WixAssert.StringEqual("Property:TestPackageManufacturer\tExample Corporation", queryResults["Property:TestPackageManufacturer"]); + WixAssert.StringEqual("Property:TestPackageName\tPacakgeWithBindVariables", queryResults["Property:TestPackageName"]); + WixAssert.StringEqual("Property:TestPackageVersion\t3.14.1703.0", queryResults["Property:TestPackageVersion"]); + WixAssert.StringEqual("Property:TestTextVersion\tv", queryResults["Property:TestTextVersion"]); Assert.False(queryResults.ContainsKey("Property:TestTextLanguage")); } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs index 6387a12a..bc7fe7a4 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs @@ -86,44 +86,44 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); var bundleSymbol = section.Symbols.OfType().Single(); - Assert.Equal("1.0.0.0", bundleSymbol.Version); + WixAssert.StringEqual("1.0.0.0", bundleSymbol.Version); var previousVersion = bundleSymbol.Fields[(int)WixBundleSymbolFields.Version].PreviousValue; - Assert.Equal("!(bind.packageVersion.test.msi)", previousVersion.AsString()); + WixAssert.StringEqual("!(bind.packageVersion.test.msi)", previousVersion.AsString()); var msiSymbol = section.Symbols.OfType().Single(); - Assert.Equal("test.msi", msiSymbol.Id.Id); + WixAssert.StringEqual("test.msi", msiSymbol.Id.Id); var extractResult = BundleExtractor.ExtractBAContainer(null, exePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); var burnManifestData = wixOutput.GetData(BurnConstants.BurnManifestWixOutputStreamName); var extractedBurnManifestData = File.ReadAllText(Path.Combine(baFolderPath, "manifest.xml"), Encoding.UTF8); - Assert.Equal(extractedBurnManifestData, burnManifestData); + WixAssert.StringEqual(extractedBurnManifestData, burnManifestData); var baManifestData = wixOutput.GetData(BurnConstants.BootstrapperApplicationDataWixOutputStreamName); var extractedBaManifestData = File.ReadAllText(Path.Combine(baFolderPath, "BootstrapperApplicationData.xml"), Encoding.UTF8); - Assert.Equal(extractedBaManifestData, baManifestData); + WixAssert.StringEqual(extractedBaManifestData, baManifestData); var bextManifestData = wixOutput.GetData(BurnConstants.BundleExtensionDataWixOutputStreamName); var extractedBextManifestData = File.ReadAllText(Path.Combine(baFolderPath, "BundleExtensionData.xml"), Encoding.UTF8); - Assert.Equal(extractedBextManifestData, bextManifestData); + WixAssert.StringEqual(extractedBextManifestData, bextManifestData); foreach (XmlAttribute attribute in extractResult.ManifestDocument.DocumentElement.Attributes) { switch (attribute.LocalName) { case "EngineVersion": - Assert.Equal($"{ThisAssembly.Git.BaseVersion.Major}.{ThisAssembly.Git.BaseVersion.Minor}.{ThisAssembly.Git.BaseVersion.Patch}.{ThisAssembly.Git.Commits}", attribute.Value); + WixAssert.StringEqual($"{ThisAssembly.Git.BaseVersion.Major}.{ThisAssembly.Git.BaseVersion.Minor}.{ThisAssembly.Git.BaseVersion.Patch}.{ThisAssembly.Git.Commits}", attribute.Value); break; case "ProtocolVersion": - Assert.Equal("1", attribute.Value); + WixAssert.StringEqual("1", attribute.Value); break; case "Win64": - Assert.Equal("no", attribute.Value); + WixAssert.StringEqual("no", attribute.Value); break; case "xmlns": - Assert.Equal("http://wixtoolset.org/schemas/v4/2008/Burn", attribute.Value); + WixAssert.StringEqual("http://wixtoolset.org/schemas/v4/2008/Burn", attribute.Value); break; default: Assert.False(true, $"Attribute: '{attribute.LocalName}', Value: '{attribute.Value}'"); @@ -131,30 +131,38 @@ namespace WixToolsetTest.CoreIntegration } } - var commandLineElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:CommandLine"); - var commandLineElement = (XmlNode)Assert.Single(commandLineElements); - Assert.Equal("", commandLineElement.GetTestXml()); + var commandLineElements = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:CommandLine"); + WixAssert.CompareLineByLine(new[] + { + "", + }, commandLineElements); - var logElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Log"); - var logElement = (XmlNode)Assert.Single(logElements); - Assert.Equal("", logElement.GetTestXml()); + var logElements = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Log"); + WixAssert.CompareLineByLine(new[] + { + "", + }, logElements); - var registrationElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Registration"); - var registrationElement = (XmlNode)Assert.Single(registrationElements); - Assert.Equal($"" + + var registrationElements = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration"); + WixAssert.CompareLineByLine(new[] + { + $"" + "" + - "", registrationElement.GetTestXml()); + "", + }, registrationElements); - var msiPayloads = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Payload[@Id='test.msi']"); - var msiPayload = (XmlNode)Assert.Single(msiPayloads); - Assert.Equal("", - msiPayload.GetTestXml(new Dictionary>() { { "Payload", new List { "FileSize", "Hash" } } })); + var ignoreAttributesByElementName = new Dictionary>() { { "Payload", new List { "FileSize", "Hash" } } }; + var msiPayloads = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Payload[@Id='test.msi']", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] + { + "", + }, msiPayloads); } var manifestResource = new Resource(ResourceType.Manifest, "#1", 1033); manifestResource.Load(exePath); var actualManifestData = Encoding.UTF8.GetString(manifestResource.Data); - Assert.Equal("" + + WixAssert.StringEqual("" + "" + "" + "~TestBundle" + @@ -181,7 +189,7 @@ namespace WixToolsetTest.CoreIntegration var attachedFolderPath = Path.Combine(baseFolder, "attached"); var extractFolderPath = Path.Combine(baseFolder, "extract"); - var result = WixRunner.Execute(false, new[] // TODO: go back to elevating warnings as errors. + var result = WixRunner.Execute(new[] { "build", "-arch", "x64", @@ -200,7 +208,7 @@ namespace WixToolsetTest.CoreIntegration var manifestResource = new Resource(ResourceType.Manifest, "#1", 1033); manifestResource.Load(exePath); var actualManifestData = Encoding.UTF8.GetString(manifestResource.Data); - Assert.Equal("" + + WixAssert.StringEqual("" + "" + "" + "~TestBundle" + @@ -218,16 +226,16 @@ namespace WixToolsetTest.CoreIntegration switch (attribute.LocalName) { case "EngineVersion": - Assert.Equal($"{ThisAssembly.Git.BaseVersion.Major}.{ThisAssembly.Git.BaseVersion.Minor}.{ThisAssembly.Git.BaseVersion.Patch}.{ThisAssembly.Git.Commits}", attribute.Value); + WixAssert.StringEqual($"{ThisAssembly.Git.BaseVersion.Major}.{ThisAssembly.Git.BaseVersion.Minor}.{ThisAssembly.Git.BaseVersion.Patch}.{ThisAssembly.Git.Commits}", attribute.Value); break; case "ProtocolVersion": - Assert.Equal("1", attribute.Value); + WixAssert.StringEqual("1", attribute.Value); break; case "Win64": - Assert.Equal("yes", attribute.Value); + WixAssert.StringEqual("yes", attribute.Value); break; case "xmlns": - Assert.Equal("http://wixtoolset.org/schemas/v4/2008/Burn", attribute.Value); + WixAssert.StringEqual("http://wixtoolset.org/schemas/v4/2008/Burn", attribute.Value); break; default: Assert.False(true, $"Attribute: '{attribute.LocalName}', Value: '{attribute.Value}'"); @@ -433,7 +441,7 @@ namespace WixToolsetTest.CoreIntegration } [Fact] - public void CantBuildWithDuplicateCacheIds() + public void CannotBuildWithDuplicateCacheIds() { var folder = TestData.Get(@"TestData"); @@ -459,7 +467,7 @@ namespace WixToolsetTest.CoreIntegration } [Fact] - public void CantBuildWithDuplicatePayloadNames() + public void CannotBuildWithDuplicatePayloadNames() { var folder = TestData.Get(@"TestData"); @@ -520,7 +528,7 @@ namespace WixToolsetTest.CoreIntegration } [Fact] - public void CantBuildWithOrphanPayload() + public void CannotBuildWithOrphanPayload() { var folder = TestData.Get(@"TestData"); @@ -547,7 +555,7 @@ namespace WixToolsetTest.CoreIntegration } [Fact] - public void CantBuildWithPackageInMultipleContainers() + public void CannotBuildWithPackageInMultipleContainers() { var folder = TestData.Get(@"TestData"); @@ -603,7 +611,7 @@ namespace WixToolsetTest.CoreIntegration } [Fact] - public void CantBuildWithUnscheduledPackage() + public void CannotBuildWithUnscheduledPackage() { var folder = TestData.Get(@"TestData"); @@ -629,7 +637,7 @@ namespace WixToolsetTest.CoreIntegration } [Fact] - public void CantBuildWithUnscheduledRollbackBoundary() + public void CannotBuildWithUnscheduledRollbackBoundary() { var folder = TestData.Get(@"TestData"); diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs index 242b9303..45dc5160 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs @@ -43,11 +43,13 @@ namespace WixToolsetTest.CoreIntegration var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var customElements = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:BundleCustomTableBA"); - Assert.Equal(3, customElements.Count); - Assert.Equal("", customElements[0].GetTestXml()); - Assert.Equal("", customElements[1].GetTestXml()); - Assert.Equal("", customElements[2].GetTestXml()); + var customElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:BundleCustomTableBA"); + WixAssert.CompareLineByLine(new[] + { + "", + "", + "", + }, customElements); } } @@ -82,15 +84,17 @@ namespace WixToolsetTest.CoreIntegration var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var packageElements = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixPackageProperties"); var ignoreAttributesByElementName = new Dictionary> { { "WixPackageProperties", new List { "DownloadSize", "PackageSize", "InstalledSize", "Version" } }, }; - Assert.Equal(3, packageElements.Count); - Assert.Equal("", packageElements[0].GetTestXml(ignoreAttributesByElementName)); - Assert.Equal("", packageElements[1].GetTestXml()); - Assert.Equal("", packageElements[2].GetTestXml(ignoreAttributesByElementName)); + var packageElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPackageProperties", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] + { + "", + "", + "", + }, packageElements); } } @@ -125,16 +129,18 @@ namespace WixToolsetTest.CoreIntegration var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var payloadElements = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixPayloadProperties"); var ignoreAttributesByElementName = new Dictionary> { { "WixPayloadProperties", new List { "Size" } }, }; - Assert.Equal(4, payloadElements.Count); - Assert.Equal("", payloadElements[0].GetTestXml(ignoreAttributesByElementName)); - Assert.Equal("", payloadElements[1].GetTestXml(ignoreAttributesByElementName)); - Assert.Equal("", payloadElements[2].GetTestXml(ignoreAttributesByElementName)); - Assert.Equal("", payloadElements[3].GetTestXml(ignoreAttributesByElementName)); + var payloadElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPayloadProperties", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] + { + "", + "", + "", + "", + }, payloadElements); } } @@ -167,17 +173,21 @@ namespace WixToolsetTest.CoreIntegration var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var manifestRelatedBundlesElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:RelatedBundle"); - Assert.Equal("", manifestRelatedBundlesElements[0].GetTestXml()); - Assert.Equal(1, manifestRelatedBundlesElements.Count); + var manifestRelatedBundlesElements = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:RelatedBundle"); + WixAssert.CompareLineByLine(new[] + { + "", + }, manifestRelatedBundlesElements); - var dataRelatedBundlesElements = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixBundleProperties"); var ignoreAttributesByElementName = new Dictionary> { { "WixBundleProperties", new List { "DisplayName", "Id" } }, }; - Assert.Equal("", dataRelatedBundlesElements[0].GetTestXml(ignoreAttributesByElementName)); - Assert.Equal(1, dataRelatedBundlesElements.Count); + var dataRelatedBundlesElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixBundleProperties", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] + { + "", + }, dataRelatedBundlesElements); } } @@ -212,11 +222,13 @@ namespace WixToolsetTest.CoreIntegration var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var customElements = extractResult.SelectBundleExtensionDataNodes("/be:BundleExtensionData/be:BundleExtension[@Id='CustomTableExtension']/be:BundleCustomTableBE"); - Assert.Equal(3, customElements.Count); - Assert.Equal("", customElements[0].GetTestXml()); - Assert.Equal("", customElements[1].GetTestXml()); - Assert.Equal("", customElements[2].GetTestXml()); + var customElements = extractResult.GetBundleExtensionTestXmlLines("/be:BundleExtensionData/be:BundleExtension[@Id='CustomTableExtension']/be:BundleCustomTableBE"); + WixAssert.CompareLineByLine(new[] + { + "", + "", + "", + }, customElements); } } @@ -252,13 +264,17 @@ namespace WixToolsetTest.CoreIntegration var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var bundleExtensions = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:BundleExtension"); - Assert.Equal(1, bundleExtensions.Count); - Assert.Equal("", bundleExtensions[0].GetTestXml()); + var bundleExtensions = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:BundleExtension"); + WixAssert.CompareLineByLine(new[] + { + "", + }, bundleExtensions); - var bundleExtensionPayloads = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:UX/burn:Payload[@Id='ExampleBext']"); - Assert.Equal(1, bundleExtensionPayloads.Count); - Assert.Equal("", bundleExtensionPayloads[0].GetTestXml()); + var bundleExtensionPayloads = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:UX/burn:Payload[@Id='ExampleBext']"); + WixAssert.CompareLineByLine(new[] + { + "", + }, bundleExtensionPayloads); } } @@ -296,24 +312,34 @@ namespace WixToolsetTest.CoreIntegration var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var bundleExtensions = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:BundleExtension"); - Assert.Equal(1, bundleExtensions.Count); - Assert.Equal("", bundleExtensions[0].GetTestXml()); + var bundleExtensions = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:BundleExtension"); + WixAssert.CompareLineByLine(new[] + { + "", + }, bundleExtensions); - var extensionSearches = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:ExtensionSearch"); - Assert.Equal(2, extensionSearches.Count); - Assert.Equal("", extensionSearches[0].GetTestXml()); - Assert.Equal("", extensionSearches[1].GetTestXml()); + var extensionSearches = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:ExtensionSearch"); + WixAssert.CompareLineByLine(new[] + { + "", + "", + }, extensionSearches); - var bundleExtensionDatas = extractResult.SelectBundleExtensionDataNodes("/be:BundleExtensionData/be:BundleExtension[@Id='ExampleBundleExtension']"); - Assert.Equal(1, bundleExtensionDatas.Count); - Assert.Equal("" + + var bundleExtensionDatas = extractResult.GetBundleExtensionTestXmlLines("/be:BundleExtensionData/be:BundleExtension[@Id='ExampleBundleExtension']"); + WixAssert.CompareLineByLine(new[] + { + "" + "" + "" + - "", bundleExtensionDatas[0].GetTestXml()); + "" + }, bundleExtensionDatas); - var exampleSearches = extractResult.SelectBundleExtensionDataNodes("/be:BundleExtensionData/be:BundleExtension[@Id='ExampleBundleExtension']/be:ExampleSearch"); - Assert.Equal(2, exampleSearches.Count); + var exampleSearches = extractResult.GetBundleExtensionTestXmlLines("/be:BundleExtensionData/be:BundleExtension[@Id='ExampleBundleExtension']/be:ExampleSearch"); + WixAssert.CompareLineByLine(new[] + { + "", + "", + }, exampleSearches); } } @@ -348,14 +374,16 @@ namespace WixToolsetTest.CoreIntegration var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var exePackageElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:ExePackage"); var ignoreAttributesByElementName = new Dictionary> { { "ExePackage", new List { "CacheId", "InstallSize", "Size" } }, }; - Assert.Equal(2, exePackageElements.Count); - Assert.Equal("", exePackageElements[0].GetTestXml(ignoreAttributesByElementName)); - Assert.Equal("", exePackageElements[1].GetTestXml(ignoreAttributesByElementName)); + var exePackageElements = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:ExePackage", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] + { + "", + "", + }, exePackageElements); } } @@ -390,14 +418,16 @@ namespace WixToolsetTest.CoreIntegration var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var setVariables = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:SetVariable"); - Assert.Equal(6, setVariables.Count); - Assert.Equal("", setVariables[0].GetTestXml()); - Assert.Equal("", setVariables[1].GetTestXml()); - Assert.Equal("", setVariables[2].GetTestXml()); - Assert.Equal("", setVariables[3].GetTestXml()); - Assert.Equal("", setVariables[4].GetTestXml()); - Assert.Equal("", setVariables[5].GetTestXml()); + var setVariables = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:SetVariable"); + WixAssert.CompareLineByLine(new[] + { + "", + "", + "", + "", + "", + "", + }, setVariables); } } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundlePackageFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundlePackageFixture.cs index bf9e330c..eb1d02f2 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BundlePackageFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundlePackageFixture.cs @@ -96,11 +96,8 @@ namespace WixToolsetTest.CoreIntegration { { "BundlePackage", new List { "Size" } }, }; - var bundlePackages = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:BundlePackage") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributesByElementName)) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var bundlePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:BundlePackage", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] { $"" + "" + @@ -110,11 +107,8 @@ namespace WixToolsetTest.CoreIntegration "", }, bundlePackages); - var registrations = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Registration") - .Cast() - .Select(e => e.GetTestXml()) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var registrations = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration"); + WixAssert.CompareLineByLine(new[] { $"" + "" + @@ -125,11 +119,8 @@ namespace WixToolsetTest.CoreIntegration { { "WixPackageProperties", new List { "DownloadSize", "PackageSize" } }, }; - var packageElements = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixPackageProperties") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributesByElementName)) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var packageElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPackageProperties", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] { "", }, packageElements); @@ -167,11 +158,8 @@ namespace WixToolsetTest.CoreIntegration { { "BundlePackage", new List { "Size" } }, }; - bundlePackages = grandparentExtractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:BundlePackage") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributesByElementName)) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + bundlePackages = grandparentExtractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:BundlePackage", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] { $"" + $"" + @@ -184,21 +172,15 @@ namespace WixToolsetTest.CoreIntegration { { "Payload", new List { "FileSize", "Hash" } }, }; - var payloads = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Payload") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributesByElementName)) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var payloads = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Payload", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] { "", "", }, payloads); - registrations = grandparentExtractResult.SelectManifestNodes("/burn:BurnManifest/burn:Registration") - .Cast() - .Select(e => e.GetTestXml()) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + registrations = grandparentExtractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration"); + WixAssert.CompareLineByLine(new[] { $"" + "" + @@ -209,11 +191,8 @@ namespace WixToolsetTest.CoreIntegration { { "WixPackageProperties", new List { "DownloadSize", "PackageSize" } }, }; - packageElements = grandparentExtractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixPackageProperties") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributesByElementName)) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + packageElements = grandparentExtractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPackageProperties", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] { "", }, packageElements); @@ -268,11 +247,8 @@ namespace WixToolsetTest.CoreIntegration { { "BundlePackage", new List { "Size" } }, }; - var bundlePackages = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:BundlePackage") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributesByElementName)) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var bundlePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:BundlePackage", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] { $"" + "" + @@ -281,11 +257,8 @@ namespace WixToolsetTest.CoreIntegration "", }, bundlePackages); - var registrations = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Registration") - .Cast() - .Select(e => e.GetTestXml()) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var registrations = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration"); + WixAssert.CompareLineByLine(new[] { $"" + "" + @@ -296,11 +269,8 @@ namespace WixToolsetTest.CoreIntegration { { "WixPackageProperties", new List { "DownloadSize", "PackageSize" } }, }; - var packageElements = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixPackageProperties") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributesByElementName)) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var packageElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPackageProperties", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] { "", }, packageElements); @@ -364,11 +334,8 @@ namespace WixToolsetTest.CoreIntegration { { "BundlePackage", new List { "Size" } }, }; - var bundlePackages = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:BundlePackage") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributesByElementName)) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var bundlePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:BundlePackage", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] { $"" + "" + @@ -377,11 +344,8 @@ namespace WixToolsetTest.CoreIntegration "", }, bundlePackages); - var registrations = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Registration") - .Cast() - .Select(e => e.GetTestXml()) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var registrations = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration"); + WixAssert.CompareLineByLine(new[] { $"" + "" + @@ -392,11 +356,8 @@ namespace WixToolsetTest.CoreIntegration { { "WixPackageProperties", new List { "DownloadSize", "PackageSize" } }, }; - var packageElements = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixPackageProperties") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributesByElementName)) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var packageElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPackageProperties", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] { "", }, packageElements); diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/CabFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/CabFixture.cs index 6fae3801..da1d47df 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/CabFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/CabFixture.cs @@ -45,7 +45,7 @@ namespace WixToolsetTest.CoreIntegration WixAssert.CompareLineByLine(new[] { "Notepad.exe", "test.txt" }, fileRows.Select(f => f.Name).ToArray()); var files = Query.GetCabinetFiles(cabPath); - Assert.Equal(fileRows.Select(f => f.Id).ToArray(), files.Select(f => f.Name).ToArray()); + WixAssert.CompareLineByLine(fileRows.Select(f => f.Id).ToArray(), files.Select(f => f.Name).ToArray()); } } @@ -90,7 +90,7 @@ namespace WixToolsetTest.CoreIntegration WixAssert.CompareLineByLine(new[] { "test.txt" }, fileRows.Select(f => f.Name).ToArray()); var files = Query.GetCabinetFiles(cabPath); - Assert.Equal(fileRows.Select(f => f.Id).ToArray(), files.Select(f => f.Name).ToArray()); + WixAssert.CompareLineByLine(fileRows.Select(f => f.Id).ToArray(), files.Select(f => f.Name).ToArray()); } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs index 0abcaffc..febc50d4 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs @@ -50,13 +50,15 @@ namespace WixToolsetTest.CoreIntegration var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var payloads = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Payload"); - Assert.Equal(4, payloads.Count); var ignoreAttributes = new Dictionary> { { "Payload", new List { "FileSize", "Hash" } } }; - Assert.Equal(@"", payloads[0].GetTestXml(ignoreAttributes)); - Assert.Equal(@"", payloads[1].GetTestXml(ignoreAttributes)); - Assert.Equal(@"", payloads[2].GetTestXml(ignoreAttributes)); - Assert.Equal(@"", payloads[3].GetTestXml(ignoreAttributes)); + var payloads = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Payload", ignoreAttributes); + WixAssert.CompareLineByLine(new[] + { + @"", + @"", + @"", + @"", + }, payloads); } } @@ -94,13 +96,15 @@ namespace WixToolsetTest.CoreIntegration var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var payloads = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Payload"); - Assert.Equal(4, payloads.Count); var ignoreAttributes = new Dictionary> { { "Payload", new List { "FileSize", "Hash" } } }; - Assert.Equal(@"", payloads[0].GetTestXml(ignoreAttributes)); - Assert.Equal(@"", payloads[1].GetTestXml(ignoreAttributes)); - Assert.Equal(@"", payloads[2].GetTestXml(ignoreAttributes)); - Assert.Equal(@"", payloads[3].GetTestXml(ignoreAttributes)); + var payloads = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Payload", ignoreAttributes); + WixAssert.CompareLineByLine(new[] + { + @"", + @"", + @"", + @"", + }, payloads); } } @@ -142,11 +146,8 @@ namespace WixToolsetTest.CoreIntegration { { "MsiPackage", new List { "CacheId", "InstallSize", "Size", "ProductCode" } }, }; - var msiPackages = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:MsiPackage") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributes)) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var msiPackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:MsiPackage", ignoreAttributes); + WixAssert.CompareLineByLine(new[] { "" + "" + @@ -196,7 +197,7 @@ namespace WixToolsetTest.CoreIntegration "-o", bundlePath }); - WixAssert.CompareLineByLine(new string[] + WixAssert.CompareLineByLine(new[] { "The layout-only Payload 'SharedPayload' is being added to Container 'FirstX64'. It will not be extracted during layout.", }, result.Messages.Select(m => m.ToString()).ToArray()); @@ -208,11 +209,8 @@ namespace WixToolsetTest.CoreIntegration extractResult.AssertSuccess(); var ignoreAttributes = new Dictionary> { { "Payload", new List { "FileSize", "Hash" } } }; - var payloads = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Payload[@Id='SharedPayload']") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributes)) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var payloads = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Payload[@Id='SharedPayload']", ignoreAttributes); + WixAssert.CompareLineByLine(new[] { "", }, payloads); @@ -257,11 +255,8 @@ namespace WixToolsetTest.CoreIntegration Assert.True(File.Exists(Path.Combine(attachedFolderPath, "WixAttachedContainer", "FirstX86.msi")), "Expected extracted container to contain FirstX86.msi"); var ignoreAttributes = new Dictionary> { { "Payload", new List { "FileSize", "Hash" } } }; - var payloads = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Payload") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributes)) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var payloads = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Payload", ignoreAttributes); + WixAssert.CompareLineByLine(new[] { "", "", @@ -298,7 +293,7 @@ namespace WixToolsetTest.CoreIntegration "-o", bundlePath }); - WixAssert.CompareLineByLine(new string[] + WixAssert.CompareLineByLine(new[] { "The Payload 'SharedPayload' can't be added to Container 'FirstX64' because it was already added to Container 'FirstX86'.", }, result.Messages.Select(m => m.ToString()).ToArray()); @@ -310,11 +305,8 @@ namespace WixToolsetTest.CoreIntegration extractResult.AssertSuccess(); var ignoreAttributes = new Dictionary> { { "Payload", new List { "FileSize", "Hash" } } }; - var payloads = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Payload[@Id='SharedPayload']") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributes)) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var payloads = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Payload[@Id='SharedPayload']", ignoreAttributes); + WixAssert.CompareLineByLine(new[] { "", }, payloads); @@ -347,7 +339,7 @@ namespace WixToolsetTest.CoreIntegration "-o", bundlePath }); - WixAssert.CompareLineByLine(new string[] + WixAssert.CompareLineByLine(new[] { "The layout-only Payload 'SharedPayload' is being added to Container 'FirstX64'. It will not be extracted during layout.", }, result.Messages.Select(m => m.ToString()).ToArray()); @@ -362,11 +354,8 @@ namespace WixToolsetTest.CoreIntegration { { "WixPayloadProperties", new List { "Size" } }, }; - var payloads = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixPayloadProperties") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributesByElementName)) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var payloads = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPayloadProperties", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] { "", "", diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/CopyFileFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/CopyFileFixture.cs index c6fa602b..a7b4a96a 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/CopyFileFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/CopyFileFixture.cs @@ -39,9 +39,9 @@ namespace WixToolsetTest.CoreIntegration var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); var section = intermediate.Sections.Single(); var copyFileSymbol = section.Symbols.OfType().Single(); - Assert.Equal("MoveText", copyFileSymbol.Id.Id); + WixAssert.StringEqual("MoveText", copyFileSymbol.Id.Id); Assert.True(copyFileSymbol.Delete); - Assert.Equal("OtherFolder", copyFileSymbol.DestFolder); + WixAssert.StringEqual("OtherFolder", copyFileSymbol.DestFolder); } } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs index 7a915eb8..ef12a91e 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs @@ -33,7 +33,7 @@ namespace WixToolsetTest.CoreIntegration }); Assert.Equal(176, result.ExitCode); - Assert.Equal("The InstallExecuteSequence table contains an action 'Action1' that is scheduled to come before or after action 'Action3', which is also scheduled to come before or after action 'Action1'. Please remove this circular dependency by changing the Before or After attribute for one of the actions.", result.Messages[0].ToString()); + WixAssert.StringEqual("The InstallExecuteSequence table contains an action 'Action1' that is scheduled to come before or after action 'Action3', which is also scheduled to come before or after action 'Action1'. Please remove this circular dependency by changing the Before or After attribute for one of the actions.", result.Messages[0].ToString()); } } @@ -60,7 +60,7 @@ namespace WixToolsetTest.CoreIntegration }); Assert.Equal(176, result.ExitCode); - Assert.Equal("The InstallExecuteSequence table contains an action 'Action2' that is scheduled to come before or after action 'Action4', which is also scheduled to come before or after action 'Action2'. Please remove this circular dependency by changing the Before or After attribute for one of the actions.", result.Messages[0].ToString()); + WixAssert.StringEqual("The InstallExecuteSequence table contains an action 'Action2' that is scheduled to come before or after action 'Action4', which is also scheduled to come before or after action 'Action2'. Please remove this circular dependency by changing the Before or After attribute for one of the actions.", result.Messages[0].ToString()); } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs index 43dbf4f9..89c54c7e 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs @@ -44,11 +44,8 @@ namespace WixToolsetTest.CoreIntegration var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var provides = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:ExePackage/burn:Provides") - .Cast() - .Select(e => e.GetTestXml()) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var provides = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:ExePackage/burn:Provides"); + WixAssert.CompareLineByLine(new[] { "", }, provides); @@ -100,11 +97,8 @@ namespace WixToolsetTest.CoreIntegration var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var provides = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:MsiPackage/burn:Provides") - .Cast() - .Select(e => e.GetTestXml()) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var provides = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:MsiPackage/burn:Provides"); + WixAssert.CompareLineByLine(new[] { "", }, provides); @@ -146,10 +140,7 @@ namespace WixToolsetTest.CoreIntegration { { "Registration", new List { "Id" } }, }; - var registration = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Registration") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributesByElementName)) - .ToArray(); + var registration = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration", ignoreAttributesByElementName); WixAssert.CompareLineByLine(new string[] { "", @@ -172,8 +163,8 @@ namespace WixToolsetTest.CoreIntegration private static void Build(string[] args) { - var result = WixRunner.Execute(args) - .AssertSuccess(); + var result = WixRunner.Execute(args); + result.AssertSuccess(); } } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ExePackageFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ExePackageFixture.cs index 32c207f7..cebed367 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/ExePackageFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/ExePackageFixture.cs @@ -48,10 +48,7 @@ namespace WixToolsetTest.CoreIntegration { { "ExePackage", new List { "CacheId", "Size" } }, }; - var exePackages = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:ExePackage") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributes)) - .ToArray(); + var exePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:ExePackage", ignoreAttributes); WixAssert.CompareLineByLine(new string[] { "" + @@ -101,10 +98,7 @@ namespace WixToolsetTest.CoreIntegration { { "ExePackage", new List { "CacheId", "Size" } }, }; - var exePackages = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:ExePackage") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributes)) - .ToArray(); + var exePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:ExePackage", ignoreAttributes); WixAssert.CompareLineByLine(new string[] { "" + @@ -154,10 +148,7 @@ namespace WixToolsetTest.CoreIntegration { { "ExePackage", new List { "CacheId", "Size" } }, }; - var exePackages = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:ExePackage") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributes)) - .ToArray(); + var exePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:ExePackage", ignoreAttributes); WixAssert.CompareLineByLine(new string[] { "" + @@ -203,10 +194,7 @@ namespace WixToolsetTest.CoreIntegration { { "ExePackage", new List { "CacheId", "Size" } }, }; - var exePackages = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:ExePackage") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributes)) - .ToArray(); + var exePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:ExePackage", ignoreAttributes); WixAssert.CompareLineByLine(new string[] { "" + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs index a5155069..e7ff0230 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs @@ -43,7 +43,7 @@ namespace WixToolsetTest.CoreIntegration build.BuildAndDecompileAndBuild(Build, Decompile, actualOutputPath); var expected = File.ReadAllLines(expectedOutputPath); - var actual = File.ReadAllLines(actualOutputPath).Select(ReplaceGuids).ToArray(); ; + var actual = File.ReadAllLines(actualOutputPath).Select(ReplaceGuids).ToArray(); WixAssert.CompareLineByLine(expected, actual); } } @@ -87,13 +87,13 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); var fileSymbol = section.Symbols.OfType().Single(); - Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); - Assert.Equal(@"example.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); + WixAssert.StringEqual(Path.Combine(folder, @"data\example.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + WixAssert.StringEqual(@"example.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); var example = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).Single(); - Assert.Equal("Foo", example.Id?.Id); - Assert.Equal("filF5_pLhBuF5b4N9XEo52g_hUM5Lo", example[0].AsString()); - Assert.Equal("Bar", example[1].AsString()); + WixAssert.StringEqual("Foo", example.Id?.Id); + WixAssert.StringEqual("filF5_pLhBuF5b4N9XEo52g_hUM5Lo", example[0].AsString()); + WixAssert.StringEqual("Bar", example[1].AsString()); } } @@ -126,8 +126,8 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); var property = section.Symbols.OfType().Where(p => p.Id.Id == "ExampleProperty").Single(); - Assert.Equal("ExampleProperty", property.Id.Id); - Assert.Equal("test", property.Value); + WixAssert.StringEqual("ExampleProperty", property.Id.Id); + WixAssert.StringEqual("test", property.Value); } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs index cfe4d3f1..ad8707c6 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs @@ -103,7 +103,7 @@ namespace WixToolsetTest.CoreIntegration } catch (WixException we) { - Assert.Equal("Could not find entry section in provided list of intermediates. Expected section of type 'Product'.", we.Message); + WixAssert.StringEqual("Could not find entry section in provided list of intermediates. Expected section of type 'Product'.", we.Message); return; } @@ -133,7 +133,7 @@ namespace WixToolsetTest.CoreIntegration } catch (WixException we) { - Assert.Equal("Could not find entry section in provided list of intermediates. Supported entry section types are: Product, Bundle, Patch, PatchCreation, Module.", we.Message); + WixAssert.StringEqual("Could not find entry section in provided list of intermediates. Supported entry section types are: Product, Bundle, Patch, PatchCreation, Module.", we.Message); return; } @@ -163,7 +163,7 @@ namespace WixToolsetTest.CoreIntegration } catch (WixException we) { - Assert.Equal("Could not find entry section in provided list of intermediates. Supported entry section types are: Product, Bundle, Patch, PatchCreation, Module.", we.Message); + WixAssert.StringEqual("Could not find entry section in provided list of intermediates. Supported entry section types are: Product, Bundle, Patch, PatchCreation, Module.", we.Message); return; } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs index 234aec78..af200c0d 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs @@ -2,14 +2,9 @@ namespace WixToolsetTest.CoreIntegration { - using System; using System.IO; - using System.Linq; using WixBuildTools.TestSupport; using WixToolset.Core.TestPackage; - using WixToolset.Data; - using WixToolset.Data.Symbols; - using WixToolset.Data.WindowsInstaller; using Xunit; public class ModuleFixture diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/MsiFixture.cs index cb1ecb04..c1c07952 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/MsiFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/MsiFixture.cs @@ -52,8 +52,8 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); var fileSymbol = section.Symbols.OfType().First(); - Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); - Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); + WixAssert.StringEqual(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + WixAssert.StringEqual(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); } } @@ -87,8 +87,8 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); var fileSymbol = section.Symbols.OfType().Single(); - Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); - Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); + WixAssert.StringEqual(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + WixAssert.StringEqual(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); } } @@ -246,14 +246,14 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); var errors = section.Symbols.OfType().ToDictionary(t => t.Id.Id); - Assert.Equal("Category 55 Emergency Doomsday Crisis", errors["1234"].Message.Trim()); - Assert.Equal(" ", errors["5678"].Message); + WixAssert.StringEqual("Category 55 Emergency Doomsday Crisis", errors["1234"].Message.Trim()); + WixAssert.StringEqual(" ", errors["5678"].Message); var customAction1 = section.Symbols.OfType().Where(t => t.Id.Id == "CanWeReferenceAnError_YesWeCan").Single(); - Assert.Equal("1234", customAction1.Target); + WixAssert.StringEqual("1234", customAction1.Target); var customAction2 = section.Symbols.OfType().Where(t => t.Id.Id == "TextErrorsWorkOKToo").Single(); - Assert.Equal("If you see this, something went wrong.", customAction2.Target); + WixAssert.StringEqual("If you see this, something went wrong.", customAction2.Target); } } @@ -461,7 +461,7 @@ namespace WixToolsetTest.CoreIntegration Assert.NotNull(wixout.GetDataStream("wix-ir.json")); var text = wixout.GetData("wix-ir/test.txt"); - Assert.Equal("This is test.txt.", text); + WixAssert.StringEqual("This is test.txt.", text); } } } @@ -491,13 +491,13 @@ namespace WixToolsetTest.CoreIntegration Assert.NotNull(wixout.GetDataStream("wix-ir.json")); var text = wixout.GetData("wix-ir/test.txt"); - Assert.Equal(@"This is a\test.txt.", text); + WixAssert.StringEqual(@"This is a\test.txt.", text); var text2 = wixout.GetData("wix-ir/test.txt-1"); - Assert.Equal(@"This is b\test.txt.", text2); + WixAssert.StringEqual(@"This is b\test.txt.", text2); var text3 = wixout.GetData("wix-ir/test.txt-2"); - Assert.Equal(@"This is c\test.txt.", text3); + WixAssert.StringEqual(@"This is c\test.txt.", text3); } } } @@ -533,8 +533,8 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); var fileSymbol = section.Symbols.OfType().Single(); - Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); - Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); + WixAssert.StringEqual(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + WixAssert.StringEqual(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); } } @@ -569,8 +569,8 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); var fileSymbol = section.Symbols.OfType().Single(); - Assert.Equal(Path.Combine(folder, @"data\candle.exe"), fileSymbol[FileSymbolFields.Source].AsPath().Path); - Assert.Equal(@"candle.exe", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); + WixAssert.StringEqual(Path.Combine(folder, @"data\candle.exe"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + WixAssert.StringEqual(@"candle.exe", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); var msiAssemblyNameSymbols = section.Symbols.OfType(); WixAssert.CompareLineByLine(new[] @@ -626,8 +626,8 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); var fileSymbol = section.Symbols.OfType().Single(); - Assert.Equal(Path.Combine(folder, @"data\candle.exe"), fileSymbol[FileSymbolFields.Source].AsPath().Path); - Assert.Equal(@"candle.exe", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); + WixAssert.StringEqual(Path.Combine(folder, @"data\candle.exe"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + WixAssert.StringEqual(@"candle.exe", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); var msiAssemblyNameSymbols = section.Symbols.OfType(); WixAssert.CompareLineByLine(new[] @@ -744,10 +744,10 @@ namespace WixToolsetTest.CoreIntegration var output = WindowsInstallerData.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"), false); var caRows = output.Tables["CustomAction"].Rows.Single(); - Assert.Equal("SetINSTALLLOCATION", caRows.FieldAsString(0)); - Assert.Equal("51", caRows.FieldAsString(1)); - Assert.Equal("INSTALLLOCATION", caRows.FieldAsString(2)); - Assert.Equal("[INSTALLFOLDER]", caRows.FieldAsString(3)); + WixAssert.StringEqual("SetINSTALLLOCATION", caRows.FieldAsString(0)); + WixAssert.StringEqual("51", caRows.FieldAsString(1)); + WixAssert.StringEqual("INSTALLLOCATION", caRows.FieldAsString(2)); + WixAssert.StringEqual("[INSTALLFOLDER]", caRows.FieldAsString(3)); } } @@ -873,7 +873,7 @@ namespace WixToolsetTest.CoreIntegration first => { Assert.Equal(MessageLevel.Error, first.Level); - Assert.Equal("Cannot find the table definitions for the 'TableDefinitionNotExposedByExtension' table. This is likely due to a typing error or missing extension. Please ensure all the necessary extensions are supplied on the command line with the -ext parameter.", first.ToString()); + WixAssert.StringEqual("Cannot find the table definitions for the 'TableDefinitionNotExposedByExtension' table. This is likely due to a typing error or missing extension. Please ensure all the necessary extensions are supplied on the command line with the -ext parameter.", first.ToString()); }); Assert.False(File.Exists(msiPath)); diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/MsiTransactionFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/MsiTransactionFixture.cs index 431c131b..f4949171 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/MsiTransactionFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/MsiTransactionFixture.cs @@ -102,10 +102,12 @@ namespace WixToolsetTest.CoreIntegration var extractResult = BundleExtractor.ExtractBAContainer(null, exePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var rollbackBoundaries = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:RollbackBoundary"); - Assert.Equal(2, rollbackBoundaries.Count); - Assert.Equal("", rollbackBoundaries[0].GetTestXml()); - Assert.Equal("", rollbackBoundaries[1].GetTestXml()); + var rollbackBoundaries = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:RollbackBoundary"); + WixAssert.CompareLineByLine(new[] + { + "", + "", + }, rollbackBoundaries); } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/PackagePayloadFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/PackagePayloadFixture.cs index da15026a..39caf8fd 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/PackagePayloadFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/PackagePayloadFixture.cs @@ -47,10 +47,7 @@ namespace WixToolsetTest.CoreIntegration { { "ExePackage", new List { "CacheId", "InstallSize", "Size" } }, }; - var msiPackageElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:MsiPackage") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributesByElementName)) - .ToArray(); + var msiPackageElements = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:MsiPackage", ignoreAttributesByElementName); WixAssert.CompareLineByLine(new[] { "" + @@ -68,20 +65,14 @@ namespace WixToolsetTest.CoreIntegration "", }, msiPackageElements); - var packageElements = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixPackageProperties") - .Cast() - .Select(e => e.GetTestXml()) - .ToArray(); - WixAssert.CompareLineByLine(new [] + var packageElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPackageProperties"); + WixAssert.CompareLineByLine(new[] { "", "", }, packageElements); - var featureElements = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixPackageFeatureInfo") - .Cast() - .Select(e => e.GetTestXml()) - .ToArray(); + var featureElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPackageFeatureInfo"); WixAssert.CompareLineByLine(new[] { "", @@ -120,17 +111,21 @@ namespace WixToolsetTest.CoreIntegration var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var exePackageElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/burn:ExePackage"); var ignoreAttributesByElementName = new Dictionary> { { "ExePackage", new List { "CacheId", "InstallSize", "Size" } }, }; - Assert.Equal(1, exePackageElements.Count); - Assert.Equal("", exePackageElements[0].GetTestXml(ignoreAttributesByElementName)); + var exePackageElements = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:ExePackage", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] + { + "", + }, exePackageElements); - var payloadElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Payload[@Id='burn.exe']"); - Assert.Equal(1, payloadElements.Count); - Assert.Equal("", payloadElements[0].GetTestXml()); + var payloadElements = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Payload[@Id='burn.exe']"); + WixAssert.CompareLineByLine(new[] + { + "", + }, payloadElements); } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs index 8fe790de..53c9ae4d 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs @@ -40,7 +40,7 @@ namespace WixToolsetTest.CoreIntegration Assert.True(File.Exists(update1Pdb)); var doc = GetExtractPatchXml(patchPath); - Assert.Equal("{7D326855-E790-4A94-8611-5351F8321FCA}", doc.Root.Element(PatchNamespace + "TargetProductCode").Value); + WixAssert.StringEqual("{7D326855-E790-4A94-8611-5351F8321FCA}", doc.Root.Element(PatchNamespace + "TargetProductCode").Value); var names = Query.GetSubStorageNames(patchPath); WixAssert.CompareLineByLine(new[] { "#RTM.1", "RTM.1" }, names); @@ -72,7 +72,7 @@ namespace WixToolsetTest.CoreIntegration Assert.True(File.Exists(update1Pdb)); var doc = GetExtractPatchXml(patchPath); - Assert.Equal("{7D326855-E790-4A94-8611-5351F8321FCA}", doc.Root.Element(PatchNamespace + "TargetProductCode").Value); + WixAssert.StringEqual("{7D326855-E790-4A94-8611-5351F8321FCA}", doc.Root.Element(PatchNamespace + "TargetProductCode").Value); var names = Query.GetSubStorageNames(patchPath); WixAssert.CompareLineByLine(new[] { "#RTM.1", "RTM.1" }, names); @@ -158,9 +158,11 @@ namespace WixToolsetTest.CoreIntegration var doc = new XmlDocument(); doc.LoadXml(manifestData); var nsmgr = BundleExtractor.GetBurnNamespaceManager(doc, "w"); - var slipstreamMspNodes = doc.SelectNodes("/w:BurnManifest/w:Chain/w:MsiPackage/w:SlipstreamMsp", nsmgr); - Assert.Equal(1, slipstreamMspNodes.Count); - Assert.Equal("", slipstreamMspNodes[0].GetTestXml()); + var slipstreamMspNodes = doc.SelectNodes("/w:BurnManifest/w:Chain/w:MsiPackage/w:SlipstreamMsp", nsmgr).GetTestXmlLines(); + WixAssert.CompareLineByLine(new[] + { + "", + }, slipstreamMspNodes); } } } @@ -173,15 +175,9 @@ namespace WixToolsetTest.CoreIntegration var doc = new XmlDocument(); doc.LoadXml(manifestData); var nsmgr = BundleExtractor.GetBurnNamespaceManager(doc, "w"); - var patchTargetCodes = doc.SelectNodes("/w:BurnManifest/w:PatchTargetCode", nsmgr); + var patchTargetCodes = doc.SelectNodes("/w:BurnManifest/w:PatchTargetCode", nsmgr).GetTestXmlLines(); - var actual = new List(); - foreach (XmlNode patchTargetCodeNode in patchTargetCodes) - { - actual.Add(patchTargetCodeNode.GetTestXml()); - } - - WixAssert.CompareLineByLine(expected, actual.ToArray()); + WixAssert.CompareLineByLine(expected, patchTargetCodes); } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/PayloadFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/PayloadFixture.cs index a4f6a3fd..868b6c21 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/PayloadFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/PayloadFixture.cs @@ -2,6 +2,7 @@ namespace WixToolsetTest.CoreIntegration { + using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -47,7 +48,7 @@ namespace WixToolsetTest.CoreIntegration ? field.AsNullableNumber()?.ToString() : field?.AsString()) .ToList(); - Assert.Equal(@"dir\file.ext", fields[(int)WixBundlePayloadSymbolFields.Name]); + WixAssert.StringEqual(@"dir\file.ext", fields[(int)WixBundlePayloadSymbolFields.Name]); } } @@ -84,7 +85,7 @@ namespace WixToolsetTest.CoreIntegration ? field.AsNullableNumber()?.ToString() : field?.AsString()) .ToList(); - Assert.Equal(@"c\d\e\f.exe", fields[(int)WixBundlePayloadSymbolFields.Name]); + WixAssert.StringEqual(@"c\d\e\f.exe", fields[(int)WixBundlePayloadSymbolFields.Name]); } } @@ -107,7 +108,7 @@ namespace WixToolsetTest.CoreIntegration "-o", wixlibPath, }); - Assert.InRange(result.ExitCode, 2, int.MaxValue); + Assert.InRange(result.ExitCode, 2, Int32.MaxValue); var expectedIllegalRelativeLongFileName = 1; var expectedPayloadMustBeRelativeToCache = 2; @@ -168,7 +169,7 @@ namespace WixToolsetTest.CoreIntegration result.AssertSuccess(); - WixAssert.CompareLineByLine(new string[] + WixAssert.CompareLineByLine(new[] { "The Payload 'burn.exe' is being added to Container 'PackagesContainer', overriding its Compressed value of 'no'.", }, result.Messages.Select(m => m.ToString()).ToArray()); @@ -183,11 +184,8 @@ namespace WixToolsetTest.CoreIntegration { "Container", new List { "FileSize", "Hash" } }, { "Payload", new List { "FileSize", "Hash" } }, }; - var payloads = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Payload") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributesByElementName)) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var payloads = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Payload", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] { "", "", @@ -196,11 +194,8 @@ namespace WixToolsetTest.CoreIntegration @"", }, payloads); - var containers = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Container") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributesByElementName)) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var containers = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Container", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] { "", }, containers); diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs index ae8a1bcc..3c023c2b 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs @@ -34,10 +34,10 @@ namespace WixToolsetTest.CoreIntegration var includedFile = result.IncludedFiles.Single(); Assert.NotNull(result.Document); - Assert.Equal(includeFile, includedFile.Path); - Assert.Equal(sourcePath, includedFile.SourceLineNumbers.FileName); + WixAssert.StringEqual(includeFile, includedFile.Path); + WixAssert.StringEqual(sourcePath, includedFile.SourceLineNumbers.FileName); Assert.Equal(1, includedFile.SourceLineNumbers.LineNumber.Value); - Assert.Equal($"{sourcePath}*1", includedFile.SourceLineNumbers.QualifiedFileName); + WixAssert.StringEqual($"{sourcePath}*1", includedFile.SourceLineNumbers.QualifiedFileName); Assert.Null(includedFile.SourceLineNumbers.Parent); } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs index e4d95b5d..f0a2e7c9 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs @@ -2,11 +2,8 @@ namespace WixToolsetTest.CoreIntegration { - using System; - using System.Collections.Generic; using System.IO; using System.Linq; - using System.Text; using WixBuildTools.TestSupport; using WixToolset.Core.TestPackage; using WixToolset.Data; diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/RollbackBoundaryFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/RollbackBoundaryFixture.cs index 3a79878d..6d089e79 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/RollbackBoundaryFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/RollbackBoundaryFixture.cs @@ -111,11 +111,8 @@ namespace WixToolsetTest.CoreIntegration var extractResult = BundleExtractor.ExtractBAContainer(null, exePath, baFolderPath, extractFolderPath); extractResult.AssertSuccess(); - var rollbackBoundaries = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:RollbackBoundary") - .Cast() - .Select(e => e.GetTestXml()) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var rollbackBoundaries = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:RollbackBoundary"); + WixAssert.CompareLineByLine(new[] { "", }, rollbackBoundaries); @@ -124,11 +121,8 @@ namespace WixToolsetTest.CoreIntegration { { "MsiPackage", new List { "Size" } }, }; - var chainPackages = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Chain/*") - .Cast() - .Select(e => e.GetTestXml(ignoreAttributesByElementName)) - .ToArray(); - WixAssert.CompareLineByLine(new string[] + var chainPackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/*", ignoreAttributesByElementName); + WixAssert.CompareLineByLine(new[] { "" + "" + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/SoftwareTagFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/SoftwareTagFixture.cs index 9573f60a..9ff97e8c 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/SoftwareTagFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/SoftwareTagFixture.cs @@ -93,8 +93,8 @@ namespace WixToolsetTest.CoreIntegration private static void Build(string[] args) { - var result = WixRunner.Execute(args) - .AssertSuccess(); + var result = WixRunner.Execute(args); + result.AssertSuccess(); } } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestXmlFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/TestXmlFixture.cs index 5330305e..ef1f6aee 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestXmlFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestXmlFixture.cs @@ -3,6 +3,7 @@ namespace WixToolsetTest.CoreIntegration { using System.Collections.Generic; + using WixBuildTools.TestSupport; using WixToolset.Core.TestPackage; using Xunit; @@ -19,7 +20,7 @@ namespace WixToolsetTest.CoreIntegration "; var expected = ""; var ignored = new Dictionary> { { "Target", new List { "One", "Two", "Missing" } } }; - Assert.Equal(expected, original.GetTestXml(ignored)); + WixAssert.StringEqual(expected, original.GetTestXml(ignored)); } [Fact] @@ -27,7 +28,7 @@ namespace WixToolsetTest.CoreIntegration { var original = ""; var expected = ""; - Assert.Equal(expected, original.GetTestXml()); + WixAssert.StringEqual(expected, original.GetTestXml()); } [Fact] @@ -35,7 +36,7 @@ namespace WixToolsetTest.CoreIntegration { var original = ""; var expected = ""; - Assert.Equal(expected, original.GetTestXml()); + WixAssert.StringEqual(expected, original.GetTestXml()); } [Fact] @@ -48,7 +49,7 @@ namespace WixToolsetTest.CoreIntegration "; var expected = ""; - Assert.Equal(expected, original.GetTestXml()); + WixAssert.StringEqual(expected, original.GetTestXml()); } [Fact] @@ -56,7 +57,7 @@ namespace WixToolsetTest.CoreIntegration { var original = ""; var expected = ""; - Assert.Equal(expected, original.GetTestXml()); + WixAssert.StringEqual(expected, original.GetTestXml()); } } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TransformFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/TransformFixture.cs index bdbf5c26..d69e0222 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TransformFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TransformFixture.cs @@ -120,10 +120,10 @@ namespace WixToolsetTest.CoreIntegration }, rows.Keys.OrderBy(s => s).ToArray()); Assert.True(rows.TryGetValue("ProductFeature", out var productFeatureRow)); - Assert.Equal("MsiPackage ja-jp", productFeatureRow.FieldAsString(2)); + WixAssert.StringEqual("MsiPackage ja-jp", productFeatureRow.FieldAsString(2)); Assert.True(rows.TryGetValue("ProductLanguage", out var productLanguageRow)); - Assert.Equal("1041", productLanguageRow.FieldAsString(1)); + WixAssert.StringEqual("1041", productLanguageRow.FieldAsString(1)); Assert.False(File.Exists(mstPath)); diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/UpgradeFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/UpgradeFixture.cs index 39ccc683..5a4c2aae 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/UpgradeFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/UpgradeFixture.cs @@ -34,8 +34,13 @@ namespace WixToolsetTest.CoreIntegration "-o", msiPath }); - var message = result.Messages.Single(m => m.Level == MessageLevel.Error); - Assert.Equal("Invalid product version '1.256.0'. Product version must have a major version less than 256, a minor version less than 256, and a build version less than 65536.", message.ToString()); + var errorMessages = result.Messages.Where(m => m.Level == MessageLevel.Error) + .Select(m => m.ToString()) + .ToArray(); + WixAssert.CompareLineByLine(new[] + { + "Invalid product version '1.256.0'. Product version must have a major version less than 256, a minor version less than 256, and a build version less than 65536.", + }, errorMessages); Assert.Equal(242, result.ExitCode); } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/VariableResolverFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/VariableResolverFixture.cs index 15e5d334..f8331a86 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/VariableResolverFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/VariableResolverFixture.cs @@ -4,6 +4,7 @@ namespace WixToolsetTest.CoreIntegration { using System.Collections.Generic; + using WixBuildTools.TestSupport; using WixToolset.Core; using WixToolset.Data; using WixToolset.Data.Bind; @@ -30,23 +31,23 @@ namespace WixToolsetTest.CoreIntegration variableResolver.AddLocalization(localization); var result = variableResolver.ResolveVariables(null, "These are not the loc strings you're looking for."); - Assert.Equal("These are not the loc strings you're looking for.", result.Value); + WixAssert.StringEqual("These are not the loc strings you're looking for.", result.Value); Assert.False(result.UpdatedValue); result = variableResolver.ResolveVariables(null, "Welcome to !(loc.ProductName)"); - Assert.Equal("Welcome to Localized Product Name", result.Value); + WixAssert.StringEqual("Welcome to Localized Product Name", result.Value); Assert.True(result.UpdatedValue); result = variableResolver.ResolveVariables(null, "Welcome to !(loc.ProductNameEdition)"); - Assert.Equal("Welcome to Localized Product Name Enterprise Edition", result.Value); + WixAssert.StringEqual("Welcome to Localized Product Name Enterprise Edition", result.Value); Assert.True(result.UpdatedValue); result = variableResolver.ResolveVariables(null, "Welcome to !(loc.ProductNameEditionVersion)"); - Assert.Equal("Welcome to Localized Product Name Enterprise Edition v1.2.3", result.Value); + WixAssert.StringEqual("Welcome to Localized Product Name Enterprise Edition v1.2.3", result.Value); Assert.True(result.UpdatedValue); result = variableResolver.ResolveVariables(null, "Welcome to !(bind.property.ProductVersion)"); - Assert.Equal("Welcome to !(bind.property.ProductVersion)", result.Value); + WixAssert.StringEqual("Welcome to !(bind.property.ProductVersion)", result.Value); Assert.False(result.UpdatedValue); Assert.True(result.DelayedResolve); @@ -54,20 +55,20 @@ namespace WixToolsetTest.CoreIntegration Assert.Throws(() => variableResolver.ResolveVariables(null, withUnknownLocString)); result = variableResolver.ResolveVariables(null, withUnknownLocString, errorOnUnknown: false); - Assert.Equal(withUnknownLocString, result.Value); + WixAssert.StringEqual(withUnknownLocString, result.Value); Assert.False(result.UpdatedValue); result = variableResolver.ResolveVariables(null, "Welcome to !!(loc.UnknownLocalizationVariable)"); - Assert.Equal("Welcome to !(loc.UnknownLocalizationVariable)", result.Value); + WixAssert.StringEqual("Welcome to !(loc.UnknownLocalizationVariable)", result.Value); Assert.True(result.UpdatedValue); result = variableResolver.ResolveVariables(null, "Welcome to !!(loc.UnknownLocalizationVariable) v!(bind.property.ProductVersion)"); - Assert.Equal("Welcome to !(loc.UnknownLocalizationVariable) v!(bind.property.ProductVersion)", result.Value); + WixAssert.StringEqual("Welcome to !(loc.UnknownLocalizationVariable) v!(bind.property.ProductVersion)", result.Value); Assert.True(result.UpdatedValue); Assert.True(result.DelayedResolve); result = variableResolver.ResolveVariables(null, "Welcome to !(loc.ProductNameEditionVersion) !!(loc.UnknownLocalizationVariable) v!(bind.property.ProductVersion)"); - Assert.Equal("Welcome to Localized Product Name Enterprise Edition v1.2.3 !(loc.UnknownLocalizationVariable) v!(bind.property.ProductVersion)", result.Value); + WixAssert.StringEqual("Welcome to Localized Product Name Enterprise Edition v1.2.3 !(loc.UnknownLocalizationVariable) v!(bind.property.ProductVersion)", result.Value); Assert.True(result.UpdatedValue); Assert.True(result.DelayedResolve); } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/VersionFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/VersionFixture.cs index c3758c7e..2a325aa4 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/VersionFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/VersionFixture.cs @@ -33,8 +33,13 @@ namespace WixToolsetTest.CoreIntegration "-o", msiPath }); - var message = result.Messages.Single(m => m.Level == MessageLevel.Error); - Assert.Equal("Invalid product version '257.0.0'. Product version must have a major version less than 256, a minor version less than 256, and a build version less than 65536.", message.ToString()); + var errorMessages = result.Messages.Where(m => m.Level == MessageLevel.Error) + .Select(m => m.ToString()) + .ToArray(); + WixAssert.CompareLineByLine(new[] + { + "Invalid product version '257.0.0'. Product version must have a major version less than 256, a minor version less than 256, and a build version less than 65536.", + }, errorMessages); Assert.Equal(242, result.ExitCode); } } @@ -79,7 +84,7 @@ namespace WixToolsetTest.CoreIntegration var propertyTable = Query.QueryDatabase(msiPath, new[] { "Property" }).Select(r => r.Split('\t')).ToDictionary(r => r[0].Substring("Property:".Length), r => r[1]); Assert.True(propertyTable.TryGetValue("ProductVersion", out var productVersion)); - Assert.Equal("255.255.65535", productVersion); + WixAssert.StringEqual("255.255.65535", productVersion); var extractResult = BundleExtractor.ExtractAllContainers(null, bundlePath, Path.Combine(baseFolder, "ba"), Path.Combine(baseFolder, "attached"), Path.Combine(baseFolder, "extract")); extractResult.AssertSuccess(); @@ -87,7 +92,7 @@ namespace WixToolsetTest.CoreIntegration var bundleVersion = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Registration/@Version") .Cast() .Single(); - Assert.Equal("2022.3.9-preview.0-build.5+0987654321abcdef1234567890", bundleVersion.Value); + WixAssert.StringEqual("2022.3.9-preview.0-build.5+0987654321abcdef1234567890", bundleVersion.Value); } } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs index 942f253f..2d72dcbd 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs @@ -63,8 +63,8 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); var fileSymbol = section.Symbols.OfType().First(); - Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); - Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); + WixAssert.StringEqual(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + WixAssert.StringEqual(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); } } @@ -133,8 +133,8 @@ namespace WixToolsetTest.CoreIntegration { var fileSymbol = section.Symbols.OfType().Single(); - Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); - Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); + WixAssert.StringEqual(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + WixAssert.StringEqual(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); } { @@ -142,7 +142,7 @@ namespace WixToolsetTest.CoreIntegration var path = binary[BinarySymbolFields.Data].AsPath().Path; Assert.StartsWith(Path.Combine(baseFolder, @"obj\Example.Extension"), path); Assert.EndsWith(@"wix-ir\example.txt", path); - Assert.Equal(@"BinFromWir", binary.Id.Id); + WixAssert.StringEqual(@"BinFromWir", binary.Id.Id); } } } @@ -188,8 +188,8 @@ namespace WixToolsetTest.CoreIntegration { var fileSymbol = section.Symbols.OfType().Single(); - Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); - Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); + WixAssert.StringEqual(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + WixAssert.StringEqual(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); } { @@ -197,7 +197,7 @@ namespace WixToolsetTest.CoreIntegration var path = binary[BinarySymbolFields.Data].AsPath().Path; Assert.StartsWith(Path.Combine(baseFolder, @"obj\test"), path); Assert.EndsWith(@"wix-ir\example.txt", path); - Assert.Equal(@"BinFromWir", binary.Id.Id); + WixAssert.StringEqual(@"BinFromWir", binary.Id.Id); } } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs index 184b291b..484e5dc1 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs @@ -182,8 +182,8 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); var wixFile = section.Symbols.OfType().First(); - Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[FileSymbolFields.Source].AsPath().Path); - Assert.Equal(@"test.txt", wixFile[FileSymbolFields.Source].PreviousValue.AsPath().Path); + WixAssert.StringEqual(Path.Combine(folder, @"data\test.txt"), wixFile[FileSymbolFields.Source].AsPath().Path); + WixAssert.StringEqual(@"test.txt", wixFile[FileSymbolFields.Source].PreviousValue.AsPath().Path); } } @@ -240,7 +240,7 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); var wixFile = section.Symbols.OfType().First(); - Assert.Equal(Path.Combine(folder, @"data\test2.txt"), wixFile.Data.Path); + WixAssert.StringEqual(Path.Combine(folder, @"data\test2.txt"), wixFile.Data.Path); } } @@ -284,12 +284,12 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); var fileSymbol = section.Symbols.OfType().Single(); - Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); - Assert.Equal(@"example.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); + WixAssert.StringEqual(Path.Combine(folder, @"data\example.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); + WixAssert.StringEqual(@"example.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); var example = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).Single(); - Assert.Equal("Foo", example.Id?.Id); - Assert.Equal("Bar", example[1].AsString()); + WixAssert.StringEqual("Foo", example.Id?.Id); + WixAssert.StringEqual("Bar", example[1].AsString()); } } @@ -345,13 +345,13 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); var fileSymbols = section.Symbols.OfType().OrderBy(t => Path.GetFileName(t.Source.Path)).ToArray(); - Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileSymbols[0][FileSymbolFields.Source].AsPath().Path); - Assert.Equal(@"example.txt", fileSymbols[0][FileSymbolFields.Source].PreviousValue.AsPath().Path); - Assert.Equal(Path.Combine(folder, @"data\other.txt"), fileSymbols[1][FileSymbolFields.Source].AsPath().Path); - Assert.Equal(@"other.txt", fileSymbols[1][FileSymbolFields.Source].PreviousValue.AsPath().Path); + WixAssert.StringEqual(Path.Combine(folder, @"data\example.txt"), fileSymbols[0][FileSymbolFields.Source].AsPath().Path); + WixAssert.StringEqual(@"example.txt", fileSymbols[0][FileSymbolFields.Source].PreviousValue.AsPath().Path); + WixAssert.StringEqual(Path.Combine(folder, @"data\other.txt"), fileSymbols[1][FileSymbolFields.Source].AsPath().Path); + WixAssert.StringEqual(@"other.txt", fileSymbols[1][FileSymbolFields.Source].PreviousValue.AsPath().Path); var examples = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).ToArray(); - WixAssert.CompareLineByLine(new string[] { "Foo", "Other" }, examples.Select(t => t.Id?.Id).ToArray()); + WixAssert.CompareLineByLine(new[] { "Foo", "Other" }, examples.Select(t => t.Id?.Id).ToArray()); WixAssert.CompareLineByLine(new[] { "filF5_pLhBuF5b4N9XEo52g_hUM5Lo", "filvxdStJhRE_M5kbpLsTZJXbs34Sg" }, examples.Select(t => t[0].AsString()).ToArray()); WixAssert.CompareLineByLine(new[] { "Bar", "Value" }, examples.Select(t => t[1].AsString()).ToArray()); } diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs index 0f7f8a88..f9a13312 100644 --- a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs +++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs @@ -399,7 +399,7 @@ namespace WixToolsetTest.Sdk var path = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories) .Select(s => s.Substring(baseFolder.Length + 1)) .Single(); - Assert.Equal(@"bin\x86\Release\MsiPackage.wixipl", path); + WixAssert.StringEqual(@"bin\x86\Release\MsiPackage.wixipl", path); } } diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs index cb14bc43..f1fa2453 100644 --- a/src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs +++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs @@ -66,7 +66,7 @@ namespace WixToolsetTest.Sdk var section = intermediate.Sections.Single(); var fileSymbol = section.Symbols.OfType().Single(); - Assert.Equal(@"SourceDir\HeatFilePackage.wixproj", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath()?.Path); + WixAssert.StringEqual(@"SourceDir\HeatFilePackage.wixproj", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath()?.Path); } } @@ -142,8 +142,8 @@ namespace WixToolsetTest.Sdk var section = intermediate.Sections.Single(); var fileSymbols = section.Symbols.OfType().ToArray(); - Assert.Equal(@"SourceDir\MyProgram.txt", fileSymbols[0][FileSymbolFields.Source].PreviousValue.AsPath()?.Path); - Assert.Equal(@"SourceDir\MyProgram.json", fileSymbols[1][FileSymbolFields.Source].PreviousValue.AsPath()?.Path); + WixAssert.StringEqual(@"SourceDir\MyProgram.txt", fileSymbols[0][FileSymbolFields.Source].PreviousValue.AsPath()?.Path); + WixAssert.StringEqual(@"SourceDir\MyProgram.json", fileSymbols[1][FileSymbolFields.Source].PreviousValue.AsPath()?.Path); } } -- cgit v1.2.3-55-g6feb