diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-12-19 14:23:44 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-12-19 21:32:39 -0600 |
| commit | 149867e176f22fe0af1a57355a7ace820710a791 (patch) | |
| tree | b4719d0fe980bc78398c1717b3683f33afb6e1c8 /src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs | |
| parent | 0e71bdd637a6b3c34f18d4b3630d55fa4cdfd2a3 (diff) | |
| download | wix-149867e176f22fe0af1a57355a7ace820710a791.tar.gz wix-149867e176f22fe0af1a57355a7ace820710a791.tar.bz2 wix-149867e176f22fe0af1a57355a7ace820710a791.zip | |
Add more failing tests and label them with the issue number.
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs | 39 |
1 files changed, 36 insertions, 3 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs index 699155d4..3b13d8f5 100644 --- a/src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs | |||
| @@ -39,7 +39,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 39 | 39 | ||
| 40 | Assert.True(File.Exists(msiPath)); | 40 | Assert.True(File.Exists(msiPath)); |
| 41 | var results = Query.QueryDatabase(msiPath, new[] { "Registry" }); | 41 | var results = Query.QueryDatabase(msiPath, new[] { "Registry" }); |
| 42 | Assert.Equal(new[] | 42 | WixAssert.CompareLineByLine(new[] |
| 43 | { | 43 | { |
| 44 | "Registry:reg04OIwIchl.9ZTjisTT6NzGSsQSM\t2\tPath\\To\\AnotherKey\tSecret\t#x\tMiscComponent", | 44 | "Registry:reg04OIwIchl.9ZTjisTT6NzGSsQSM\t2\tPath\\To\\AnotherKey\tSecret\t#x\tMiscComponent", |
| 45 | "Registry:regEblTuusqFNSUQNy88zaP_UA5kIY\t2\tPath\\To\\Key\t\t1.0.1234.123\tMiscComponent", | 45 | "Registry:regEblTuusqFNSUQNy88zaP_UA5kIY\t2\tPath\\To\\Key\t\t1.0.1234.123\tMiscComponent", |
| @@ -71,7 +71,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 71 | result.AssertSuccess(); | 71 | result.AssertSuccess(); |
| 72 | 72 | ||
| 73 | var results = Query.QueryDatabase(msiPath, new[] { "Registry" }); | 73 | var results = Query.QueryDatabase(msiPath, new[] { "Registry" }); |
| 74 | Assert.Equal(new[] | 74 | WixAssert.CompareLineByLine(new[] |
| 75 | { | 75 | { |
| 76 | "Registry:regitq_Wx9LfvJuNSc2un6gIHAzr4A\t2\tPath\\To\\AnotherKey\tSecret\t#x\tMultiStringComponent", | 76 | "Registry:regitq_Wx9LfvJuNSc2un6gIHAzr4A\t2\tPath\\To\\AnotherKey\tSecret\t#x\tMultiStringComponent", |
| 77 | "Registry:regmeTJMpOD41igfxhTcUVZ7kNG1Mo\t2\tPath\\To\\Key\t\ta[~]b[~][~]c[~]\tMultiStringComponent", | 77 | "Registry:regmeTJMpOD41igfxhTcUVZ7kNG1Mo\t2\tPath\\To\\Key\t\ta[~]b[~][~]c[~]\tMultiStringComponent", |
| @@ -104,11 +104,44 @@ namespace WixToolsetTest.CoreIntegration | |||
| 104 | 104 | ||
| 105 | Assert.True(File.Exists(msiPath)); | 105 | Assert.True(File.Exists(msiPath)); |
| 106 | var results = Query.QueryDatabase(msiPath, new[] { "Registry" }); | 106 | var results = Query.QueryDatabase(msiPath, new[] { "Registry" }); |
| 107 | Assert.Equal(new[] | 107 | WixAssert.CompareLineByLine(new[] |
| 108 | { | 108 | { |
| 109 | "Registry:RemoveAKeyName\t2\tAKeyName\t-\t\tRemoveRegistryKeyComp", | 109 | "Registry:RemoveAKeyName\t2\tAKeyName\t-\t\tRemoveRegistryKeyComp", |
| 110 | }, results); | 110 | }, results); |
| 111 | } | 111 | } |
| 112 | } | 112 | } |
| 113 | |||
| 114 | [Fact(Skip = "Test demonstrates failure")] //https://github.com/wixtoolset/issues/issues/4753 | ||
| 115 | public void PopulatesRegistryTableWithoutExtraBackslash() | ||
| 116 | { | ||
| 117 | var folder = TestData.Get(@"TestData"); | ||
| 118 | |||
| 119 | using (var fs = new DisposableFileSystem()) | ||
| 120 | { | ||
| 121 | var baseFolder = fs.GetFolder(); | ||
| 122 | var intermediateFolder = Path.Combine(baseFolder, "obj"); | ||
| 123 | var msiPath = Path.Combine(baseFolder, @"bin\test.msi"); | ||
| 124 | |||
| 125 | var result = WixRunner.Execute(new[] | ||
| 126 | { | ||
| 127 | "build", | ||
| 128 | Path.Combine(folder, "Registry", "RegistryKeyEndingWithBackslash.wxs"), | ||
| 129 | Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"), | ||
| 130 | "-bindpath", Path.Combine(folder, "SingleFile", "data"), | ||
| 131 | "-intermediateFolder", intermediateFolder, | ||
| 132 | "-o", msiPath | ||
| 133 | }); | ||
| 134 | |||
| 135 | result.AssertSuccess(); | ||
| 136 | |||
| 137 | Assert.True(File.Exists(msiPath)); | ||
| 138 | var results = Query.QueryDatabase(msiPath, new[] { "Registry" }); | ||
| 139 | WixAssert.CompareLineByLine(new[] | ||
| 140 | { | ||
| 141 | "Registry:reg1\t2\tSoftware\\WBM\\WB\t*\t\tMiscComponent", | ||
| 142 | "Registry:reg2\t2\tSoftware\\WBM\\WB\tInstallationPath\t[INSTALLFOLDER]\tMiscComponent", | ||
| 143 | }, results); | ||
| 144 | } | ||
| 145 | } | ||
| 113 | } | 146 | } |
| 114 | } | 147 | } |
