Skip to content

W
wine-cw
Commit 598f2be5 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

msi: Fix the condition test to not assume MsiNetAssemblySupport is empty.

parent 5dbd834c
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 23 deletions
dlls/msi/tests/package.c
View file @ 598f2be5
......@@ -1196,23 +1196,25 @@ static void test_condition(void)
r = MsiEvaluateCondition(hpkg, "one >> two");
ok( r == MSICONDITION_TRUE, "wrong return val\n");
MsiSetProperty(hpkg, "MsiNetAssemblySupport", NULL); /* make sure it's empty */
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.4322\"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport > \"1.1.4322\"");
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport >= \"1.1.4322\"");
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport <= \"1.1.4322\"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport <> \"1.1.4322\"");
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport ~< \"1.1.4322\"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"abcd\"");
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
......@@ -1224,13 +1226,13 @@ static void test_condition(void)
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"0000001.1.4322\"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.4322.1\"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.4322.1.1\"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "\"2\" < \"1.1");
ok( r == MSICONDITION_ERROR, "wrong return val (%d)\n", r);
......@@ -1248,31 +1250,31 @@ static void test_condition(void)
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1\"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1\"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"0\"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"-1\"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"a\"");
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"!\"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"!\"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"/\"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \" \"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"azAZ_\"");
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
......@@ -1283,22 +1285,20 @@ static void test_condition(void)
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"a[a]a\"");
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
todo_wine {
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"[a]\"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"[a]a\"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"{a}\"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"{a\"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"[a\"");
ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r);
}
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"a{\"");
ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment