ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi/tests: Use todo_wine_if() in tests. 

Signed-off-by: Frédéric Delanoy <frederic.delanoy@gmail.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Frédéric Delanoy 2016-02-19 15:05:53 +01:00 committed by Alexandre Julliard
parent c7a4b0628d
commit 7ab2139191
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/msi/tests/automation.c
View File

@ -601,10 +601,7 @@ static void test_dispid(void)
while (ptr->name)
{
dispid = get_dispid(pInstaller, ptr->name);
if (ptr->todo)
todo_wine
ok(dispid == ptr->did, "%s: expected %d, got %d\n", ptr->name, ptr->did, dispid);
else
todo_wine_if (ptr->todo)
ok(dispid == ptr->did, "%s: expected %d, got %d\n", ptr->name, ptr->did, dispid);
ptr++;
}
@ -885,9 +882,7 @@ static HRESULT invoke(IDispatch *pDispatch, LPCSTR szName, WORD wFlags, DISPPARA
if (hr == S_OK)
{
if (_invoke_todo_vtResult) todo_wine
ok(V_VT(pVarResult) == vtResult, "Variant result type is %d, expected %d\n", V_VT(pVarResult), vtResult);
else
todo_wine_if (_invoke_todo_vtResult)
ok(V_VT(pVarResult) == vtResult, "Variant result type is %d, expected %d\n", V_VT(pVarResult), vtResult);
if (vtResult != VT_EMPTY)
{

19
dlls/msi/tests/package.c
View File

@ -2638,19 +2638,14 @@ static void test_feature_states( UINT line, MSIHANDLE package, const char *featu
{
ok( state == expected_state, "%u: expected state %d got %d\n",
line, expected_state, state );
if (todo) todo_wine
ok( action == expected_action, "%u: expected action %d got %d\n",
line, expected_action, action );
else
todo_wine_if (todo)
ok( action == expected_action, "%u: expected action %d got %d\n",
line, expected_action, action );
}
else
{
ok( state == 0xdeadbee, "%u: expected state 0xdeadbee got %d\n", line, state );
if (todo) todo_wine
ok( action == 0xdeadbee, "%u: expected action 0xdeadbee got %d\n", line, action );
else
todo_wine_if (todo)
ok( action == 0xdeadbee, "%u: expected action 0xdeadbee got %d\n", line, action );
}
@ -2669,10 +2664,7 @@ static void test_component_states( UINT line, MSIHANDLE package, const char *com
{
ok( state == expected_state, "%u: expected state %d got %d\n",
line, expected_state, state );
if (todo) todo_wine
ok( action == expected_action, "%u: expected action %d got %d\n",
line, expected_action, action );
else
todo_wine_if (todo)
ok( action == expected_action, "%u: expected action %d got %d\n",
line, expected_action, action );
}
@ -2680,10 +2672,7 @@ static void test_component_states( UINT line, MSIHANDLE package, const char *com
{
ok( state == 0xdeadbee, "%u: expected state 0xdeadbee got %d\n",
line, state );
if (todo) todo_wine
ok( action == 0xdeadbee, "%u: expected action 0xdeadbee got %d\n",
line, action );
else
todo_wine_if (todo)
ok( action == 0xdeadbee, "%u: expected action 0xdeadbee got %d\n",
line, action );
}