aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-03-18 21:45:53 -0400
committerBob Arnson <bob@firegiant.com>2020-03-18 21:50:00 -0400
commitc5df86a7caaa1cbff9adde6396925383ba9a2e4e (patch)
treea082d0a8eaa759a3ba78cfedb0d89a1ebfac8a8e /src/test
parentf1ddeb81aa8c709582fc11a5711b39da596f4f22 (diff)
downloadwix-c5df86a7caaa1cbff9adde6396925383ba9a2e4e.tar.gz
wix-c5df86a7caaa1cbff9adde6396925383ba9a2e4e.tar.bz2
wix-c5df86a7caaa1cbff9adde6396925383ba9a2e4e.zip
Allow unresolved variables during resolution.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/VariableResolverFixture.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/VariableResolverFixture.cs b/src/test/WixToolsetTest.CoreIntegration/VariableResolverFixture.cs
index abf1bd43..3443896b 100644
--- a/src/test/WixToolsetTest.CoreIntegration/VariableResolverFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/VariableResolverFixture.cs
@@ -50,7 +50,12 @@ namespace WixToolsetTest.CoreIntegration
50 Assert.False(result.UpdatedValue); 50 Assert.False(result.UpdatedValue);
51 Assert.True(result.DelayedResolve); 51 Assert.True(result.DelayedResolve);
52 52
53 Assert.Throws<WixException>(() => variableResolver.ResolveVariables(null, "Welcome to !(loc.UnknownLocalizationVariable)")); 53 var withUnknownLocString = "Welcome to !(loc.UnknownLocalizationVariable)";
54 Assert.Throws<WixException>(() => variableResolver.ResolveVariables(null, withUnknownLocString));
55
56 result = variableResolver.ResolveVariables(null, withUnknownLocString, errorOnUnknown: false);
57 Assert.Equal(withUnknownLocString, result.Value);
58 Assert.False(result.UpdatedValue);
54 59
55 result = variableResolver.ResolveVariables(null, "Welcome to !!(loc.UnknownLocalizationVariable)"); 60 result = variableResolver.ResolveVariables(null, "Welcome to !!(loc.UnknownLocalizationVariable)");
56 Assert.Equal("Welcome to !(loc.UnknownLocalizationVariable)", result.Value); 61 Assert.Equal("Welcome to !(loc.UnknownLocalizationVariable)", result.Value);