[PATCH 1/3] crypt32/tests: Tidy up unexpected length failure messages in base64.
Jeff Smith
whydoubt at gmail.com
Wed Oct 9 12:53:53 CDT 2019
Signed-off-by: Jeff Smith <whydoubt at gmail.com>
---
dlls/crypt32/tests/base64.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c
index 4ff76272e3..3668543048 100644
--- a/dlls/crypt32/tests/base64.c
+++ b/dlls/crypt32/tests/base64.c
@@ -121,12 +121,12 @@ static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen,
strLen2 = strLen;
ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, NULL, &strLen2);
ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError());
- ok(strLen == strLen2, "Unexpected required length.\n");
+ ok(strLen == strLen2, "Unexpected required length %u, expected %u.\n", strLen2, strLen);
strLen2 = strLen - 1;
ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, NULL, &strLen2);
ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError());
- ok(strLen == strLen2, "Unexpected required length.\n");
+ ok(strLen == strLen2, "Unexpected required length %u, expected %u.\n", strLen2, strLen);
str = heap_alloc(strLen);
@@ -137,7 +137,7 @@ static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen,
todo_wine
ok((!ret && GetLastError() == ERROR_MORE_DATA) || broken(ret) /* XP */, "CryptBinaryToStringA failed %d, error %d.\n",
ret, GetLastError());
- ok(strLen2 == strLen || broken(strLen2 == strLen - 1), "Expected length %d, got %d\n", strLen - 1, strLen);
+ ok(strLen2 == strLen || broken(strLen2 == strLen - 1), "Expected length %d, got %d\n", strLen, strLen2);
todo_wine {
if (header)
ok(str[0] == header[0], "Unexpected buffer contents %#x.\n", str[0]);
@@ -147,7 +147,7 @@ todo_wine {
strLen2 = strLen;
ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, str, &strLen2);
ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError());
- ok(strLen2 == strLen - 1, "Expected length %d, got %d\n", strLen - 1, strLen);
+ ok(strLen2 == strLen - 1, "Expected length %d, got %d\n", strLen - 1, strLen2);
ptr = str;
if (header)
--
2.21.0
More information about the wine-devel
mailing list