diff options
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/BurnUnitTest/VariantTest.cpp | 50 |
1 files changed, 5 insertions, 45 deletions
diff --git a/src/test/BurnUnitTest/VariantTest.cpp b/src/test/BurnUnitTest/VariantTest.cpp index 34328f53..43899a2b 100644 --- a/src/test/BurnUnitTest/VariantTest.cpp +++ b/src/test/BurnUnitTest/VariantTest.cpp | |||
@@ -68,7 +68,7 @@ namespace Bootstrapper | |||
68 | } | 68 | } |
69 | 69 | ||
70 | private: | 70 | private: |
71 | void InitFormattedValue(BURN_VARIANT* pValue, LPWSTR wzValue, BOOL fHidden, LPCWSTR wz, BURN_VARIANT* pActualValue) | 71 | void InitFormattedValue(BURN_VARIANT* pValue, LPWSTR wzValue, BOOL /*fHidden*/, LPCWSTR wz, BURN_VARIANT* pActualValue) |
72 | { | 72 | { |
73 | HRESULT hr = S_OK; | 73 | HRESULT hr = S_OK; |
74 | pValue->Type = BURN_VARIANT_TYPE_FORMATTED; | 74 | pValue->Type = BURN_VARIANT_TYPE_FORMATTED; |
@@ -78,34 +78,18 @@ namespace Bootstrapper | |||
78 | 78 | ||
79 | hr = BVariantCopy(pValue, pActualValue); | 79 | hr = BVariantCopy(pValue, pActualValue); |
80 | NativeAssert::Succeeded(hr, "Failed to copy variant {0}", wz); | 80 | NativeAssert::Succeeded(hr, "Failed to copy variant {0}", wz); |
81 | |||
82 | if (fHidden) | ||
83 | { | ||
84 | hr = BVariantSetEncryption(pActualValue, TRUE); | ||
85 | NativeAssert::Succeeded(hr, "Failed to encrypt variant {0}", wz); | ||
86 | |||
87 | NativeAssert::True(pActualValue->fEncryptString); | ||
88 | } | ||
89 | } | 81 | } |
90 | 82 | ||
91 | void InitNoneValue(BURN_VARIANT* pValue, BOOL fHidden, LPCWSTR wz, BURN_VARIANT* pActualValue) | 83 | void InitNoneValue(BURN_VARIANT* pValue, BOOL /*fHidden*/, LPCWSTR wz, BURN_VARIANT* pActualValue) |
92 | { | 84 | { |
93 | HRESULT hr = S_OK; | 85 | HRESULT hr = S_OK; |
94 | pValue->Type = BURN_VARIANT_TYPE_NONE; | 86 | pValue->Type = BURN_VARIANT_TYPE_NONE; |
95 | 87 | ||
96 | hr = BVariantCopy(pValue, pActualValue); | 88 | hr = BVariantCopy(pValue, pActualValue); |
97 | NativeAssert::Succeeded(hr, "Failed to copy variant {0}", wz); | 89 | NativeAssert::Succeeded(hr, "Failed to copy variant {0}", wz); |
98 | |||
99 | if (fHidden) | ||
100 | { | ||
101 | hr = BVariantSetEncryption(pActualValue, TRUE); | ||
102 | NativeAssert::Succeeded(hr, "Failed to encrypt variant {0}", wz); | ||
103 | |||
104 | NativeAssert::True(pActualValue->fEncryptString); | ||
105 | } | ||
106 | } | 90 | } |
107 | 91 | ||
108 | void InitNumericValue(BURN_VARIANT* pValue, LONGLONG llValue, BOOL fHidden, LPCWSTR wz, BURN_VARIANT* pActualValue) | 92 | void InitNumericValue(BURN_VARIANT* pValue, LONGLONG llValue, BOOL /*fHidden*/, LPCWSTR wz, BURN_VARIANT* pActualValue) |
109 | { | 93 | { |
110 | HRESULT hr = S_OK; | 94 | HRESULT hr = S_OK; |
111 | pValue->Type = BURN_VARIANT_TYPE_NUMERIC; | 95 | pValue->Type = BURN_VARIANT_TYPE_NUMERIC; |
@@ -113,17 +97,9 @@ namespace Bootstrapper | |||
113 | 97 | ||
114 | hr = BVariantCopy(pValue, pActualValue); | 98 | hr = BVariantCopy(pValue, pActualValue); |
115 | NativeAssert::Succeeded(hr, "Failed to copy variant {0}", wz); | 99 | NativeAssert::Succeeded(hr, "Failed to copy variant {0}", wz); |
116 | |||
117 | if (fHidden) | ||
118 | { | ||
119 | hr = BVariantSetEncryption(pActualValue, TRUE); | ||
120 | NativeAssert::Succeeded(hr, "Failed to encrypt variant {0}", wz); | ||
121 | |||
122 | NativeAssert::True(pActualValue->fEncryptString); | ||
123 | } | ||
124 | } | 100 | } |
125 | 101 | ||
126 | void InitStringValue(BURN_VARIANT* pValue, LPWSTR wzValue, BOOL fHidden, LPCWSTR wz, BURN_VARIANT* pActualValue) | 102 | void InitStringValue(BURN_VARIANT* pValue, LPWSTR wzValue, BOOL /*fHidden*/, LPCWSTR wz, BURN_VARIANT* pActualValue) |
127 | { | 103 | { |
128 | HRESULT hr = S_OK; | 104 | HRESULT hr = S_OK; |
129 | pValue->Type = BURN_VARIANT_TYPE_STRING; | 105 | pValue->Type = BURN_VARIANT_TYPE_STRING; |
@@ -133,17 +109,9 @@ namespace Bootstrapper | |||
133 | 109 | ||
134 | hr = BVariantCopy(pValue, pActualValue); | 110 | hr = BVariantCopy(pValue, pActualValue); |
135 | NativeAssert::Succeeded(hr, "Failed to copy variant {0}", wz); | 111 | NativeAssert::Succeeded(hr, "Failed to copy variant {0}", wz); |
136 | |||
137 | if (fHidden) | ||
138 | { | ||
139 | hr = BVariantSetEncryption(pActualValue, TRUE); | ||
140 | NativeAssert::Succeeded(hr, "Failed to encrypt variant {0}", wz); | ||
141 | |||
142 | NativeAssert::True(pActualValue->fEncryptString); | ||
143 | } | ||
144 | } | 112 | } |
145 | 113 | ||
146 | void InitVersionValue(BURN_VARIANT* pValue, LPCWSTR wzValue, BOOL fHidden, LPCWSTR wz, BURN_VARIANT* pActualValue) | 114 | void InitVersionValue(BURN_VARIANT* pValue, LPCWSTR wzValue, BOOL /*fHidden*/, LPCWSTR wz, BURN_VARIANT* pActualValue) |
147 | { | 115 | { |
148 | HRESULT hr = S_OK; | 116 | HRESULT hr = S_OK; |
149 | VERUTIL_VERSION* pVersion = NULL; | 117 | VERUTIL_VERSION* pVersion = NULL; |
@@ -159,14 +127,6 @@ namespace Bootstrapper | |||
159 | 127 | ||
160 | hr = BVariantCopy(pValue, pActualValue); | 128 | hr = BVariantCopy(pValue, pActualValue); |
161 | NativeAssert::Succeeded(hr, "Failed to copy variant {0}", wz); | 129 | NativeAssert::Succeeded(hr, "Failed to copy variant {0}", wz); |
162 | |||
163 | if (fHidden) | ||
164 | { | ||
165 | hr = BVariantSetEncryption(pActualValue, TRUE); | ||
166 | NativeAssert::Succeeded(hr, "Failed to encrypt variant {0}", wz); | ||
167 | |||
168 | NativeAssert::True(pActualValue->fEncryptString); | ||
169 | } | ||
170 | } | 130 | } |
171 | finally | 131 | finally |
172 | { | 132 | { |