Juan Lang : crypt32/tests: Improve granularity of testing a store' s serialized form.
Alexandre Julliard
julliard at winehq.org
Wed May 26 11:49:06 CDT 2010
Module: wine
Branch: master
Commit: d0b7cc5bb9ed95748c7238d5edb176e9f67a23fa
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0b7cc5bb9ed95748c7238d5edb176e9f67a23fa
Author: Juan Lang <juan.lang at gmail.com>
Date: Mon May 24 14:15:34 2010 -0700
crypt32/tests: Improve granularity of testing a store's serialized form.
---
dlls/crypt32/tests/store.c | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c
index cab74c6..598af93 100644
--- a/dlls/crypt32/tests/store.c
+++ b/dlls/crypt32/tests/store.c
@@ -2064,21 +2064,32 @@ static void testAddSerialized(void)
}
static void compareStore(HCERTSTORE store, LPCSTR name, const BYTE *pb,
- DWORD cb)
+ DWORD cb, BOOL todo)
{
BOOL ret;
CRYPT_DATA_BLOB blob = { 0, NULL };
ret = CertSaveStore(store, X509_ASN_ENCODING, CERT_STORE_SAVE_AS_STORE,
CERT_STORE_SAVE_TO_MEMORY, &blob, 0);
- ok(blob.cbData == cb, "%s: expected size %d, got %d\n", name, cb,
- blob.cbData);
+ ok(ret, "CertSaveStore failed: %08x\n", GetLastError());
+ if (todo)
+ todo_wine
+ ok(blob.cbData == cb, "%s: expected size %d, got %d\n", name, cb,
+ blob.cbData);
+ else
+ ok(blob.cbData == cb, "%s: expected size %d, got %d\n", name, cb,
+ blob.cbData);
blob.pbData = HeapAlloc(GetProcessHeap(), 0, blob.cbData);
if (blob.pbData)
{
ret = CertSaveStore(store, X509_ASN_ENCODING, CERT_STORE_SAVE_AS_STORE,
CERT_STORE_SAVE_TO_MEMORY, &blob, 0);
- ok(!memcmp(pb, blob.pbData, cb), "%s: unexpected value\n", name);
+ ok(ret, "CertSaveStore failed: %08x\n", GetLastError());
+ if (todo)
+ todo_wine
+ ok(!memcmp(pb, blob.pbData, cb), "%s: unexpected value\n", name);
+ else
+ ok(!memcmp(pb, blob.pbData, cb), "%s: unexpected value\n", name);
HeapFree(GetProcessHeap(), 0, blob.pbData);
}
}
@@ -2330,7 +2341,7 @@ static void testAddCertificateLink(void)
CertFreeCertificateContext(linked);
compareStore(store2, "file store -> file store",
serializedStoreWithCertWithFriendlyName,
- sizeof(serializedStoreWithCertWithFriendlyName));
+ sizeof(serializedStoreWithCertWithFriendlyName), FALSE);
}
CertCloseStore(store2, 0);
DeleteFileW(filename2);
@@ -2380,10 +2391,9 @@ static void testAddCertificateLink(void)
ok(linked->hCertStore == store2, "unexpected store");
ret = pCertControlStore(store2, 0, CERT_STORE_CTRL_COMMIT, NULL);
ok(ret, "CertControlStore failed: %d\n", ret);
- todo_wine
compareStore(store2, "file store -> system store",
serializedStoreWithCertAndHash,
- sizeof(serializedStoreWithCertAndHash));
+ sizeof(serializedStoreWithCertAndHash), TRUE);
CertFreeCertificateContext(linked);
}
More information about the wine-cvs
mailing list