From 95b1be66d4c16b1b05b761c1771df229ac0e539c Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 31 Dec 2021 18:20:50 -0600 Subject: Try to get more helpful test failure messages. --- .../test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs | 2 +- .../test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs | 2 +- .../test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs | 4 ++-- src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs | 2 +- .../Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs | 2 +- .../NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs | 6 +++--- src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs | 12 ++++++------ .../VisualStudioExtensionFixture.cs | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/ext') diff --git a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs index edb4f889..d8f1c9ea 100644 --- a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs +++ b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs @@ -17,7 +17,7 @@ namespace WixToolsetTest.DifxApp var build = new Builder(folder, typeof(DifxAppExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(Build, "CustomAction"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "CustomAction:MsiCleanupOnSuccess\t1\tDIFxApp.dll\tCleanupOnSuccess\t", "CustomAction:MsiInstallDrivers\t3073\tDIFxAppA.dll\tInstallDriverPackages\t", diff --git a/src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs b/src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs index 81a5fb00..ae8bbbf0 100644 --- a/src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs +++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs @@ -17,7 +17,7 @@ namespace WixToolsetTest.DirectX var build = new Builder(folder, typeof(DirectXExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(Build, "CustomAction"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "CustomAction:WixQueryDirectXCaps\t65\tDirectXCA\tWixQueryDirectXCaps\t", }, results); diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs b/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs index 5804675c..f7df46e6 100644 --- a/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs +++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs @@ -17,7 +17,7 @@ namespace WixToolsetTest.Firewall var build = new Builder(folder, typeof(FirewallExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(Build, "Wix4FirewallException", "CustomAction"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "CustomAction:Wix4ExecFirewallExceptionsInstall_X86\t3073\tWix4FWCA_X86\tExecFirewallExceptions\t", "CustomAction:Wix4ExecFirewallExceptionsUninstall_X86\t3073\tWix4FWCA_X86\tExecFirewallExceptions\t", @@ -36,7 +36,7 @@ namespace WixToolsetTest.Firewall var build = new Builder(folder, typeof(FirewallExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(BuildARM64, "Wix4FirewallException", "CustomAction"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "CustomAction:Wix4ExecFirewallExceptionsInstall_A64\t3073\tWix4FWCA_A64\tExecFirewallExceptions\t", "CustomAction:Wix4ExecFirewallExceptionsUninstall_A64\t3073\tWix4FWCA_A64\tExecFirewallExceptions\t", diff --git a/src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs b/src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs index 26c95050..541426a8 100644 --- a/src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs +++ b/src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs @@ -17,7 +17,7 @@ namespace WixToolsetTest.Iis var build = new Builder(folder, typeof(IisExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(Build, "Wix4IIsWebSite", "Wix4IIsWebAddress"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Wix4IIsWebAddress:TestAddress\tTest\t\t[PORT]\t\t0", "Wix4IIsWebSite:Test\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tTest web server\t\tTestWebSiteProductDirectory\t2\t2\tTestAddress\tReadAndExecute\t\t\t\t", diff --git a/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs b/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs index 057b0a9d..a0fac3ca 100644 --- a/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs +++ b/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs @@ -17,7 +17,7 @@ namespace WixToolsetTest.Msmq var build = new Builder(folder, typeof(MsmqExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(Build, "MessageQueue"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "MessageQueue:TestMQ\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\t\t\tMQLabel\t\tMQPath\t\t\t\t0", }, results); diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs index 72d4a682..4b8b826e 100644 --- a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs +++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs @@ -68,7 +68,7 @@ namespace WixToolsetTest.Netfx var build = new Builder(folder, typeof(NetfxExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(Build, "Binary", "CustomAction", "Wix4NetFxNativeImage"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Binary:Wix4NetFxCA_X86\t[Binary data]", "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X86\t3649\tWix4NetFxCA_X86\tExecNetFx\t", @@ -87,7 +87,7 @@ namespace WixToolsetTest.Netfx var build = new Builder(folder, typeof(NetfxExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4NetFxNativeImage"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Binary:Wix4NetFxCA_X64\t[Binary data]", "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t", @@ -106,7 +106,7 @@ namespace WixToolsetTest.Netfx var build = new Builder(folder, typeof(NetfxExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4NetFxNativeImage"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Binary:Wix4NetFxCA_A64\t[Binary data]", "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_A64\t3649\tWix4NetFxCA_A64\tExecNetFx\t", diff --git a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs index 54c4c788..ca36fed5 100644 --- a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs +++ b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs @@ -18,7 +18,7 @@ namespace WixToolsetTest.UI var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); var results = build.BuildAndQuery(Build, "Property"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Property:WixUI_Mode\tAdvanced", }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray()); @@ -32,7 +32,7 @@ namespace WixToolsetTest.UI var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); var results = build.BuildAndQuery(Build, "Property"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Property:WixUI_Mode\tFeatureTree", }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray()); @@ -46,7 +46,7 @@ namespace WixToolsetTest.UI var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); var results = build.BuildAndQuery(Build, "Property"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Property:WixUI_Mode\tInstallDir", }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray()); @@ -60,7 +60,7 @@ namespace WixToolsetTest.UI var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); var results = build.BuildAndQuery(Build, "Property"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Property:WixUI_Mode\tMinimal", }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray()); @@ -74,7 +74,7 @@ namespace WixToolsetTest.UI var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); var results = build.BuildAndQuery(Build, "Property"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Property:WixUI_Mode\tMondo", }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray()); @@ -88,7 +88,7 @@ namespace WixToolsetTest.UI var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); var results = build.BuildAndQuery(BuildInGerman, "Control"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "&Ja", }, results.Where(s => s.StartsWith("Control:ErrorDlg\tY")).Select(s => s.Split('\t')[9]).ToArray()); diff --git a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs index 1a574261..dc76e8fb 100644 --- a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs +++ b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs @@ -16,7 +16,7 @@ namespace WixToolsetTest.VisualStudio var build = new Builder(folder, typeof(VSExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(Build, "CustomAction"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "CustomAction:SetVS2010Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2010_VSIX_INSTALLER_PATH]\t", "CustomAction:SetVS2012Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2012_VSIX_INSTALLER_PATH]\t", -- cgit v1.2.3-55-g6feb