diff options
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/WixToolsetTest.Converters/ConditionFixture.cs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/test/WixToolsetTest.Converters/ConditionFixture.cs b/src/test/WixToolsetTest.Converters/ConditionFixture.cs index 3fa7c031..1b8a7604 100644 --- a/src/test/WixToolsetTest.Converters/ConditionFixture.cs +++ b/src/test/WixToolsetTest.Converters/ConditionFixture.cs | |||
@@ -20,6 +20,7 @@ namespace WixToolsetTest.Converters | |||
20 | " <UI>", | 20 | " <UI>", |
21 | " <Dialog Id='Dlg1'>", | 21 | " <Dialog Id='Dlg1'>", |
22 | " <Control Id='Control1'>", | 22 | " <Control Id='Control1'>", |
23 | " <Condition Action='disable'>x=y</Condition>", | ||
23 | " <Condition Action='hide'>a<>b</Condition>", | 24 | " <Condition Action='hide'>a<>b</Condition>", |
24 | " </Control>", | 25 | " </Control>", |
25 | " </Dialog>", | 26 | " </Dialog>", |
@@ -33,7 +34,8 @@ namespace WixToolsetTest.Converters | |||
33 | " <Fragment>", | 34 | " <Fragment>", |
34 | " <UI>", | 35 | " <UI>", |
35 | " <Dialog Id=\"Dlg1\">", | 36 | " <Dialog Id=\"Dlg1\">", |
36 | " <Control Id=\"Control1\" HideCondition=\"a<>b\">", | 37 | " <Control Id=\"Control1\" DisableCondition=\"x=y\" HideCondition=\"a<>b\">", |
38 | " ", | ||
37 | " ", | 39 | " ", |
38 | " </Control>", | 40 | " </Control>", |
39 | " </Dialog>", | 41 | " </Dialog>", |
@@ -48,7 +50,7 @@ namespace WixToolsetTest.Converters | |||
48 | var converter = new WixConverter(messaging, 2, null, null); | 50 | var converter = new WixConverter(messaging, 2, null, null); |
49 | 51 | ||
50 | var errors = converter.ConvertDocument(document); | 52 | var errors = converter.ConvertDocument(document); |
51 | Assert.Equal(3, errors); | 53 | Assert.Equal(4, errors); |
52 | 54 | ||
53 | var actualLines = UnformattedDocumentLines(document); | 55 | var actualLines = UnformattedDocumentLines(document); |
54 | CompareLineByLine(expected, actualLines); | 56 | CompareLineByLine(expected, actualLines); |
@@ -136,6 +138,9 @@ namespace WixToolsetTest.Converters | |||
136 | " <Condition Message='Stop the install'>", | 138 | " <Condition Message='Stop the install'>", |
137 | " 1<2", | 139 | " 1<2", |
138 | " </Condition>", | 140 | " </Condition>", |
141 | " <Condition Message='Do not stop'>", | ||
142 | " 1=2", | ||
143 | " </Condition>", | ||
139 | " </Fragment>", | 144 | " </Fragment>", |
140 | "</Wix>"); | 145 | "</Wix>"); |
141 | 146 | ||
@@ -144,6 +149,7 @@ namespace WixToolsetTest.Converters | |||
144 | "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">", | 149 | "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">", |
145 | " <Fragment>", | 150 | " <Fragment>", |
146 | " <Launch Condition=\"1<2\" Message=\"Stop the install\" />", | 151 | " <Launch Condition=\"1<2\" Message=\"Stop the install\" />", |
152 | " <Launch Condition=\"1=2\" Message=\"Do not stop\" />", | ||
147 | " </Fragment>", | 153 | " </Fragment>", |
148 | "</Wix>" | 154 | "</Wix>" |
149 | }; | 155 | }; |
@@ -154,7 +160,7 @@ namespace WixToolsetTest.Converters | |||
154 | var converter = new WixConverter(messaging, 2, null, null); | 160 | var converter = new WixConverter(messaging, 2, null, null); |
155 | 161 | ||
156 | var errors = converter.ConvertDocument(document); | 162 | var errors = converter.ConvertDocument(document); |
157 | Assert.Equal(3, errors); | 163 | Assert.Equal(4, errors); |
158 | 164 | ||
159 | var actualLines = UnformattedDocumentLines(document); | 165 | var actualLines = UnformattedDocumentLines(document); |
160 | CompareLineByLine(expected, actualLines); | 166 | CompareLineByLine(expected, actualLines); |