2017-11-18 17:09:20 +01:00
|
|
|
/* SPDX-License-Identifier: LGPL-2.1+ */
|
2016-05-28 23:53:00 +02:00
|
|
|
|
|
|
|
#include "alloc-util.h"
|
|
|
|
#include "keymap-util.h"
|
|
|
|
#include "log.h"
|
|
|
|
#include "string-util.h"
|
2019-01-20 18:21:09 +01:00
|
|
|
#include "tests.h"
|
2016-05-28 23:53:00 +02:00
|
|
|
|
|
|
|
static void test_find_language_fallback(void) {
|
|
|
|
_cleanup_free_ char *ans = NULL, *ans2 = NULL;
|
|
|
|
|
2016-06-05 00:15:42 +02:00
|
|
|
log_info("/*** %s ***/", __func__);
|
2016-05-28 23:53:00 +02:00
|
|
|
|
2016-06-05 00:15:42 +02:00
|
|
|
assert_se(find_language_fallback("foobar", &ans) == 0);
|
2016-05-28 23:53:00 +02:00
|
|
|
assert_se(ans == NULL);
|
|
|
|
|
|
|
|
assert_se(find_language_fallback("csb", &ans) == 0);
|
|
|
|
assert_se(ans == NULL);
|
|
|
|
|
|
|
|
assert_se(find_language_fallback("csb_PL", &ans) == 1);
|
|
|
|
assert_se(streq(ans, "csb:pl"));
|
|
|
|
|
|
|
|
assert_se(find_language_fallback("szl_PL", &ans2) == 1);
|
|
|
|
assert_se(streq(ans2, "szl:pl"));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_find_converted_keymap(void) {
|
|
|
|
_cleanup_free_ char *ans = NULL, *ans2 = NULL;
|
|
|
|
int r;
|
|
|
|
|
2016-06-05 00:15:42 +02:00
|
|
|
log_info("/*** %s ***/", __func__);
|
2016-05-28 23:53:00 +02:00
|
|
|
|
|
|
|
assert_se(find_converted_keymap("pl", "foobar", &ans) == 0);
|
|
|
|
assert_se(ans == NULL);
|
|
|
|
|
|
|
|
r = find_converted_keymap("pl", NULL, &ans);
|
|
|
|
if (r == 0) {
|
2016-06-05 00:15:42 +02:00
|
|
|
log_info("Skipping rest of %s: keymaps are not installed", __func__);
|
2016-05-28 23:53:00 +02:00
|
|
|
return;
|
|
|
|
}
|
2016-06-05 00:15:42 +02:00
|
|
|
|
2016-05-28 23:53:00 +02:00
|
|
|
assert_se(r == 1);
|
|
|
|
assert_se(streq(ans, "pl"));
|
|
|
|
|
2016-06-19 17:02:51 +02:00
|
|
|
assert_se(find_converted_keymap("pl", "dvorak", &ans2) == 1);
|
|
|
|
assert_se(streq(ans2, "pl-dvorak"));
|
2016-05-28 23:53:00 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void test_find_legacy_keymap(void) {
|
|
|
|
Context c = {};
|
|
|
|
_cleanup_free_ char *ans = NULL, *ans2 = NULL;
|
|
|
|
|
2016-06-05 00:15:42 +02:00
|
|
|
log_info("/*** %s ***/", __func__);
|
2016-05-28 23:53:00 +02:00
|
|
|
|
|
|
|
c.x11_layout = (char*) "foobar";
|
2016-06-05 00:15:42 +02:00
|
|
|
assert_se(find_legacy_keymap(&c, &ans) == 0);
|
2016-05-28 23:53:00 +02:00
|
|
|
assert_se(ans == NULL);
|
|
|
|
|
|
|
|
c.x11_layout = (char*) "pl";
|
2016-05-23 04:43:12 +02:00
|
|
|
assert_se(find_legacy_keymap(&c, &ans) == 1);
|
2016-05-28 23:53:00 +02:00
|
|
|
assert_se(streq(ans, "pl2"));
|
|
|
|
|
|
|
|
c.x11_layout = (char*) "pl,ru";
|
2016-05-23 04:43:12 +02:00
|
|
|
assert_se(find_legacy_keymap(&c, &ans2) == 1);
|
2016-05-28 23:53:00 +02:00
|
|
|
assert_se(streq(ans, "pl2"));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_vconsole_convert_to_x11(void) {
|
2018-11-22 22:12:45 +01:00
|
|
|
_cleanup_(context_clear) Context c = {};
|
2016-05-28 23:53:00 +02:00
|
|
|
|
2016-06-05 00:15:42 +02:00
|
|
|
log_info("/*** %s ***/", __func__);
|
2016-05-28 23:53:00 +02:00
|
|
|
|
|
|
|
log_info("/* test emptying first (:) */");
|
|
|
|
assert_se(free_and_strdup(&c.x11_layout, "foo") >= 0);
|
|
|
|
assert_se(free_and_strdup(&c.x11_variant, "bar") >= 0);
|
|
|
|
assert_se(vconsole_convert_to_x11(&c) == 1);
|
|
|
|
assert_se(c.x11_layout == NULL);
|
|
|
|
assert_se(c.x11_variant == NULL);
|
|
|
|
|
|
|
|
log_info("/* test emptying second (:) */");
|
|
|
|
|
|
|
|
assert_se(vconsole_convert_to_x11(&c) == 0);
|
|
|
|
assert_se(c.x11_layout == NULL);
|
|
|
|
assert_se(c.x11_variant == NULL);
|
|
|
|
|
|
|
|
log_info("/* test without variant, new mapping (es:) */");
|
|
|
|
assert_se(free_and_strdup(&c.vc_keymap, "es") >= 0);
|
|
|
|
|
|
|
|
assert_se(vconsole_convert_to_x11(&c) == 1);
|
|
|
|
assert_se(streq(c.x11_layout, "es"));
|
|
|
|
assert_se(c.x11_variant == NULL);
|
|
|
|
|
|
|
|
log_info("/* test with known variant, new mapping (es:dvorak) */");
|
|
|
|
assert_se(free_and_strdup(&c.vc_keymap, "es-dvorak") >= 0);
|
|
|
|
|
|
|
|
assert_se(vconsole_convert_to_x11(&c) == 0); // FIXME
|
|
|
|
assert_se(streq(c.x11_layout, "es"));
|
|
|
|
assert_se(c.x11_variant == NULL); // FIXME: "dvorak"
|
|
|
|
|
|
|
|
log_info("/* test with old mapping (fr:latin9) */");
|
|
|
|
assert_se(free_and_strdup(&c.vc_keymap, "fr-latin9") >= 0);
|
|
|
|
|
|
|
|
assert_se(vconsole_convert_to_x11(&c) == 1);
|
|
|
|
assert_se(streq(c.x11_layout, "fr"));
|
|
|
|
assert_se(streq(c.x11_variant, "latin9"));
|
|
|
|
|
|
|
|
log_info("/* test with a compound mapping (ru,us) */");
|
|
|
|
assert_se(free_and_strdup(&c.vc_keymap, "ru") >= 0);
|
|
|
|
|
|
|
|
assert_se(vconsole_convert_to_x11(&c) == 1);
|
|
|
|
assert_se(streq(c.x11_layout, "ru,us"));
|
|
|
|
assert_se(c.x11_variant == NULL);
|
|
|
|
|
|
|
|
log_info("/* test with a simple mapping (us) */");
|
|
|
|
assert_se(free_and_strdup(&c.vc_keymap, "us") >= 0);
|
|
|
|
|
|
|
|
assert_se(vconsole_convert_to_x11(&c) == 1);
|
|
|
|
assert_se(streq(c.x11_layout, "us"));
|
|
|
|
assert_se(c.x11_variant == NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_x11_convert_to_vconsole(void) {
|
2018-11-22 22:12:45 +01:00
|
|
|
_cleanup_(context_clear) Context c = {};
|
2016-06-05 00:15:42 +02:00
|
|
|
int r;
|
2016-05-28 23:53:00 +02:00
|
|
|
|
2016-06-05 00:15:42 +02:00
|
|
|
log_info("/*** %s ***/", __func__);
|
2016-05-28 23:53:00 +02:00
|
|
|
|
|
|
|
log_info("/* test emptying first (:) */");
|
|
|
|
assert_se(free_and_strdup(&c.vc_keymap, "foobar") >= 0);
|
|
|
|
assert_se(x11_convert_to_vconsole(&c) == 1);
|
|
|
|
assert_se(c.vc_keymap == NULL);
|
|
|
|
|
|
|
|
log_info("/* test emptying second (:) */");
|
|
|
|
|
|
|
|
assert_se(x11_convert_to_vconsole(&c) == 0);
|
|
|
|
assert_se(c.vc_keymap == NULL);
|
|
|
|
|
|
|
|
log_info("/* test without variant, new mapping (es:) */");
|
|
|
|
assert_se(free_and_strdup(&c.x11_layout, "es") >= 0);
|
|
|
|
|
|
|
|
assert_se(x11_convert_to_vconsole(&c) == 1);
|
|
|
|
assert_se(streq(c.vc_keymap, "es"));
|
|
|
|
|
|
|
|
log_info("/* test with unknown variant, new mapping (es:foobar) */");
|
|
|
|
assert_se(free_and_strdup(&c.x11_variant, "foobar") >= 0);
|
|
|
|
|
|
|
|
assert_se(x11_convert_to_vconsole(&c) == 0);
|
|
|
|
assert_se(streq(c.vc_keymap, "es"));
|
|
|
|
|
|
|
|
log_info("/* test with known variant, new mapping (es:dvorak) */");
|
|
|
|
assert_se(free_and_strdup(&c.x11_variant, "dvorak") >= 0);
|
|
|
|
|
2016-06-05 00:15:42 +02:00
|
|
|
r = x11_convert_to_vconsole(&c);
|
|
|
|
if (r == 0) {
|
|
|
|
log_info("Skipping rest of %s: keymaps are not installed", __func__);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert_se(r == 1);
|
2016-05-28 23:53:00 +02:00
|
|
|
assert_se(streq(c.vc_keymap, "es-dvorak"));
|
|
|
|
|
|
|
|
log_info("/* test with old mapping (fr:latin9) */");
|
|
|
|
assert_se(free_and_strdup(&c.x11_layout, "fr") >= 0);
|
|
|
|
assert_se(free_and_strdup(&c.x11_variant, "latin9") >= 0);
|
|
|
|
|
|
|
|
assert_se(x11_convert_to_vconsole(&c) == 1);
|
|
|
|
assert_se(streq(c.vc_keymap, "fr-latin9"));
|
|
|
|
|
|
|
|
log_info("/* test with a compound mapping (us,ru:) */");
|
|
|
|
assert_se(free_and_strdup(&c.x11_layout, "us,ru") >= 0);
|
|
|
|
assert_se(free_and_strdup(&c.x11_variant, NULL) >= 0);
|
|
|
|
|
|
|
|
assert_se(x11_convert_to_vconsole(&c) == 1);
|
|
|
|
assert_se(streq(c.vc_keymap, "us"));
|
|
|
|
|
|
|
|
log_info("/* test with a compound mapping (ru,us:) */");
|
|
|
|
assert_se(free_and_strdup(&c.x11_layout, "ru,us") >= 0);
|
|
|
|
assert_se(free_and_strdup(&c.x11_variant, NULL) >= 0);
|
|
|
|
|
|
|
|
assert_se(x11_convert_to_vconsole(&c) == 1);
|
|
|
|
assert_se(streq(c.vc_keymap, "ru"));
|
keymap-util: also "convert" 'ru' to 'ru'
As discovered by Adam Williamson in
https://bugzilla.redhat.com/show_bug.cgi?id=1333998#c32, after the changes in
81fd105a5f9 we would only match compound layouts, i.e. a comma would be
required after 'ru' to match. This seems wrong, and we should match single
layouts like too. So 'ru', 'ru,us' now both match.
startswith_comma is changed to not require a comma, i.e. check that the prefix
matches until a comma or the end of the string. Note that startswith_comma is
called twice. At the first site, we check that strings are not equal
beforehand, so this change to startswith_comma has no effect. At the second
site, it does have an effect, as described above.
2016-05-30 04:02:57 +02:00
|
|
|
|
|
|
|
/* https://bugzilla.redhat.com/show_bug.cgi?id=1333998 */
|
|
|
|
log_info("/* test with a simple new mapping (ru:) */");
|
|
|
|
assert_se(free_and_strdup(&c.x11_layout, "ru") >= 0);
|
|
|
|
assert_se(free_and_strdup(&c.x11_variant, NULL) >= 0);
|
|
|
|
|
|
|
|
assert_se(x11_convert_to_vconsole(&c) == 0);
|
|
|
|
assert_se(streq(c.vc_keymap, "ru"));
|
2016-05-28 23:53:00 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int main(int argc, char **argv) {
|
2019-01-20 18:21:09 +01:00
|
|
|
test_setup_logging(LOG_DEBUG);
|
2016-05-28 23:53:00 +02:00
|
|
|
|
|
|
|
test_find_language_fallback();
|
|
|
|
test_find_converted_keymap();
|
|
|
|
test_find_legacy_keymap();
|
|
|
|
|
|
|
|
test_vconsole_convert_to_x11();
|
|
|
|
test_x11_convert_to_vconsole();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|