diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-07-12 17:07:55 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-07-12 17:16:16 +1000 |
| commit | dc558da002794cc07013e8376f3c55c73391aa0e (patch) | |
| tree | faba96f981f1ea0c6888b387cf43cc78d0bc2927 /src/test/DUtilUnitTest/MemUtilTest.cpp | |
| parent | aeddc77fc021f11f68a4c1a093eabf9776866b80 (diff) | |
| download | wix-dc558da002794cc07013e8376f3c55c73391aa0e.tar.gz wix-dc558da002794cc07013e8376f3c55c73391aa0e.tar.bz2 wix-dc558da002794cc07013e8376f3c55c73391aa0e.zip | |
Update Dutil_TraceErrorSource to filter based on the report level.
Diffstat (limited to 'src/test/DUtilUnitTest/MemUtilTest.cpp')
| -rw-r--r-- | src/test/DUtilUnitTest/MemUtilTest.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/test/DUtilUnitTest/MemUtilTest.cpp b/src/test/DUtilUnitTest/MemUtilTest.cpp index 2621da6d..09692bfb 100644 --- a/src/test/DUtilUnitTest/MemUtilTest.cpp +++ b/src/test/DUtilUnitTest/MemUtilTest.cpp | |||
| @@ -27,6 +27,8 @@ namespace DutilTests | |||
| 27 | ArrayValue *rgValues = NULL; | 27 | ArrayValue *rgValues = NULL; |
| 28 | DWORD cValues = 0; | 28 | DWORD cValues = 0; |
| 29 | 29 | ||
| 30 | DutilInitialize(&DutilTestTraceError); | ||
| 31 | |||
| 30 | try | 32 | try |
| 31 | { | 33 | { |
| 32 | hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), cValues + 1, sizeof(ArrayValue), 5); | 34 | hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), cValues + 1, sizeof(ArrayValue), 5); |
| @@ -101,7 +103,7 @@ namespace DutilTests | |||
| 101 | } | 103 | } |
| 102 | 104 | ||
| 103 | LExit: | 105 | LExit: |
| 104 | return; | 106 | DutilUninitialize(); |
| 105 | } | 107 | } |
| 106 | 108 | ||
| 107 | [Fact] | 109 | [Fact] |
| @@ -111,6 +113,8 @@ namespace DutilTests | |||
| 111 | ArrayValue *rgValues = NULL; | 113 | ArrayValue *rgValues = NULL; |
| 112 | DWORD cValues = 0; | 114 | DWORD cValues = 0; |
| 113 | 115 | ||
| 116 | DutilInitialize(&DutilTestTraceError); | ||
| 117 | |||
| 114 | try | 118 | try |
| 115 | { | 119 | { |
| 116 | hr = MemInsertIntoArray(reinterpret_cast<LPVOID*>(&rgValues), 0, 1, cValues + 1, sizeof(ArrayValue), 5); | 120 | hr = MemInsertIntoArray(reinterpret_cast<LPVOID*>(&rgValues), 0, 1, cValues + 1, sizeof(ArrayValue), 5); |
| @@ -180,6 +184,7 @@ namespace DutilTests | |||
| 180 | finally | 184 | finally |
| 181 | { | 185 | { |
| 182 | ReleaseMem(rgValues); | 186 | ReleaseMem(rgValues); |
| 187 | DutilUninitialize(); | ||
| 183 | } | 188 | } |
| 184 | } | 189 | } |
| 185 | 190 | ||
| @@ -190,6 +195,8 @@ namespace DutilTests | |||
| 190 | ArrayValue *rgValues = NULL; | 195 | ArrayValue *rgValues = NULL; |
| 191 | DWORD cValues = 0; | 196 | DWORD cValues = 0; |
| 192 | 197 | ||
| 198 | DutilInitialize(&DutilTestTraceError); | ||
| 199 | |||
| 193 | try | 200 | try |
| 194 | { | 201 | { |
| 195 | hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), 10, sizeof(ArrayValue), 10); | 202 | hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), 10, sizeof(ArrayValue), 10); |
| @@ -252,6 +259,7 @@ namespace DutilTests | |||
| 252 | finally | 259 | finally |
| 253 | { | 260 | { |
| 254 | ReleaseMem(rgValues); | 261 | ReleaseMem(rgValues); |
| 262 | DutilUninitialize(); | ||
| 255 | } | 263 | } |
| 256 | } | 264 | } |
| 257 | 265 | ||
| @@ -262,6 +270,8 @@ namespace DutilTests | |||
| 262 | ArrayValue *rgValues = NULL; | 270 | ArrayValue *rgValues = NULL; |
| 263 | DWORD cValues = 0; | 271 | DWORD cValues = 0; |
| 264 | 272 | ||
| 273 | DutilInitialize(&DutilTestTraceError); | ||
| 274 | |||
| 265 | try | 275 | try |
| 266 | { | 276 | { |
| 267 | hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), 10, sizeof(ArrayValue), 10); | 277 | hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), 10, sizeof(ArrayValue), 10); |
| @@ -326,6 +336,7 @@ namespace DutilTests | |||
| 326 | finally | 336 | finally |
| 327 | { | 337 | { |
| 328 | ReleaseMem(rgValues); | 338 | ReleaseMem(rgValues); |
| 339 | DutilUninitialize(); | ||
| 329 | } | 340 | } |
| 330 | } | 341 | } |
| 331 | 342 | ||
| @@ -336,6 +347,8 @@ namespace DutilTests | |||
| 336 | ArrayValue *rgValues = NULL; | 347 | ArrayValue *rgValues = NULL; |
| 337 | DWORD cValues = 0; | 348 | DWORD cValues = 0; |
| 338 | 349 | ||
| 350 | DutilInitialize(&DutilTestTraceError); | ||
| 351 | |||
| 339 | try | 352 | try |
| 340 | { | 353 | { |
| 341 | hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), 10, sizeof(ArrayValue), 10); | 354 | hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), 10, sizeof(ArrayValue), 10); |
| @@ -424,6 +437,7 @@ namespace DutilTests | |||
| 424 | finally | 437 | finally |
| 425 | { | 438 | { |
| 426 | ReleaseMem(rgValues); | 439 | ReleaseMem(rgValues); |
| 440 | DutilUninitialize(); | ||
| 427 | } | 441 | } |
| 428 | } | 442 | } |
| 429 | 443 | ||
