Move lk_ctx content to private part of library

[platform/upstream/kbd.git] / tests / libkeymap-kmap.c

diff --git a/tests/libkeymap-kmap.c b/tests/libkeymap-kmap.c
index 1611e70..a5791f5 100644 (file)
--- a/tests/libkeymap-kmap.c
+++ b/tests/libkeymap-kmap.c
@@ -6,71 +6,52 @@
 
 START_TEST(test_add_map_border)
 {
-       struct keymap kmap;
+       struct lk_ctx *ctx;
 
-       lk_init(&kmap);
-       kmap.log_fn = NULL;
+       ctx = lk_init();
+       lk_set_log_fn(ctx, NULL, NULL);
 
-       fail_if(lk_add_map(&kmap, -1, 0) == 0,
-               "Possible to define the map with index -1");
+       fail_unless(lk_add_map(ctx, MAX_NR_KEYMAPS) == 0,
+               "Unable to define map == MAX_NR_KEYMAPS");
 
-       fail_if(lk_add_map(&kmap, MAX_NR_KEYMAPS, 0) == 0,
-               "Possible to define the map with index -1");
+       fail_unless(lk_add_map(ctx, MAX_NR_KEYMAPS*2) == 0,
+               "Unable to define map == MAX_NR_KEYMAPS*2");
 
-       fail_unless(lk_add_map(&kmap, 0, 0) == 0,
+       fail_unless(lk_add_map(ctx, 0) == 0,
                "Unable to define map");
 
-       fail_unless(lk_add_map(&kmap, 0, 0) == 0,
+       fail_unless(lk_add_map(ctx, 0) == 0,
                "Unable to define map");
 
-       lk_free(&kmap);
+       lk_free(ctx);
 }
 END_TEST
 
 START_TEST(test_add_map_0)
 {
-       int explicit;
-       struct keymap kmap;
+       struct lk_ctx *ctx;
+       struct kmapinfo info;
 
-       lk_init(&kmap);
-       kmap.log_fn = NULL;
-       kmap.keymaps_line_seen = 1;
+       ctx = lk_init();
+       lk_set_log_fn(ctx, NULL, NULL);
 
-       explicit = 0;
-       fail_if(lk_add_map(&kmap, 0, explicit) == 0,
-               "Possible to define map (keymaps_line_seen=%d, explicit=%d)",
-                       kmap.keymaps_line_seen, explicit);
+       fail_if(lk_add_map(ctx, 0) != 0, "Unable to define map");
+       lk_get_kmapinfo(ctx, &info);
+       fail_if(info.keymaps != 1, "Wrong keymap number");
 
-       explicit = 1;
-       fail_unless(lk_add_map(&kmap, 1, explicit) == 0,
-               "Possible to define map (keymaps_line_seen=%d, explicit=%d)",
-                       kmap.keymaps_line_seen, explicit);
-
-       lk_free(&kmap);
-}
-END_TEST
-
-START_TEST(test_add_map_1)
-{
-       int explicit = 0;
-       struct keymap kmap;
-
-       lk_init(&kmap);
-       kmap.log_fn = NULL;
-
-       fail_if(lk_add_map(&kmap, 0, explicit) != 0, "Unable to define map");
-       fail_if(kmap.max_keymap != 1, "Wrong max_keymap number");
-
-       fail_if(lk_add_map(&kmap, 0, explicit) != 0, "Unable to define map");
-       fail_if(kmap.max_keymap != 1, "Wrong max_keymap number");
+       fail_if(lk_add_map(ctx, 0) != 0, "Unable to define map");
+       lk_get_kmapinfo(ctx, &info);
+       fail_if(info.keymaps != 1, "Wrong keymap number");
                
-       fail_if(lk_add_map(&kmap, 1, explicit) != 0, "Unable to define map");
-       fail_if(kmap.max_keymap != 2, "Wrong max_keymap number");
+       fail_if(lk_add_map(ctx, 1) != 0, "Unable to define map");
+       lk_get_kmapinfo(ctx, &info);
+       fail_if(info.keymaps != 2, "Wrong keymap number");
 
-       fail_if(lk_add_map(&kmap, 2, explicit) != 0, "Unable to define map");
-       fail_if(kmap.max_keymap != 3, "Wrong max_keymap number");
+       fail_if(lk_add_map(ctx, 2) != 0, "Unable to define map");
+       lk_get_kmapinfo(ctx, &info);
+       fail_if(info.keymaps != 3, "Wrong keymap number");
 
-       lk_free(&kmap);
+       lk_free(ctx);
 }
 END_TEST
 
@@ -82,7 +63,6 @@ libkeymap_suite(void)
 
        tcase_add_test(tc_core, test_add_map_border);
        tcase_add_test(tc_core, test_add_map_0);
-       tcase_add_test(tc_core, test_add_map_1);
 
        suite_add_tcase(s, tc_core);
        return s;