From kde-commits  Fri Sep 30 22:36:14 2011
From: Andriy Rysin <arysin () gmail ! com>
Date: Fri, 30 Sep 2011 22:36:14 +0000
To: kde-commits
Subject: [kde-workspace] kcontrol/keyboard/tests: unit tests
Message-Id: <20110930223614.BFE7BA60A6 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=131742219605292

Git commit e6503a0f939e2ffc3f446eeb4d1fb37969fbb315 by Andriy Rysin.
Committed on 30/09/2011 at 14:57.
Pushed by rysin into branch 'master'.

unit tests

M  +8    -2    kcontrol/keyboard/tests/CMakeLists.txt
M  +11   -0    kcontrol/keyboard/tests/xkb_rules_test.cpp

http://commits.kde.org/kde-workspace/e6503a0f939e2ffc3f446eeb4d1fb37969fbb315

diff --git a/kcontrol/keyboard/tests/CMakeLists.txt b/kcontrol/keyboard/tests/CMakeLists.txt
index 424014b..73a58b5 100644
--- a/kcontrol/keyboard/tests/CMakeLists.txt
+++ b/kcontrol/keyboard/tests/CMakeLists.txt
@@ -10,11 +10,17 @@ MACRO(KEYBOARD_DAEMON_UNIT_TESTS2 _testname _src1 _src2 _src3)
                target_link_libraries(${_testname}_test ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_Xkbfile_LIB})
 ENDMACRO(KEYBOARD_DAEMON_UNIT_TESTS2)
 
+#install( FILES config/base.xml config/base.1.1.xml DESTINATION ${BIN_INSTALL_DIR} )
+
+
 KEYBOARD_DAEMON_UNIT_TESTS(xkb_rules)
 KEYBOARD_DAEMON_UNIT_TESTS(iso_codes)
 
 kde4_add_unit_test(flags_test NOGUI flags_test.cpp ../flags.cpp ../x11_helper.cpp ../keyboard_config.cpp ../xkb_rules.cpp)
 target_link_libraries(flags_test ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_Xkbfile_LIB} ${X11_LIBRARIES} ${text_paint_LIB})
 
-kde4_add_unit_test(layout_memory_persister_test NOGUI layout_memory_persister_test.cpp ../layout_memory_persister.cpp ../layout_memory.cpp ../x11_helper.cpp ../keyboard_config.cpp ../xkb_helper.cpp)
-target_link_libraries(layout_memory_persister_test ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_Xkbfile_LIB} ${X11_LIBRARIES} ${text_paint_LIB})
+kde4_add_unit_test(keyboard_daemon_test NOGUI keyboard_daemon_test.cpp ../keyboard_daemon.cpp ../layout_memory.cpp ../flags.cpp ../x11_helper.cpp ../xkb_helper.cpp ../xinput_helper.cpp ../layout_tray_icon.cpp ../keyboard_config.cpp ../xkb_rules.cpp ../keyboard_hardware.cpp ../bindings.cpp ../layouts_menu.cpp ../numlockx.c)
+target_link_libraries(keyboard_daemon_test ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_Xkbfile_LIB} ${X11_LIBRARIES} ${text_paint_LIB})
+if(XiGetDevicePresence_FOUND)
+  target_link_libraries(keyboard_daemon_test ${X11_Xinput_LIB})
+endif(XiGetDevicePresence_FOUND)
diff --git a/kcontrol/keyboard/tests/xkb_rules_test.cpp b/kcontrol/keyboard/tests/xkb_rules_test.cpp
index e4e62c4..9cf49f2 100644
--- a/kcontrol/keyboard/tests/xkb_rules_test.cpp
+++ b/kcontrol/keyboard/tests/xkb_rules_test.cpp
@@ -196,6 +196,17 @@ private Q_SLOTS:
         QTextStream out(&file);
         out << doc.toString();
     }
+    
+    void testRulesVersion() {
+    	QVERIFY(!rules->version.isEmpty());
+
+    	Rules* rules10 = Rules::readRules(QString("config/base.xml"));
+    	QCOMPARE(rules10->version, QString("1.0"));
+    	delete rules10;
+    	Rules* rules11 = Rules::readRules(QString("config/base.1.1.xml"));
+    	QCOMPARE(rules11->version, QString("1.1"));
+    	delete rules11;
+    }
 
     void loadRulesBenchmark() {
     	QBENCHMARK {