system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 10:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

xmllite/tests: Use todo_wine_if() in tests.

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-02-15 17:39:58 +03:00 committed by Alexandre Julliard
parent bf1cdf58ce
commit b190a72bfe
1 changed files with 6 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
dlls/xmllite/tests/reader.c
View file

@ -96,15 +96,9 @@ static void ok_pos_(IXmlReader *reader, int line, int pos, int line_broken,
broken_state = broken((line_broken == -1 ? line : line_broken) == l && broken_state = broken((line_broken == -1 ? line : line_broken) == l &&
(pos_broken == -1 ? pos : pos_broken) == p); (pos_broken == -1 ? pos : pos_broken) == p);
if (todo) todo_wine_if (todo)
todo_wine
ok_(__FILE__, _line_)((l == line && pos == p) || broken_state, ok_(__FILE__, _line_)((l == line && pos == p) || broken_state,
"Expected (%d,%d), got (%d,%d)\n", line, pos, l, p); "Expected (%d,%d), got (%d,%d)\n", line, pos, l, p);
else
{
ok_(__FILE__, _line_)((l == line && pos == p) || broken_state,
"Expected (%d,%d), got (%d,%d)\n", line, pos, l, p);
}
} }
#define ok_pos(reader, l, p, l_brk, p_brk, todo) ok_pos_(reader, l, p, l_brk, p_brk, todo, __LINE__) #define ok_pos(reader, l, p, l_brk, p_brk, todo) ok_pos_(reader, l, p, l_brk, p_brk, todo, __LINE__)
@ -147,12 +141,8 @@ static void ok_iids_(const input_iids_t *iids, const IID **expected, const IID *
while (expected[i++]) size++; while (expected[i++]) size++;
if (todo) { todo_wine_if (todo)
todo_wine ok_(__FILE__, line)(iids->count == size, "Sequence size mismatch (%d), got (%d)\n", size, iids->count);
ok_(__FILE__, line)(iids->count == size, "Sequence size mismatch (%d), got (%d)\n", size, iids->count);
}
else
ok_(__FILE__, line)(iids->count == size, "Sequence size mismatch (%d), got (%d)\n", size, iids->count);
if (iids->count != size) return; if (iids->count != size) return;
@ -247,13 +237,7 @@ static void test_read_state_(IXmlReader *reader, XmlReadState expected,
else else
broken_state = broken(exp_broken == state); broken_state = broken(exp_broken == state);
if (todo) todo_wine_if (todo)
{
todo_wine
ok_(__FILE__, line)(state == expected || broken_state, "Expected (%s), got (%s)\n",
state_to_str(expected), state_to_str(state));
}
else
ok_(__FILE__, line)(state == expected || broken_state, "Expected (%s), got (%s)\n", ok_(__FILE__, line)(state == expected || broken_state, "Expected (%s), got (%s)\n",
state_to_str(expected), state_to_str(state)); state_to_str(expected), state_to_str(state));
} }
@ -1515,14 +1499,7 @@ static void test_read_cdata(void)
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
str_exp = a2w(test->value); str_exp = a2w(test->value);
if (test->todo) todo_wine_if (test->todo)
{
todo_wine {
ok(len == strlen(test->value), "got %u\n", len);
ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str));
}
}
else
{ {
ok(len == strlen(test->value), "got %u\n", len); ok(len == strlen(test->value), "got %u\n", len);
ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str));
@ -1615,14 +1592,7 @@ static void test_read_text(void)
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
str_exp = a2w(test->value); str_exp = a2w(test->value);
if (test->todo) todo_wine_if (test->todo)
{
todo_wine {
ok(len == strlen(test->value), "got %u\n", len);
ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str));
}
}
else
{ {
ok(len == strlen(test->value), "got %u\n", len); ok(len == strlen(test->value), "got %u\n", len);
ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str));