diff options
| author |  Mason Larobina <mason.larobina@gmail.com> | 2010-04-04 03:11:43 +0800 |
|---|---|---|
| committer | Mason Larobina <mason.larobina@gmail.com> | 2010-04-04 03:11:43 +0800 |
| commit | 5924c7978ef57b0208e7ef39e4fcd6730dd4af26 (patch) | |
| tree | a99d1e3603106e99d1cbaaed0b9da8ef86e81fa2 /tests | |
| parent | b9a8d35c61416339bbb2e117d6b2afcf19fbf6fc (diff) | |
Update the unit tests to allow periods in variable names.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-expand.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/test-expand.c b/tests/test-expand.c index f64aba8..06e1619 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -95,7 +95,7 @@ test_cmd_useragent_simple (void) { g_string_append(expected, itos(WEBKIT_MICRO_VERSION)); g_string_append(expected, ")"); - g_assert_cmpstr(expand("Uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO)", 0), ==, g_string_free(expected, FALSE)); + g_assert_cmpstr(expand("Uzbl (Webkit @{WEBKIT_MAJOR}.@{WEBKIT_MINOR}.@{WEBKIT_MICRO})", 0), ==, g_string_free(expected, FALSE)); } void @@ -127,7 +127,7 @@ test_cmd_useragent_full (void) { g_string_append(expected, uzbl.info.commit); g_string_append(expected, ")"); - g_assert_cmpstr(expand("Uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO) (@(uname -s)@ @(uname -n)@ @(uname -r)@ @(uname -v)@ @(uname -m)@ [@ARCH_UZBL]) (Commit @COMMIT)", 0), ==, g_string_free(expected, FALSE)); + g_assert_cmpstr(expand("Uzbl (Webkit @{WEBKIT_MAJOR}.@{WEBKIT_MINOR}.@{WEBKIT_MICRO}) (@(uname -s)@ @(uname -n)@ @(uname -r)@ @(uname -v)@ @(uname -m)@ [@ARCH_UZBL]) (Commit @COMMIT)", 0), ==, g_string_free(expected, FALSE)); } void @@ -166,11 +166,11 @@ test_escape_expansion (void) { void test_nested (void) { uzbl.net.useragent = "xxx"; - g_assert_cmpstr(expand("@<\"..@useragent..\">@", 0), ==, "..xxx.."); - g_assert_cmpstr(expand("@<\"..\\@useragent..\">@", 0), ==, "..@useragent.."); + g_assert_cmpstr(expand("@<\"..@{useragent}..\">@", 0), ==, "..xxx.."); + g_assert_cmpstr(expand("@<\"..\\@{useragent}..\">@", 0), ==, "..@{useragent}.."); - g_assert_cmpstr(expand("@(echo ..@useragent..)@", 0), ==, "..xxx.."); - g_assert_cmpstr(expand("@(echo ..\\@useragent..)@", 0), ==, "..@useragent.."); + g_assert_cmpstr(expand("@(echo ..@{useragent}..)@", 0), ==, "..xxx.."); + g_assert_cmpstr(expand("@(echo ..\\@{useragent}..)@", 0), ==, "..@{useragent}.."); } int |