Add more tests to US and UK.

Just to be sure I've got this right, I go from scancodes to Unicode, based on various online tables.

Author: thejpster

src/layouts/uk105.rs

@@ -79,7 +79,70 @@ impl KeyboardLayout for Uk105Key {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::{HandleControl, Keyboard, ScancodeSet2};
+    use crate::{EventDecoder, HandleControl, Keyboard, ScancodeSet, ScancodeSet1, ScancodeSet2};
+
+    #[test]
+    fn layout() {
+        // Codes taken from https://kbdlayout.info/kbduk/overview+scancodes?arrangement=ISO105
+        let mut s = ScancodeSet1::new();
+        let mut dec = EventDecoder::new(Uk105Key, HandleControl::Ignore);
+        let data = [
+            (0x29, '`'),
+            (0x02, '1'),
+            (0x03, '2'),
+            (0x04, '3'),
+            (0x05, '4'),
+            (0x06, '5'),
+            (0x07, '6'),
+            (0x08, '7'),
+            (0x09, '8'),
+            (0x0a, '9'),
+            (0x0b, '0'),
+            (0x0c, '-'),
+            (0x0d, '='),
+            (0x0f, '\t'),
+            (0x10, 'q'),
+            (0x11, 'w'),
+            (0x12, 'e'),
+            (0x13, 'r'),
+            (0x14, 't'),
+            (0x15, 'y'),
+            (0x16, 'u'),
+            (0x17, 'i'),
+            (0x18, 'o'),
+            (0x19, 'p'),
+            (0x1a, '['),
+            (0x1b, ']'),
+            (0x1e, 'a'),
+            (0x1f, 's'),
+            (0x20, 'd'),
+            (0x21, 'f'),
+            (0x22, 'g'),
+            (0x23, 'h'),
+            (0x24, 'j'),
+            (0x25, 'k'),
+            (0x26, 'l'),
+            (0x27, ';'),
+            (0x28, '\''),
+            (0x2B, '#'),
+            (0x1c, '\n'),
+            (0x56, '\\'),
+            (0x2c, 'z'),
+            (0x2d, 'x'),
+            (0x2e, 'c'),
+            (0x2f, 'v'),
+            (0x30, 'b'),
+            (0x31, 'n'),
+            (0x32, 'm'),
+            (0x33, ','),
+            (0x34, '.'),
+            (0x35, '/'),
+        ];
+        for (code, unicode) in data {
+            let ev = s.advance_state(code).unwrap().unwrap();
+            assert_eq!(Some(DecodedKey::Unicode(unicode)), dec.process_keyevent(ev));
+        }
+    }
 
     #[test]
     fn test_hash() {

src/layouts/us104.rs

@@ -214,7 +214,7 @@ impl KeyboardLayout for Us104Key {
                     DecodedKey::Unicode(']')
                 }
             }
-            KeyCode::Oem7 => {
+            KeyCode::Oem5 => {
                 if modifiers.is_shifted() {
                     DecodedKey::Unicode('|')
                 } else {
@@ -484,3 +484,71 @@ impl KeyboardLayout for Us104Key {
         }
     }
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::{EventDecoder, ScancodeSet, ScancodeSet1};
+
+    #[test]
+    fn layout() {
+        // Codes taken from https://kbdlayout.info/kbdus/overview+scancodes?arrangement=ANSI104
+        let mut s = ScancodeSet1::new();
+        let mut dec = EventDecoder::new(Us104Key, HandleControl::Ignore);
+        let data = [
+            (0x29, '`'),
+            (0x02, '1'),
+            (0x03, '2'),
+            (0x04, '3'),
+            (0x05, '4'),
+            (0x06, '5'),
+            (0x07, '6'),
+            (0x08, '7'),
+            (0x09, '8'),
+            (0x0a, '9'),
+            (0x0b, '0'),
+            (0x0c, '-'),
+            (0x0d, '='),
+            (0x0f, '\t'),
+            (0x10, 'q'),
+            (0x11, 'w'),
+            (0x12, 'e'),
+            (0x13, 'r'),
+            (0x14, 't'),
+            (0x15, 'y'),
+            (0x16, 'u'),
+            (0x17, 'i'),
+            (0x18, 'o'),
+            (0x19, 'p'),
+            (0x1a, '['),
+            (0x1b, ']'),
+            (0x56, '\\'),
+            (0x1e, 'a'),
+            (0x1f, 's'),
+            (0x20, 'd'),
+            (0x21, 'f'),
+            (0x22, 'g'),
+            (0x23, 'h'),
+            (0x24, 'j'),
+            (0x25, 'k'),
+            (0x26, 'l'),
+            (0x27, ';'),
+            (0x28, '\''),
+            (0x1c, '\n'),
+            (0x2c, 'z'),
+            (0x2d, 'x'),
+            (0x2e, 'c'),
+            (0x2f, 'v'),
+            (0x30, 'b'),
+            (0x31, 'n'),
+            (0x32, 'm'),
+            (0x33, ','),
+            (0x34, '.'),
+            (0x35, '/'),
+        ];
+        for (code, unicode) in data {
+            let ev = s.advance_state(code).unwrap().unwrap();
+            assert_eq!(Some(DecodedKey::Unicode(unicode)), dec.process_keyevent(ev));
+        }
+    }
+}