From b51d0e0b00a284486c1a34cb82c3a67e4fd7b829 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 19 Aug 2021 12:15:42 +0200
Subject: [PATCH] fix(linux): Address code review comments

---
 .../desktop/tests/unit/kmx/013 - deadkeys.kmn   |   6 +++---
 .../desktop/tests/unit/kmx/013 - deadkeys.kmx   | Bin 496 -> 488 bytes
 .../desktop/tests/unit/kmx/031 - caps lock.kmn  |  12 ++----------
 .../desktop/tests/unit/kmx/031 - caps lock.kmx  | Bin 876 -> 740 bytes
 .../kmx/048 - modifier keys keep context.kmn    |  14 ++++++++++++++
 .../kmx/048 - modifier keys keep context.kmx    | Bin 0 -> 460 bytes
 common/core/desktop/tests/unit/kmx/meson.build  |   3 ++-
 7 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 common/core/desktop/tests/unit/kmx/048 - modifier keys keep context.kmn
 create mode 100644 common/core/desktop/tests/unit/kmx/048 - modifier keys keep context.kmx

diff --git a/common/core/desktop/tests/unit/kmx/013 - deadkeys.kmn b/common/core/desktop/tests/unit/kmx/013 - deadkeys.kmn
index 3416755a07..e462491840 100644
--- a/common/core/desktop/tests/unit/kmx/013 - deadkeys.kmn	
+++ b/common/core/desktop/tests/unit/kmx/013 - deadkeys.kmn	
@@ -1,6 +1,6 @@
 c Description: Tests a simple deadkey rule in Unicode
-c keys: [SHIFT K_6][K_A][SHIFT K_6][K_SHIFT][K_A][SHIFT K_6][RALT K_B][K_A][SHIFT K_6][K_CAPS][K_A]
-c expected: pass.pass.pass.pass.
+c keys: [SHIFT K_6][K_A]
+c expected: \u00E2
 c context:
 
 store(&VERSION) '9.0'
@@ -11,4 +11,4 @@ group(main) using keys
 
 + '^' > deadkey(1)
 
