oledb32/tests: Simplify some ok() checks (PVS-Studio).

This commit is contained in:
Michael Stefaniuc 2015-01-08 11:07:55 +01:00 committed by Alexandre Julliard
parent 6ac25d3d80
commit 6d3c83b869
1 changed files with 9 additions and 15 deletions

View File

@ -303,27 +303,21 @@ static void test_canconvert(void)
/* src DBTYPE_VECTOR */ /* src DBTYPE_VECTOR */
hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type | DBTYPE_VECTOR, simple_convert[dst_idx].type); hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type | DBTYPE_VECTOR, simple_convert[dst_idx].type);
expect = FALSE; ok(hr == S_FALSE,
ok((hr == S_OK && expect == TRUE) || "%04x -> %04x: got %08x expect conversion to not be possible\n", simple_convert[src_idx].type | DBTYPE_VECTOR,
(hr == S_FALSE && expect == FALSE), simple_convert[dst_idx].type, hr);
"%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type | DBTYPE_VECTOR,
simple_convert[dst_idx].type, hr, expect ? "" : "not ");
/* dst DBTYPE_VECTOR */ /* dst DBTYPE_VECTOR */
hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type, simple_convert[dst_idx].type | DBTYPE_VECTOR); hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type, simple_convert[dst_idx].type | DBTYPE_VECTOR);
expect = FALSE; ok(hr == S_FALSE,
ok((hr == S_OK && expect == TRUE) || "%04x -> %04x: got %08x expect conversion to not be possible\n", simple_convert[src_idx].type,
(hr == S_FALSE && expect == FALSE), simple_convert[dst_idx].type | DBTYPE_VECTOR, hr);
"%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type,
simple_convert[dst_idx].type | DBTYPE_VECTOR, hr, expect ? "" : "not ");
/* src & dst DBTYPE_VECTOR */ /* src & dst DBTYPE_VECTOR */
hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type | DBTYPE_VECTOR, simple_convert[dst_idx].type | DBTYPE_VECTOR); hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type | DBTYPE_VECTOR, simple_convert[dst_idx].type | DBTYPE_VECTOR);
expect = FALSE; ok(hr == S_FALSE,
ok((hr == S_OK && expect == TRUE) || "%04x -> %04x: got %08x expect conversion to not be possible\n", simple_convert[src_idx].type | DBTYPE_VECTOR,
(hr == S_FALSE && expect == FALSE), simple_convert[dst_idx].type | DBTYPE_VECTOR, hr);
"%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type | DBTYPE_VECTOR,
simple_convert[dst_idx].type | DBTYPE_VECTOR, hr, expect ? "" : "not ");
} }