tests: Executable for testing layouts

examples/test_layout.rs

@@ -1,77 +1,10 @@
 extern crate rs;
-extern crate xkbcommon;
 
+use rs::tests::check_builtin_layout;
 use std::env;
 
-use rs::data::Layout;
-use xkbcommon::xkb;
-
-use rs::util::WarningHandler;
-
-pub struct CountAndPrint(u32);
-
-impl WarningHandler for CountAndPrint {
-    fn handle(&mut self, warning: &str) {
-        self.0 = self.0 + 1;
-        println!("{}", warning);
-    }
-}
-
-impl CountAndPrint {
-    fn new() -> CountAndPrint {
-        CountAndPrint(0)
-    }
-}
-
-fn check_layout(name: &str) {
-    let handler = CountAndPrint::new();
-    let layout = Layout::from_resource(name).expect("Invalid layout file");
-    let (layout, handler) = layout.build(handler);
-
-    if handler.0 > 0 {
-        println!("{} mistakes in layout", handler.0)
-    }
-
-    let layout = layout.expect("layout broken");
-
-    let context = xkb::Context::new(xkb::CONTEXT_NO_FLAGS);
-    
-    let keymap_str = layout.keymap_str
-        .clone()
-        .into_string().expect("Failed to decode keymap string");
-    
-    let keymap = xkb::Keymap::new_from_string(
-        &context,
-        keymap_str.clone(),
-        xkb::KEYMAP_FORMAT_TEXT_V1,
-        xkb::KEYMAP_COMPILE_NO_FLAGS,
-    ).expect("Failed to create keymap");
-
-    let state = xkb::State::new(&keymap);
-    
-    // "Press" each button with keysyms
-    for view in layout.views.values() {
-        for row in &view.rows {
-            for button in &row.buttons {
-                let keystate = button.state.borrow();
-                for keycode in &keystate.keycodes {
-                    match state.key_get_one_sym(*keycode) {
-                        xkb::KEY_NoSymbol => {
-                            eprintln!("{}", keymap_str);
-                            panic!("Keysym {} on key {:?} can't be resolved", keycode, button.name);
-                        },
-                        _ => {},
-                    }
-                }
-            }
-        }
-    }
-
-    if handler.0 > 0 {
-        panic!("Layout contains mistakes");
-    }
-}
-
 fn main() -> () {
-    check_layout(env::args().nth(1).expect("No argument given").as_str());
+    check_builtin_layout(
+        env::args().nth(1).expect("No argument given").as_str()
+    );
 }