diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-02-23 15:14:46 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-02-23 16:03:11 -0600 |
| commit | ab3daf1863af104523eadd3af143b835a81c2248 (patch) | |
| tree | 03e87e91c1dfe693c81196240c02f04030b4a648 /src/burn/test | |
| parent | b30c6891216770adb9c46c9904c681dc3ccb1011 (diff) | |
| download | wix-ab3daf1863af104523eadd3af143b835a81c2248.tar.gz wix-ab3daf1863af104523eadd3af143b835a81c2248.tar.bz2 wix-ab3daf1863af104523eadd3af143b835a81c2248.zip | |
Change SetVariable to format the value and convert it at search time.
Fixes #6724
Diffstat (limited to 'src/burn/test')
| -rw-r--r-- | src/burn/test/BurnUnitTest/SearchTest.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/burn/test/BurnUnitTest/SearchTest.cpp b/src/burn/test/BurnUnitTest/SearchTest.cpp index de38f2d8..06ffd017 100644 --- a/src/burn/test/BurnUnitTest/SearchTest.cpp +++ b/src/burn/test/BurnUnitTest/SearchTest.cpp | |||
| @@ -523,7 +523,7 @@ namespace Bootstrapper | |||
| 523 | L" <SetVariable Id='Search6' Type='string' Value='VAL6' Variable='PROP6' />" | 523 | L" <SetVariable Id='Search6' Type='string' Value='VAL6' Variable='PROP6' />" |
| 524 | L" <SetVariable Id='Search7' Type='string' Value='7' Variable='PROP7' />" | 524 | L" <SetVariable Id='Search7' Type='string' Value='7' Variable='PROP7' />" |
| 525 | L" <SetVariable Id='Search8' Type='version' Value='1.1.0.0' Variable='PROP8' />" | 525 | L" <SetVariable Id='Search8' Type='version' Value='1.1.0.0' Variable='PROP8' />" |
| 526 | L" <SetVariable Id='Search9' Type='formatted' Value='[VAL9]' Variable='PROP9' />" | 526 | L" <SetVariable Id='Search9' Type='formatted' Value='[\\[]VAL9[\\]]' Variable='PROP9' />" |
| 527 | L" <SetVariable Id='Search10' Type='numeric' Value='42' Variable='OVERWRITTEN_STRING' />" | 527 | L" <SetVariable Id='Search10' Type='numeric' Value='42' Variable='OVERWRITTEN_STRING' />" |
| 528 | L" <SetVariable Id='Search11' Type='string' Value='NEW' Variable='OVERWRITTEN_NUMBER' />" | 528 | L" <SetVariable Id='Search11' Type='string' Value='NEW' Variable='OVERWRITTEN_NUMBER' />" |
| 529 | L" <SetVariable Id='Search12' Variable='REMOVED_NUMBER' />" | 529 | L" <SetVariable Id='Search12' Variable='REMOVED_NUMBER' />" |
| @@ -549,7 +549,9 @@ namespace Bootstrapper | |||
| 549 | 549 | ||
| 550 | // check variable values | 550 | // check variable values |
| 551 | Assert::Equal<String^>(gcnew String(L"VAL1"), VariableGetStringHelper(&variables, L"PROP1")); | 551 | Assert::Equal<String^>(gcnew String(L"VAL1"), VariableGetStringHelper(&variables, L"PROP1")); |
| 552 | Assert::Equal((int)BURN_VARIANT_TYPE_STRING, VariableGetTypeHelper(&variables, L"PROP1")); | ||
| 552 | Assert::Equal(2ll, VariableGetNumericHelper(&variables, L"PROP2")); | 553 | Assert::Equal(2ll, VariableGetNumericHelper(&variables, L"PROP2")); |
| 554 | Assert::Equal((int)BURN_VARIANT_TYPE_NUMERIC, VariableGetTypeHelper(&variables, L"PROP2")); | ||
| 553 | Assert::Equal<String^>(gcnew String(L"2"), VariableGetStringHelper(&variables, L"PROP2")); | 555 | Assert::Equal<String^>(gcnew String(L"2"), VariableGetStringHelper(&variables, L"PROP2")); |
| 554 | Assert::Equal<String^>(gcnew String(L"VAL3"), VariableGetStringHelper(&variables, L"PROP3")); | 556 | Assert::Equal<String^>(gcnew String(L"VAL3"), VariableGetStringHelper(&variables, L"PROP3")); |
| 555 | Assert::Equal<String^>(gcnew String(L"VAL4"), VariableGetStringHelper(&variables, L"PROP4")); | 557 | Assert::Equal<String^>(gcnew String(L"VAL4"), VariableGetStringHelper(&variables, L"PROP4")); |
| @@ -557,8 +559,10 @@ namespace Bootstrapper | |||
| 557 | Assert::Equal<String^>(gcnew String(L"VAL6"), VariableGetStringHelper(&variables, L"PROP6")); | 559 | Assert::Equal<String^>(gcnew String(L"VAL6"), VariableGetStringHelper(&variables, L"PROP6")); |
| 558 | Assert::Equal(7ll, VariableGetNumericHelper(&variables, L"PROP7")); | 560 | Assert::Equal(7ll, VariableGetNumericHelper(&variables, L"PROP7")); |
| 559 | Assert::Equal<String^>(gcnew String(L"1.1.0.0"), VariableGetVersionHelper(&variables, L"PROP8")); | 561 | Assert::Equal<String^>(gcnew String(L"1.1.0.0"), VariableGetVersionHelper(&variables, L"PROP8")); |
| 562 | Assert::Equal((int)BURN_VARIANT_TYPE_VERSION, VariableGetTypeHelper(&variables, L"PROP8")); | ||
| 560 | Assert::Equal<String^>(gcnew String(L"1.1.0.0"), VariableGetStringHelper(&variables, L"PROP8")); | 563 | Assert::Equal<String^>(gcnew String(L"1.1.0.0"), VariableGetStringHelper(&variables, L"PROP8")); |
| 561 | Assert::Equal<String^>(gcnew String(L"[VAL9]"), VariableGetStringHelper(&variables, L"PROP9")); | 564 | Assert::Equal<String^>(gcnew String(L"[VAL9]"), VariableGetStringHelper(&variables, L"PROP9")); |
| 565 | Assert::Equal((int)BURN_VARIANT_TYPE_FORMATTED, VariableGetTypeHelper(&variables, L"PROP9")); | ||
| 562 | 566 | ||
| 563 | Assert::Equal(42ll, VariableGetNumericHelper(&variables, L"OVERWRITTEN_STRING")); | 567 | Assert::Equal(42ll, VariableGetNumericHelper(&variables, L"OVERWRITTEN_STRING")); |
| 564 | Assert::Equal<String^>(gcnew String(L"NEW"), VariableGetStringHelper(&variables, L"OVERWRITTEN_NUMBER")); | 568 | Assert::Equal<String^>(gcnew String(L"NEW"), VariableGetStringHelper(&variables, L"OVERWRITTEN_NUMBER")); |