diff options
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 848e4aa2..0125dcc1 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | |||
@@ -20,7 +20,7 @@ namespace WixToolsetTest.Util | |||
20 | var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); | 20 | var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); |
21 | 21 | ||
22 | var results = build.BuildAndQuery(Build, "Binary", "CustomAction", "Wix4FileShare", "Wix4FileSharePermissions"); | 22 | var results = build.BuildAndQuery(Build, "Binary", "CustomAction", "Wix4FileShare", "Wix4FileSharePermissions"); |
23 | Assert.Equal(new[] | 23 | WixAssert.CompareLineByLine(new[] |
24 | { | 24 | { |
25 | "Binary:Wix4UtilCA_X86\t[Binary data]", | 25 | "Binary:Wix4UtilCA_X86\t[Binary data]", |
26 | "CustomAction:Wix4ConfigureSmbInstall_X86\t1\tWix4UtilCA_X86\tConfigureSmbInstall\t", | 26 | "CustomAction:Wix4ConfigureSmbInstall_X86\t1\tWix4UtilCA_X86\tConfigureSmbInstall\t", |
@@ -41,7 +41,7 @@ namespace WixToolsetTest.Util | |||
41 | var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); | 41 | var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); |
42 | 42 | ||
43 | var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4FileShare", "Wix4FileSharePermissions"); | 43 | var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4FileShare", "Wix4FileSharePermissions"); |
44 | Assert.Equal(new[] | 44 | WixAssert.CompareLineByLine(new[] |
45 | { | 45 | { |
46 | "Binary:Wix4UtilCA_X64\t[Binary data]", | 46 | "Binary:Wix4UtilCA_X64\t[Binary data]", |
47 | "CustomAction:Wix4ConfigureSmbInstall_X64\t1\tWix4UtilCA_X64\tConfigureSmbInstall\t", | 47 | "CustomAction:Wix4ConfigureSmbInstall_X64\t1\tWix4UtilCA_X64\tConfigureSmbInstall\t", |
@@ -62,7 +62,7 @@ namespace WixToolsetTest.Util | |||
62 | var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); | 62 | var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); |
63 | 63 | ||
64 | var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4CloseApplication"); | 64 | var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4CloseApplication"); |
65 | Assert.Equal(new[] | 65 | WixAssert.CompareLineByLine(new[] |
66 | { | 66 | { |
67 | "Binary:Wix4UtilCA_A64\t[Binary data]", | 67 | "Binary:Wix4UtilCA_A64\t[Binary data]", |
68 | "CustomAction:Wix4CheckRebootRequired_A64\t65\tWix4UtilCA_A64\tWixCheckRebootRequired\t", | 68 | "CustomAction:Wix4CheckRebootRequired_A64\t65\tWix4UtilCA_A64\tWixCheckRebootRequired\t", |
@@ -79,7 +79,7 @@ namespace WixToolsetTest.Util | |||
79 | var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); | 79 | var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); |
80 | 80 | ||
81 | var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveFile", "Wix4InternetShortcut"); | 81 | var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveFile", "Wix4InternetShortcut"); |
82 | Assert.Equal(new[] | 82 | WixAssert.CompareLineByLine(new[] |
83 | { | 83 | { |
84 | "Binary:Wix4UtilCA_X64\t[Binary data]", | 84 | "Binary:Wix4UtilCA_X64\t[Binary data]", |
85 | "CustomAction:Wix4CreateInternetShortcuts_X64\t3073\tWix4UtilCA_X64\tWixCreateInternetShortcuts\t", | 85 | "CustomAction:Wix4CreateInternetShortcuts_X64\t3073\tWix4UtilCA_X64\tWixCreateInternetShortcuts\t", |
@@ -97,12 +97,12 @@ namespace WixToolsetTest.Util | |||
97 | var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); | 97 | var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); |
98 | 98 | ||
99 | var results = build.BuildAndQuery(BuildX64, "Wix4SecureObject"); | 99 | var results = build.BuildAndQuery(BuildX64, "Wix4SecureObject"); |
100 | Assert.Equal(new[] | 100 | WixAssert.CompareLineByLine(new[] |
101 | { | 101 | { |
102 | "Wix4SecureObject:ExampleRegistryKey\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", | 102 | "Wix4SecureObject:ExampleRegistryKey\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", |
103 | "Wix4SecureObject:filF5_pLhBuF5b4N9XEo52g_hUM5Lo\tFile\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", | 103 | "Wix4SecureObject:filF5_pLhBuF5b4N9XEo52g_hUM5Lo\tFile\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", |
104 | "Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", | 104 | "Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", |
105 | "Wix4SecureObject:regO7jgNdgqG_TfURLgXPo2jRcxzx8\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", | 105 | "Wix4SecureObject:regL6DnQ9yJpDJH5OdcVji4YXsdX2c\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", |
106 | "Wix4SecureObject:testsvc\tServiceInstall\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", | 106 | "Wix4SecureObject:testsvc\tServiceInstall\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", |
107 | }, results.OrderBy(s => s).ToArray()); | 107 | }, results.OrderBy(s => s).ToArray()); |
108 | } | 108 | } |
@@ -114,7 +114,7 @@ namespace WixToolsetTest.Util | |||
114 | var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); | 114 | var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); |
115 | 115 | ||
116 | var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4EventManifest", "Wix4XmlFile"); | 116 | var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4EventManifest", "Wix4XmlFile"); |
117 | Assert.Equal(new[] | 117 | WixAssert.CompareLineByLine(new[] |
118 | { | 118 | { |
119 | "Binary:Wix4UtilCA_A64\t[Binary data]", | 119 | "Binary:Wix4UtilCA_A64\t[Binary data]", |
120 | "CustomAction:Wix4ConfigureEventManifestRegister_A64\t1\tWix4UtilCA_A64\tConfigureEventManifestRegister\t", | 120 | "CustomAction:Wix4ConfigureEventManifestRegister_A64\t1\tWix4UtilCA_A64\tConfigureEventManifestRegister\t", |
@@ -139,7 +139,7 @@ namespace WixToolsetTest.Util | |||
139 | var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); | 139 | var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); |
140 | 140 | ||
141 | var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction"); | 141 | var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction"); |
142 | Assert.Equal(new[] | 142 | WixAssert.CompareLineByLine(new[] |
143 | { | 143 | { |
144 | "Binary:Wix4UtilCA_A64\t[Binary data]", | 144 | "Binary:Wix4UtilCA_A64\t[Binary data]", |
145 | "CustomAction:Wix4BroadcastEnvironmentChange_A64\t65\tWix4UtilCA_A64\tWixBroadcastEnvironmentChange\t", | 145 | "CustomAction:Wix4BroadcastEnvironmentChange_A64\t65\tWix4UtilCA_A64\tWixBroadcastEnvironmentChange\t", |