-dk(1) + [K_A] > 'pass.'
+dk(1) + 'a' >  U+00E2
diff --git a/common/core/desktop/tests/unit/kmx/013 - deadkeys.kmx b/common/core/desktop/tests/unit/kmx/013 - deadkeys.kmx
index 738f057e0928d7bf963e73261b661f9bc50a0871..68d8f4a313dd749435ea44f965d33f73d5e2f867 100644
GIT binary patch
delta 69
zcmeys{DPUsJ0c{Qfs=uu<HpB|i99-tFE(1XGHN9<Ffi}|F$mmYWMFsz#Q*<uFaRka
Jcm%{S9srV35O4qh

delta 77
zcmaFC{DGOrJ0c{Qfs=tDZGWD^L>?W+4;w988I2qn7#R3~n8AU8;SM7M!wVq(|DS^a
SNC80sLn1>l5b6QhFi`;5B@mSW

diff --git a/common/core/desktop/tests/unit/kmx/031 - caps lock.kmn b/common/core/desktop/tests/unit/kmx/031 - caps lock.kmn
index b2b6151386..8a3f3468b1 100644
--- a/common/core/desktop/tests/unit/kmx/031 - caps lock.kmn	
+++ b/common/core/desktop/tests/unit/kmx/031 - caps lock.kmn	
@@ -1,6 +1,6 @@
 c Description: Tests Caps Lock
-c keys: [K_1][SHIFT K_2][SHIFT K_3][K_A][SHIFT K_B][K_C][K_CAPS][K_D]
-c expected: pass.pass.pass.pass.pass.pass.pass.
+c keys: [K_1][SHIFT K_2][SHIFT K_3][K_A][SHIFT K_B]
+c expected: pass.pass.pass.pass.pass.
 c capsLock: 1
 c context:
 
@@ -24,11 +24,3 @@ group(Main) using keys
 
 + 'b' > 'pass.'
 + 'B' > 'fail.'
-
-c Caps is on. The virtual key should match.
-+ [SHIFT K_C] > 'fail.'
-+ [K_C] > 'pass.'
-
-c Caps was pressed and released, so Caps is now off.  The virtual key should still match.
-+ [SHIFT K_D] > 'fail.'
-+ [K_D] > 'pass.'
diff --git a/common/core/desktop/tests/unit/kmx/031 - caps lock.kmx b/common/core/desktop/tests/unit/kmx/031 - caps lock.kmx
index 27533f5a2acecd1bd5e60d07f6c6c9fe2be8758b..e317f13349c7e2582fea5f7b1cd91b59e30820a3 100644
GIT binary patch
delta 241
zcmaFE_JozkJ0c{Qfs28GA*Aa4L>?WcCrlfyTo@U-Cf75{)<-ZgFr)ynAyA$dh#8z1
z7}9|JBB&T2NX(Iep#;cp0AgbxR|F&m1WiDG9}pV>*#aQ!#K15C$e#lh69kC?_09wG
zR{=4Q$si8IAg~6=-@(LS4YH3x3M|CHunQ=742Tnfd@-ol2_XLp5GMiol2Ea0K>j19
V$-kK7Cck6io6N;51EeiLYygP>A(j9D

delta 330
zcmXYsu}Z^G7)HO`iy|e43Q}#M1w|Z02Wuy%*mf(FLOVE!priN>d4<Z|okd&(ap)*M
zfcOC7(6RIZN{605%?}5@b07(sZp=30-t}mxk~CSI`KS2QJ^J^{ZWJXUi|W~nlRn^F
z(l)3qed1q5ORQZ<-}nz)pu5(%U;Gc6?6T38{_$DScC7L29A5xadtkT3x4bg@o@#lL
zN?xi!2d_gpmG<!?=;8-OJI0%EhgZO^g{N@OuI7b*!TZp`8`e^3fZu?<?@;kN-Vz>s
Ucy*2N?2<5XC*cjo>~X%66=94hDgXcg

diff --git a/common/core/desktop/tests/unit/kmx/048 - modifier keys keep context.kmn b/common/core/desktop/tests/unit/kmx/048 - modifier keys keep context.kmn
new file mode 100644
index 0000000000..629b9b2422
--- /dev/null
+++ b/common/core/desktop/tests/unit/kmx/048 - modifier keys keep context.kmn	
@@ -0,0 +1,14 @@
+c Description: Tests that modifier keys don't reset context (#5591)
+c keys: [K_A][K_SHIFT][K_B][K_A][K_ALT][K_B][K_A][K_CAPS][K_B]
+c expected: pass.pass.pass.
+c context:
+
+store(&VERSION) '9.0'
+
+begin unicode > use(main)
+
+group(main) using keys
+
++ [K_A] > 'a'
+
+'a' + [K_B] > 'pass.'
diff --git a/common/core/desktop/tests/unit/kmx/048 - modifier keys keep context.kmx b/common/core/desktop/tests/unit/kmx/048 - modifier keys keep context.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..52c70f61e048f18e841e18d1137ba6a7c988e63b
GIT binary patch
literal 460
zcmZvXO-lk%6o%h%lYvN!w5_XXA(9bjAYo$>A{eAa+o1^@F^w?__paO2Z)p+zfENB9
zaS_&YW+rLj8J=_A^KtK)+q&s?v?;w7Ydv9(Icx(=*I|J8!H_GPC4)ICb9jS1e8U2E
zAj8a(n1(z$3tQ+CaWBy>@ffzL_laF-DAb)iJ>q>8^sE5gL$#<(bWd+cc1rdH1C8`R
z45?WjYRrjIG*i~0O4^45RrpMs#s2?&Ry|7kySmnyF4a*}7i!ZfM<>qlg=l}k?NSw7
zU7-Wrve9R|&92`$b)*;gvlPNodry4d30cP4b?Kef2e_o!r1nYv1)k-++2f^S{yDDv
E0ub#r&Hw-a

literal 0
HcmV?d00001

diff --git a/common/core/desktop/tests/unit/kmx/meson.build b/common/core/desktop/tests/unit/kmx/meson.build
index 783a936f92..28b53051bd 100644
--- a/common/core/desktop/tests/unit/kmx/meson.build
+++ b/common/core/desktop/tests/unit/kmx/meson.build
@@ -69,7 +69,8 @@ tests = [
   '044 - if and context',
   '045 - deadkey and context',
   '046 - deadkey and contextex',
-  '047 - caps always off initially on'
+  '047 - caps always off initially on',
+  '048 - modifier keys keep context'
 ]
 
 if build_machine.system() == 'windows'