test: rework the output for the xkeyboard-config layout tester

[platform/upstream/libxkbcommon.git] / test / stringcomp.c

diff --git a/test/stringcomp.c b/test/stringcomp.c
index 402b9a6..0388404 100644 (file)
--- a/test/stringcomp.c
+++ b/test/stringcomp.c
@@ -21,11 +21,12 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "xkbcommon/xkbcommon.h"
 #include "test.h"
 
 #define DATA_PATH "keymaps/stringcomp.data"
@@ -33,9 +34,9 @@
 int
 main(int argc, char *argv[])
 {
-    struct xkb_context *ctx = test_get_context();
+    struct xkb_context *ctx = test_get_context(0);
     struct xkb_keymap *keymap;
-    char *original, *dump;
+    char *original, *dump, *dump2;
 
     assert(ctx);
 
@@ -48,7 +49,7 @@ main(int argc, char *argv[])
     keymap = test_compile_string(ctx, original);
     assert(keymap);
 
-    dump = xkb_map_get_as_string(keymap);
+    dump = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_USE_ORIGINAL_FORMAT);
     assert(dump);
 
     if (!streq(original, dump)) {
@@ -56,8 +57,9 @@ main(int argc, char *argv[])
                 "round-trip test failed: dumped map differs from original\n");
         fprintf(stderr, "path to original file: %s\n",
                 test_get_path(DATA_PATH));
-        fprintf(stderr, "length: dumped %zu, original %zu\n",
-                strlen(dump), strlen(original));
+        fprintf(stderr, "length: dumped %lu, original %lu\n",
+                (unsigned long) strlen(dump),
+                (unsigned long) strlen(original));
         fprintf(stderr, "dumped map:\n");
         fprintf(stderr, "%s\n", dump);
         fflush(stderr);
@@ -66,12 +68,39 @@ main(int argc, char *argv[])
 
     free(original);
     free(dump);
-    xkb_map_unref(keymap);
+    xkb_keymap_unref(keymap);
 
     /* Make sure we can't (falsely claim to) compile an empty string. */
     keymap = test_compile_string(ctx, "");
     assert(!keymap);
 
+    /* Make sure we can recompile our output for a normal keymap from rules. */
+    keymap = test_compile_rules(ctx, NULL, NULL,
+                                "ru,ca,de,us", ",multix,neo,intl", NULL);
+    assert(keymap);
+    dump = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_USE_ORIGINAL_FORMAT);
+    assert(dump);
+    xkb_keymap_unref(keymap);
+    keymap = test_compile_string(ctx, dump);
+    assert(keymap);
+    /* Now test that the dump of the dump is equal to the dump! */
+    dump2 = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_USE_ORIGINAL_FORMAT);
+    assert(dump2);
+    assert(streq(dump, dump2));
+
+    /* Test response to invalid formats and flags. */
+    assert(!xkb_keymap_new_from_string(ctx, dump, 0, 0));
+    assert(!xkb_keymap_new_from_string(ctx, dump, -1, 0));
+    assert(!xkb_keymap_new_from_string(ctx, dump, XKB_KEYMAP_FORMAT_TEXT_V1+1, 0));
+    assert(!xkb_keymap_new_from_string(ctx, dump, XKB_KEYMAP_FORMAT_TEXT_V1, -1));
+    assert(!xkb_keymap_new_from_string(ctx, dump, XKB_KEYMAP_FORMAT_TEXT_V1, 1414));
+    assert(!xkb_keymap_get_as_string(keymap, 0));
+    assert(!xkb_keymap_get_as_string(keymap, 4893));
+
+    xkb_keymap_unref(keymap);
+    free(dump);
+    free(dump2);
+
     xkb_context_unref(ctx);
 
     return 0;