diff options
author | Rob Mensching <rob@firegiant.com> | 2021-03-02 02:13:45 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2021-03-02 02:15:16 -0800 |
commit | 58c373f7c04363675ef096cb1205d7a0ded3c789 (patch) | |
tree | 19910041fbc7a8cf09a7828608de07033af3d51e /src | |
parent | 73bd35f56189da4e9f5aaf4625247078e0486887 (diff) | |
download | wix-58c373f7c04363675ef096cb1205d7a0ded3c789.tar.gz wix-58c373f7c04363675ef096cb1205d7a0ded3c789.tar.bz2 wix-58c373f7c04363675ef096cb1205d7a0ded3c789.zip |
Fix AccessModifier usage in test code
Diffstat (limited to 'src')
-rw-r--r-- | src/test/WixToolsetTest.Data/SerializeFixture.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/test/WixToolsetTest.Data/SerializeFixture.cs b/src/test/WixToolsetTest.Data/SerializeFixture.cs index 7b318cf8..56d08bc9 100644 --- a/src/test/WixToolsetTest.Data/SerializeFixture.cs +++ b/src/test/WixToolsetTest.Data/SerializeFixture.cs | |||
@@ -22,7 +22,7 @@ namespace WixToolsetTest.Data | |||
22 | 22 | ||
23 | var section = new IntermediateSection("test", SectionType.Product, 65001); | 23 | var section = new IntermediateSection("test", SectionType.Product, 65001); |
24 | 24 | ||
25 | section.Symbols.Add(new ComponentSymbol(sln, new Identifier(AccessModifier.Public, "TestComponent")) | 25 | section.Symbols.Add(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent")) |
26 | { | 26 | { |
27 | ComponentId = new Guid(1, 0, 0, new byte[8]).ToString("B"), | 27 | ComponentId = new Guid(1, 0, 0, new byte[8]).ToString("B"), |
28 | DirectoryRef = "TestFolder", | 28 | DirectoryRef = "TestFolder", |
@@ -48,7 +48,7 @@ namespace WixToolsetTest.Data | |||
48 | var symbol = (ComponentSymbol)loaded.Sections.Single().Symbols.Single(); | 48 | var symbol = (ComponentSymbol)loaded.Sections.Single().Symbols.Single(); |
49 | 49 | ||
50 | Assert.Equal("TestComponent", symbol.Id.Id); | 50 | Assert.Equal("TestComponent", symbol.Id.Id); |
51 | Assert.Equal(AccessModifier.Public, symbol.Id.Access); | 51 | Assert.Equal(AccessModifier.Global, symbol.Id.Access); |
52 | Assert.Equal("TestFolder", symbol.DirectoryRef); | 52 | Assert.Equal("TestFolder", symbol.DirectoryRef); |
53 | Assert.Equal(ComponentLocation.Either, symbol.Location); | 53 | Assert.Equal(ComponentLocation.Either, symbol.Location); |
54 | } | 54 | } |
@@ -64,7 +64,7 @@ namespace WixToolsetTest.Data | |||
64 | var sln = new SourceLineNumber("test.wxs", 1); | 64 | var sln = new SourceLineNumber("test.wxs", 1); |
65 | var section = new IntermediateSection("test", SectionType.Product, 65001); | 65 | var section = new IntermediateSection("test", SectionType.Product, 65001); |
66 | 66 | ||
67 | section.Symbols.Add(new ComponentSymbol(sln, new Identifier(AccessModifier.Public, "TestComponent")) | 67 | section.Symbols.Add(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent")) |
68 | { | 68 | { |
69 | ComponentId = new Guid(1, 0, 0, new byte[8]).ToString("B"), | 69 | ComponentId = new Guid(1, 0, 0, new byte[8]).ToString("B"), |
70 | DirectoryRef = "TestFolder", | 70 | DirectoryRef = "TestFolder", |
@@ -87,11 +87,11 @@ namespace WixToolsetTest.Data | |||
87 | var symbol = (ComponentSymbol)loaded.Sections.Single().Symbols.Single(); | 87 | var symbol = (ComponentSymbol)loaded.Sections.Single().Symbols.Single(); |
88 | 88 | ||
89 | Assert.Equal("TestComponent", symbol.Id.Id); | 89 | Assert.Equal("TestComponent", symbol.Id.Id); |
90 | Assert.Equal(AccessModifier.Public, symbol.Id.Access); | 90 | Assert.Equal(AccessModifier.Global, symbol.Id.Access); |
91 | 91 | ||
92 | wixout.Reopen(writable: true); | 92 | wixout.Reopen(writable: true); |
93 | 93 | ||
94 | section.Symbols.Add(new ComponentSymbol(sln, new Identifier(AccessModifier.Public, "NewComponent")) | 94 | section.Symbols.Add(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "NewComponent")) |
95 | { | 95 | { |
96 | ComponentId = new Guid(1, 0, 0, new byte[8]).ToString("B"), | 96 | ComponentId = new Guid(1, 0, 0, new byte[8]).ToString("B"), |
97 | }); | 97 | }); |
@@ -130,7 +130,7 @@ namespace WixToolsetTest.Data | |||
130 | 130 | ||
131 | var symbolDef = new IntermediateSymbolDefinition("CustomDef2", fieldDefs, null); | 131 | var symbolDef = new IntermediateSymbolDefinition("CustomDef2", fieldDefs, null); |
132 | 132 | ||
133 | var symbol = symbolDef.CreateSymbol(sln, new Identifier(AccessModifier.Public, "customT")); | 133 | var symbol = symbolDef.CreateSymbol(sln, new Identifier(AccessModifier.Global, "customT")); |
134 | symbol.Set(0, "foo"); | 134 | symbol.Set(0, "foo"); |
135 | symbol.Set(1, 2); | 135 | symbol.Set(1, 2); |
136 | symbol.Set(2, true); | 136 | symbol.Set(2, true); |
@@ -173,7 +173,7 @@ namespace WixToolsetTest.Data | |||
173 | 173 | ||
174 | var symbolDef = new IntermediateSymbolDefinition("CustomDef", fieldDefs, null); | 174 | var symbolDef = new IntermediateSymbolDefinition("CustomDef", fieldDefs, null); |
175 | 175 | ||
176 | var symbol = symbolDef.CreateSymbol(sln, new Identifier(AccessModifier.Public, "customT")); | 176 | var symbol = symbolDef.CreateSymbol(sln, new Identifier(AccessModifier.Global, "customT")); |
177 | symbol.Set(0, "foo"); | 177 | symbol.Set(0, "foo"); |
178 | symbol.Set(1, 2); | 178 | symbol.Set(1, 2); |
179 | symbol.Set(2, true); | 179 | symbol.Set(2, true); |
@@ -194,7 +194,7 @@ namespace WixToolsetTest.Data | |||
194 | 194 | ||
195 | var symbolDef2 = new IntermediateSymbolDefinition("CustomDef2", 1, fieldDefs2, null); | 195 | var symbolDef2 = new IntermediateSymbolDefinition("CustomDef2", 1, fieldDefs2, null); |
196 | 196 | ||
197 | var symbol2 = symbolDef2.CreateSymbol(sln, new Identifier(AccessModifier.Public, "customT2")); | 197 | var symbol2 = symbolDef2.CreateSymbol(sln, new Identifier(AccessModifier.Global, "customT2")); |
198 | symbol2.Set(0, "bar"); | 198 | symbol2.Set(0, "bar"); |
199 | symbol2.Set(1, 3); | 199 | symbol2.Set(1, 3); |
200 | symbol2.Set(2, false); | 200 | symbol2.Set(2, false); |
@@ -254,7 +254,7 @@ namespace WixToolsetTest.Data | |||
254 | 254 | ||
255 | symbolDef.AddTag("customDef"); | 255 | symbolDef.AddTag("customDef"); |
256 | 256 | ||
257 | var symbol = symbolDef.CreateSymbol(sln, new Identifier(AccessModifier.Public, "customT")); | 257 | var symbol = symbolDef.CreateSymbol(sln, new Identifier(AccessModifier.Global, "customT")); |
258 | symbol.Set(0, "foo"); | 258 | symbol.Set(0, "foo"); |
259 | symbol.Set(1, 2); | 259 | symbol.Set(1, 2); |
260 | symbol.Set(2, true); | 260 | symbol.Set(2, true); |
@@ -280,7 +280,7 @@ namespace WixToolsetTest.Data | |||
280 | symbolDef2.AddTag("customDef2"); | 280 | symbolDef2.AddTag("customDef2"); |
281 | symbolDef2.AddTag("customDef2 tag2"); | 281 | symbolDef2.AddTag("customDef2 tag2"); |
282 | 282 | ||
283 | var symbol2 = symbolDef2.CreateSymbol(sln, new Identifier(AccessModifier.Public, "customT2")); | 283 | var symbol2 = symbolDef2.CreateSymbol(sln, new Identifier(AccessModifier.Global, "customT2")); |
284 | symbol2.Set(0, "bar"); | 284 | symbol2.Set(0, "bar"); |
285 | symbol2.Set(1, 3); | 285 | symbol2.Set(1, 3); |
286 | symbol2.Set(2, false); | 286 | symbol2.Set(2, false); |
@@ -356,7 +356,7 @@ namespace WixToolsetTest.Data | |||
356 | 356 | ||
357 | var section = new IntermediateSection("test", SectionType.Product, 65001); | 357 | var section = new IntermediateSection("test", SectionType.Product, 65001); |
358 | 358 | ||
359 | section.Symbols.Add(new ComponentSymbol(sln, new Identifier(AccessModifier.Public, "TestComponent")) | 359 | section.Symbols.Add(new ComponentSymbol(sln, new Identifier(AccessModifier.Global, "TestComponent")) |
360 | { | 360 | { |
361 | ComponentId = new Guid(1, 0, 0, new byte[8]).ToString("B"), | 361 | ComponentId = new Guid(1, 0, 0, new byte[8]).ToString("B"), |
362 | DirectoryRef = "TestFolder", | 362 | DirectoryRef = "TestFolder", |