diff options
Diffstat (limited to 'src/ext')
8 files changed, 16 insertions, 16 deletions
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 | |||
17 | var build = new Builder(folder, typeof(DifxAppExtensionFactory), new[] { folder }); | 17 | var build = new Builder(folder, typeof(DifxAppExtensionFactory), new[] { folder }); |
18 | 18 | ||
19 | var results = build.BuildAndQuery(Build, "CustomAction"); | 19 | var results = build.BuildAndQuery(Build, "CustomAction"); |
20 | Assert.Equal(new[] | 20 | WixAssert.CompareLineByLine(new[] |
21 | { | 21 | { |
22 | "CustomAction:MsiCleanupOnSuccess\t1\tDIFxApp.dll\tCleanupOnSuccess\t", | 22 | "CustomAction:MsiCleanupOnSuccess\t1\tDIFxApp.dll\tCleanupOnSuccess\t", |
23 | "CustomAction:MsiInstallDrivers\t3073\tDIFxAppA.dll\tInstallDriverPackages\t", | 23 | "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 | |||
17 | var build = new Builder(folder, typeof(DirectXExtensionFactory), new[] { folder }); | 17 | var build = new Builder(folder, typeof(DirectXExtensionFactory), new[] { folder }); |
18 | 18 | ||
19 | var results = build.BuildAndQuery(Build, "CustomAction"); | 19 | var results = build.BuildAndQuery(Build, "CustomAction"); |
20 | Assert.Equal(new[] | 20 | WixAssert.CompareLineByLine(new[] |
21 | { | 21 | { |
22 | "CustomAction:WixQueryDirectXCaps\t65\tDirectXCA\tWixQueryDirectXCaps\t", | 22 | "CustomAction:WixQueryDirectXCaps\t65\tDirectXCA\tWixQueryDirectXCaps\t", |
23 | }, results); | 23 | }, 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 | |||
17 | var build = new Builder(folder, typeof(FirewallExtensionFactory), new[] { folder }); | 17 | var build = new Builder(folder, typeof(FirewallExtensionFactory), new[] { folder }); |
18 | 18 | ||
19 | var results = build.BuildAndQuery(Build, "Wix4FirewallException", "CustomAction"); | 19 | var results = build.BuildAndQuery(Build, "Wix4FirewallException", "CustomAction"); |
20 | Assert.Equal(new[] | 20 | WixAssert.CompareLineByLine(new[] |
21 | { | 21 | { |
22 | "CustomAction:Wix4ExecFirewallExceptionsInstall_X86\t3073\tWix4FWCA_X86\tExecFirewallExceptions\t", | 22 | "CustomAction:Wix4ExecFirewallExceptionsInstall_X86\t3073\tWix4FWCA_X86\tExecFirewallExceptions\t", |
23 | "CustomAction:Wix4ExecFirewallExceptionsUninstall_X86\t3073\tWix4FWCA_X86\tExecFirewallExceptions\t", | 23 | "CustomAction:Wix4ExecFirewallExceptionsUninstall_X86\t3073\tWix4FWCA_X86\tExecFirewallExceptions\t", |
@@ -36,7 +36,7 @@ namespace WixToolsetTest.Firewall | |||
36 | var build = new Builder(folder, typeof(FirewallExtensionFactory), new[] { folder }); | 36 | var build = new Builder(folder, typeof(FirewallExtensionFactory), new[] { folder }); |
37 | 37 | ||
38 | var results = build.BuildAndQuery(BuildARM64, "Wix4FirewallException", "CustomAction"); | 38 | var results = build.BuildAndQuery(BuildARM64, "Wix4FirewallException", "CustomAction"); |
39 | Assert.Equal(new[] | 39 | WixAssert.CompareLineByLine(new[] |
40 | { | 40 | { |
41 | "CustomAction:Wix4ExecFirewallExceptionsInstall_A64\t3073\tWix4FWCA_A64\tExecFirewallExceptions\t", | 41 | "CustomAction:Wix4ExecFirewallExceptionsInstall_A64\t3073\tWix4FWCA_A64\tExecFirewallExceptions\t", |
42 | "CustomAction:Wix4ExecFirewallExceptionsUninstall_A64\t3073\tWix4FWCA_A64\tExecFirewallExceptions\t", | 42 | "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 | |||
17 | var build = new Builder(folder, typeof(IisExtensionFactory), new[] { folder }); | 17 | var build = new Builder(folder, typeof(IisExtensionFactory), new[] { folder }); |
18 | 18 | ||
19 | var results = build.BuildAndQuery(Build, "Wix4IIsWebSite", "Wix4IIsWebAddress"); | 19 | var results = build.BuildAndQuery(Build, "Wix4IIsWebSite", "Wix4IIsWebAddress"); |
20 | Assert.Equal(new[] | 20 | WixAssert.CompareLineByLine(new[] |
21 | { | 21 | { |
22 | "Wix4IIsWebAddress:TestAddress\tTest\t\t[PORT]\t\t0", | 22 | "Wix4IIsWebAddress:TestAddress\tTest\t\t[PORT]\t\t0", |
23 | "Wix4IIsWebSite:Test\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tTest web server\t\tTestWebSiteProductDirectory\t2\t2\tTestAddress\tReadAndExecute\t\t\t\t", | 23 | "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 | |||
17 | var build = new Builder(folder, typeof(MsmqExtensionFactory), new[] { folder }); | 17 | var build = new Builder(folder, typeof(MsmqExtensionFactory), new[] { folder }); |
18 | 18 | ||
19 | var results = build.BuildAndQuery(Build, "MessageQueue"); | 19 | var results = build.BuildAndQuery(Build, "MessageQueue"); |
20 | Assert.Equal(new[] | 20 | WixAssert.CompareLineByLine(new[] |
21 | { | 21 | { |
22 | "MessageQueue:TestMQ\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\t\t\tMQLabel\t\tMQPath\t\t\t\t0", | 22 | "MessageQueue:TestMQ\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\t\t\tMQLabel\t\tMQPath\t\t\t\t0", |
23 | }, results); | 23 | }, 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 | |||
68 | var build = new Builder(folder, typeof(NetfxExtensionFactory), new[] { folder }); | 68 | var build = new Builder(folder, typeof(NetfxExtensionFactory), new[] { folder }); |
69 | 69 | ||
70 | var results = build.BuildAndQuery(Build, "Binary", "CustomAction", "Wix4NetFxNativeImage"); | 70 | var results = build.BuildAndQuery(Build, "Binary", "CustomAction", "Wix4NetFxNativeImage"); |
71 | Assert.Equal(new[] | 71 | WixAssert.CompareLineByLine(new[] |
72 | { | 72 | { |
73 | "Binary:Wix4NetFxCA_X86\t[Binary data]", | 73 | "Binary:Wix4NetFxCA_X86\t[Binary data]", |
74 | "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X86\t3649\tWix4NetFxCA_X86\tExecNetFx\t", | 74 | "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X86\t3649\tWix4NetFxCA_X86\tExecNetFx\t", |
@@ -87,7 +87,7 @@ namespace WixToolsetTest.Netfx | |||
87 | var build = new Builder(folder, typeof(NetfxExtensionFactory), new[] { folder }); | 87 | var build = new Builder(folder, typeof(NetfxExtensionFactory), new[] { folder }); |
88 | 88 | ||
89 | var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4NetFxNativeImage"); | 89 | var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4NetFxNativeImage"); |
90 | Assert.Equal(new[] | 90 | WixAssert.CompareLineByLine(new[] |
91 | { | 91 | { |
92 | "Binary:Wix4NetFxCA_X64\t[Binary data]", | 92 | "Binary:Wix4NetFxCA_X64\t[Binary data]", |
93 | "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t", | 93 | "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t", |
@@ -106,7 +106,7 @@ namespace WixToolsetTest.Netfx | |||
106 | var build = new Builder(folder, typeof(NetfxExtensionFactory), new[] { folder }); | 106 | var build = new Builder(folder, typeof(NetfxExtensionFactory), new[] { folder }); |
107 | 107 | ||
108 | var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4NetFxNativeImage"); | 108 | var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4NetFxNativeImage"); |
109 | Assert.Equal(new[] | 109 | WixAssert.CompareLineByLine(new[] |
110 | { | 110 | { |
111 | "Binary:Wix4NetFxCA_A64\t[Binary data]", | 111 | "Binary:Wix4NetFxCA_A64\t[Binary data]", |
112 | "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_A64\t3649\tWix4NetFxCA_A64\tExecNetFx\t", | 112 | "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 | |||
18 | var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); | 18 | var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); |
19 | 19 | ||
20 | var results = build.BuildAndQuery(Build, "Property"); | 20 | var results = build.BuildAndQuery(Build, "Property"); |
21 | Assert.Equal(new[] | 21 | WixAssert.CompareLineByLine(new[] |
22 | { | 22 | { |
23 | "Property:WixUI_Mode\tAdvanced", | 23 | "Property:WixUI_Mode\tAdvanced", |
24 | }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray()); | 24 | }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray()); |
@@ -32,7 +32,7 @@ namespace WixToolsetTest.UI | |||
32 | var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); | 32 | var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); |
33 | 33 | ||
34 | var results = build.BuildAndQuery(Build, "Property"); | 34 | var results = build.BuildAndQuery(Build, "Property"); |
35 | Assert.Equal(new[] | 35 | WixAssert.CompareLineByLine(new[] |
36 | { | 36 | { |
37 | "Property:WixUI_Mode\tFeatureTree", | 37 | "Property:WixUI_Mode\tFeatureTree", |
38 | }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray()); | 38 | }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray()); |
@@ -46,7 +46,7 @@ namespace WixToolsetTest.UI | |||
46 | var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); | 46 | var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); |
47 | 47 | ||
48 | var results = build.BuildAndQuery(Build, "Property"); | 48 | var results = build.BuildAndQuery(Build, "Property"); |
49 | Assert.Equal(new[] | 49 | WixAssert.CompareLineByLine(new[] |
50 | { | 50 | { |
51 | "Property:WixUI_Mode\tInstallDir", | 51 | "Property:WixUI_Mode\tInstallDir", |
52 | }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray()); | 52 | }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray()); |
@@ -60,7 +60,7 @@ namespace WixToolsetTest.UI | |||
60 | var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); | 60 | var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); |
61 | 61 | ||
62 | var results = build.BuildAndQuery(Build, "Property"); | 62 | var results = build.BuildAndQuery(Build, "Property"); |
63 | Assert.Equal(new[] | 63 | WixAssert.CompareLineByLine(new[] |
64 | { | 64 | { |
65 | "Property:WixUI_Mode\tMinimal", | 65 | "Property:WixUI_Mode\tMinimal", |
66 | }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray()); | 66 | }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray()); |
@@ -74,7 +74,7 @@ namespace WixToolsetTest.UI | |||
74 | var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); | 74 | var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); |
75 | 75 | ||
76 | var results = build.BuildAndQuery(Build, "Property"); | 76 | var results = build.BuildAndQuery(Build, "Property"); |
77 | Assert.Equal(new[] | 77 | WixAssert.CompareLineByLine(new[] |
78 | { | 78 | { |
79 | "Property:WixUI_Mode\tMondo", | 79 | "Property:WixUI_Mode\tMondo", |
80 | }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray()); | 80 | }, results.Where(s => s.StartsWith("Property:WixUI_Mode")).ToArray()); |
@@ -88,7 +88,7 @@ namespace WixToolsetTest.UI | |||
88 | var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); | 88 | var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder }); |
89 | 89 | ||
90 | var results = build.BuildAndQuery(BuildInGerman, "Control"); | 90 | var results = build.BuildAndQuery(BuildInGerman, "Control"); |
91 | Assert.Equal(new[] | 91 | WixAssert.CompareLineByLine(new[] |
92 | { | 92 | { |
93 | "&Ja", | 93 | "&Ja", |
94 | }, results.Where(s => s.StartsWith("Control:ErrorDlg\tY")).Select(s => s.Split('\t')[9]).ToArray()); | 94 | }, 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 | |||
16 | var build = new Builder(folder, typeof(VSExtensionFactory), new[] { folder }); | 16 | var build = new Builder(folder, typeof(VSExtensionFactory), new[] { folder }); |
17 | 17 | ||
18 | var results = build.BuildAndQuery(Build, "CustomAction"); | 18 | var results = build.BuildAndQuery(Build, "CustomAction"); |
19 | Assert.Equal(new[] | 19 | WixAssert.CompareLineByLine(new[] |
20 | { | 20 | { |
21 | "CustomAction:SetVS2010Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2010_VSIX_INSTALLER_PATH]\t", | 21 | "CustomAction:SetVS2010Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2010_VSIX_INSTALLER_PATH]\t", |
22 | "CustomAction:SetVS2012Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2012_VSIX_INSTALLER_PATH]\t", | 22 | "CustomAction:SetVS2012Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2012_VSIX_INSTALLER_PATH]\t", |