From 31ebe42d2e256ffef975a89c86d008fec4e5394b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 29 Mar 2023 07:34:27 -0400 Subject: [PATCH 1/2] testsuite: Update a test cacecd2fb54025a changed a warning message that some tests check for. Oops. --- testsuite/gdk/display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testsuite/gdk/display.c b/testsuite/gdk/display.c index bf87567de2..ca1d668f8a 100644 --- a/testsuite/gdk/display.c +++ b/testsuite/gdk/display.c @@ -31,7 +31,7 @@ test_unset_display (void) g_test_trap_subprocess ("/display/unset-display/subprocess/2", 0, 0); g_test_trap_assert_failed (); - g_test_trap_assert_stderr ("*cannot open display*"); + g_test_trap_assert_stderr ("*Failed to open display*"); } static void @@ -62,7 +62,7 @@ test_bad_display (void) g_test_trap_subprocess ("/display/bad-display/subprocess/2", 0, 0); g_test_trap_assert_failed (); - g_test_trap_assert_stderr ("*cannot open display*"); + g_test_trap_assert_stderr ("*Failed to open display*"); } int From dbefc330bde4b4a85aadff298c55e6b0937b6818 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 28 Mar 2023 21:04:10 -0400 Subject: [PATCH 2/2] Add some more keysyms tests Spot-check a few keypad symbols. --- testsuite/gdk/keysyms.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/testsuite/gdk/keysyms.c b/testsuite/gdk/keysyms.c index 3d4480ebb9..91e5cdc307 100644 --- a/testsuite/gdk/keysyms.c +++ b/testsuite/gdk/keysyms.c @@ -113,6 +113,10 @@ test_key_unicode (void) { GDK_KEY_A, 'A' }, { GDK_KEY_EuroSign, 0x20ac }, { UNICODE_KEYVAL (0x1f60b), 0x1f60b }, + }, + oneway_tests[] = { + { GDK_KEY_KP_0, '0' }, + { GDK_KEY_KP_Divide, '/' }, }; guint i; @@ -121,6 +125,11 @@ test_key_unicode (void) g_assert_cmpuint (gdk_keyval_to_unicode (tests[i].key), ==, tests[i].ch); g_assert_cmpuint (gdk_unicode_to_keyval (tests[i].ch), ==, tests[i].key); } + + for (i = 0; i < G_N_ELEMENTS (oneway_tests); i++) + { + g_assert_cmpuint (gdk_keyval_to_unicode (tests[i].key), ==, tests[i].ch); + } } int