From e6a6b75115eed9e3c57d09c36951f6511c1c8345 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Fri, 12 Dec 2025 19:23:25 +0100 Subject: [PATCH] test(common): add new baseline test `k_0202___alt.kmn` This is basically the same test as `k_0201___ralt_2.kmn` but uses ALT instead of RALT in the rule. Also update `k_0201___ralt_2.kmn` to be a bit more extensive. Note: since the change in `k_0201___ralt_2.kmn` is only in the test data, i.e. the comments, the .js and .kmx files don't change. Related-to: #15358 Test-bot: skip --- .../keyboards/baseline/k_0201___ralt_2.kmn | 4 +-- .../test/keyboards/baseline/k_0202___alt.js | 34 ++++++++++++++++++ .../test/keyboards/baseline/k_0202___alt.kmn | 13 +++++++ .../test/keyboards/baseline/k_0202___alt.kmx | Bin 0 -> 364 bytes core/tests/unit/kmx/meson.build | 1 + developer/src/kmcmplib/tests/meson.build | 1 + .../test/auto/e2e/baseline/baseline.tests.ts | 9 +++-- 7 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 common/test/keyboards/baseline/k_0202___alt.js create mode 100755 common/test/keyboards/baseline/k_0202___alt.kmn create mode 100644 common/test/keyboards/baseline/k_0202___alt.kmx diff --git a/common/test/keyboards/baseline/k_0201___ralt_2.kmn b/common/test/keyboards/baseline/k_0201___ralt_2.kmn index 6606a5d96d5..d22af03e742 100644 --- a/common/test/keyboards/baseline/k_0201___ralt_2.kmn +++ b/common/test/keyboards/baseline/k_0201___ralt_2.kmn @@ -1,8 +1,8 @@ store(&VERSION) '9.0' store(&NAME) '0201 - ralt 2' c Description: Tests Right Alt processing with non-US kbds. -c keys: [K_A][K_B][K_C][RALT K_A] -c expected: abcd +c keys: [K_A][K_B][K_C][RALT K_A][K_A][K_B][K_C][K_A] +c expected: abcdabca store(&TARGETS) 'any' diff --git a/common/test/keyboards/baseline/k_0202___alt.js b/common/test/keyboards/baseline/k_0202___alt.js new file mode 100644 index 00000000000..c0643cfca44 --- /dev/null +++ b/common/test/keyboards/baseline/k_0202___alt.js @@ -0,0 +1,34 @@ + +KeymanWeb.KR(new Keyboard_k_0202___alt()); + +function Keyboard_k_0202___alt() +{ + + this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9; + this.KI="Keyboard_k_0202___alt"; + this.KN="0202 - alt"; + this.KMINVER="9.0"; + this.KV=null; + this.KDU=0; + this.KH=''; + this.KM=0; + this.KBVER="1.0"; + this.KMBM=0x0040; + this.KVS=[]; + this.gs=function(t,e) { + return this.g_main_0(t,e); + }; + this.gs=function(t,e) { + return this.g_main_0(t,e); + }; + this.g_main_0=function(t,e) { + var k=KeymanWeb,r=0,m=0; + if(k.KKM(e, 0x4040, 0x41)) { + if(k.KCM(1,t,"c",1)){ + r=m=1; // Line 13 + k.KO(1,t,"cd"); + } + } + return r; + }; +} diff --git a/common/test/keyboards/baseline/k_0202___alt.kmn b/common/test/keyboards/baseline/k_0202___alt.kmn new file mode 100755 index 00000000000..3c5415f7293 --- /dev/null +++ b/common/test/keyboards/baseline/k_0202___alt.kmn @@ -0,0 +1,13 @@ +store(&VERSION) '9.0' +store(&NAME) '0202 - alt' +c Description: Tests Alt processing with non-US kbds. +c keys: [K_A][K_B][K_C][RALT K_A][K_A][K_B][K_C][K_A] +c expected: abcdabca + +store(&TARGETS) 'any' + +begin Unicode > use(main) + +group(main) using keys + +'c' + [Alt K_A] > "cd" diff --git a/common/test/keyboards/baseline/k_0202___alt.kmx b/common/test/keyboards/baseline/k_0202___alt.kmx new file mode 100644 index 0000000000000000000000000000000000000000..14a61fc01b41a6265fa356230c5ac9ac88aef222 GIT binary patch literal 364 zcmYL@J4ypl6ox+=ABA8Q!79~MDx+Pxi6|n$2+2fj^MVB8qp-<7QiQBPQf3XV!Ufpr z7R+}pYR>T8`OkkI_ck8NHhb{07<^%D#bNA7=t7PaKZf!@Ccljpow>~9P~K!AyRwp{ z#I6r{mrTCpQx0T1_DJX>{}svA&|t`vN4h+vyvAv&WZZK_i#9jh(X^Ixo~Uv{)&2>u zx|y{)xAu~DOp{mYwYb(T-2i8PnCDK$UE_3HP49w^dQ6{Z2EGL@eOpuhB4n_ctDEgh NQ9#eqNcv9432P7EC>{U+ literal 0 HcmV?d00001 diff --git a/core/tests/unit/kmx/meson.build b/core/tests/unit/kmx/meson.build index a3af0a741ea..9acf6cf94f7 100644 --- a/core/tests/unit/kmx/meson.build +++ b/core/tests/unit/kmx/meson.build @@ -51,6 +51,7 @@ tests = [ 'k_0107___punctkeys', 'k_0200___ralt', 'k_0201___ralt_2', + 'k_0202___alt', 'k_0203___generic_ctrlalt', 'k_0300___deadkeys', 'k_0301___multiple_deadkeys', diff --git a/developer/src/kmcmplib/tests/meson.build b/developer/src/kmcmplib/tests/meson.build index 7d90e03cf0e..9745699ace4 100644 --- a/developer/src/kmcmplib/tests/meson.build +++ b/developer/src/kmcmplib/tests/meson.build @@ -45,6 +45,7 @@ tests = [ 'k_0107___punctkeys', 'k_0200___ralt', 'k_0201___ralt_2', + 'k_0202___alt', 'k_0203___generic_ctrlalt', 'k_0300___deadkeys', 'k_0301___multiple_deadkeys', diff --git a/web/src/test/auto/e2e/baseline/baseline.tests.ts b/web/src/test/auto/e2e/baseline/baseline.tests.ts index 38e45bb8b1d..945d5e6620d 100644 --- a/web/src/test/auto/e2e/baseline/baseline.tests.ts +++ b/web/src/test/auto/e2e/baseline/baseline.tests.ts @@ -43,7 +43,8 @@ const testsToFix = { 'k_0105___vkey_input__ctrl_alt_2_.kmn', // kmx only 'k_0106___smp.kmn', // kmx only 'k_0200___ralt.kmn', // kmx only - 'k_0201___ralt_2.kmn', // kmx only + 'k_0201___ralt_2.kmn', + 'k_0202___alt.kmn', 'k_0203___generic_ctrlalt.kmn', 'k_0400___groups_and_virtual_keys.kmn', // kmx only 'k_0501___options_with_preset.kmn', @@ -63,12 +64,10 @@ const testsToFix = { // TODO: fix these tests (#15342) '.js': [ 'k_0000___null_keyboard.kmn', - // 'k_0103___vkey_input__shift_ctrl_.kmn', 'k_0104___vkey_input__ctrl_alt_.kmn', - // 'k_0105___vkey_input__ctrl_alt_2_.kmn', - // 'k_0200___ralt.kmn', + 'k_0201___ralt_2.kmn', // #15358 + 'k_0202___alt.kmn', // #15358 'k_0203___generic_ctrlalt.kmn', - // 'k_0400___groups_and_virtual_keys.kmn', 'k_0501___options_with_preset.kmn', 'k_0503___options_with_save_and_preset.kmn', 'k_0504___options_with_reset.kmn',