From 49a06f926d1740744334904a99fe3adb45e7b4df Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn.lists@gmail.com>
Date: Thu, 22 Jan 2009 20:10:19 -0800
Subject: [PATCH] test: Add convenience functions for xkey.sh

---
 test/xkey.sh | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/test/xkey.sh b/test/xkey.sh
index b201822..a409302 100755
--- a/test/xkey.sh
+++ b/test/xkey.sh
@@ -13,18 +13,21 @@ check_error()
     fi
 }
 
-val=`${builddir}/xkey -s Undo` && \
-    check_error Undo 0xff65 $val || \
-    exit $?
+check_string()
+{
+    val=`${builddir}/xkey -s "$1"` &&
+        check_error "$1" "$2" "$val" ||
+        exit $?
+}
 
-val=`${builddir}/xkey -k 0x1008ff56` && \
-    check_error 0x1008FF56 XF86Close $val || \
-    exit $?
+check_key()
+{
+    val=`${builddir}/xkey -k "$1"` && \
+        check_error "$1" "$2" "$val" || \
+        exit $?
+}
 
-val=`${builddir}/xkey -s ThisKeyShouldNotExist` && \
-    check_error ThisKeyShouldNotExist NoSymbol $val || \
-    exit $?
-
-val=`${builddir}/xkey -k 0x0` && \
-    check_error 0x0 NULL $val || \
-    exit $?
+check_string Undo 0xff65
+check_key 0x1008FF56 XF86Close
+check_string ThisKeyShouldNotExist NoSymbol
+check_key 0x0 NULL