Make the autopilot tests work when the service is installed

Author: pete-woods

src/service/VoiceService.cpp

@@ -29,18 +29,16 @@ arg_t VoiceService::sphinx_cmd_ln[] = { POCKETSPHINX_OPTIONS, { "-adcdev",
 		CMDLN_EMPTY_OPTION };
 
 VoiceService::VoiceService(const QDBusConnection &connection,
-		const QString &deviceName, QObject *parent) :
+		const char *deviceName, QObject *parent) :
 		QObject(parent), m_adaptor(new VoiceAdaptor(this)), m_connection(
 				connection) {
 
-	QString name = deviceName;
-
-	if (!deviceName.isEmpty()) {
-		config = cmd_ln_init(0, sphinx_cmd_ln, TRUE, "-hmm", HMM_PATH, "-dict",
-				DICT_PATH, "-adcdev", name.toUtf8().data(), 0);
+	if (deviceName != nullptr) {
+		config = cmd_ln_init(nullptr, sphinx_cmd_ln, TRUE, "-hmm", HMM_PATH, "-dict",
+				DICT_PATH, "-adcdev", deviceName, nullptr);
 	} else {
-		config = cmd_ln_init(0, sphinx_cmd_ln, TRUE, "-hmm", HMM_PATH, "-dict",
-				DICT_PATH, 0);
+		config = cmd_ln_init(nullptr, sphinx_cmd_ln, TRUE, "-hmm", HMM_PATH, "-dict",
+				DICT_PATH, nullptr);
 	}
 
 	if (config == NULL) {

src/service/VoiceService.h

@@ -37,7 +37,7 @@ class VoiceService: public QObject, protected QDBusContext {
 Q_OBJECT
 public:
 	explicit VoiceService(const QDBusConnection &connection,
-			const QString &deviceName, QObject *parent = 0);
+			const char *deviceName, QObject *parent = 0);
 
 	virtual ~VoiceService();
 

src/service/main.cpp

@@ -44,9 +44,9 @@ int main(int argc, char *argv[]) {
 	QDBusConnection connection = QDBusConnection::sessionBus();
 	connection.registerService("com.canonical.Unity.Voice");
 
-	QString deviceName("");
+	char *deviceName = nullptr;
 	if (argc == 2) {
-		deviceName = QString::fromUtf8(argv[1]);
+		deviceName = argv[1];
 	}
 
 	VoiceService voiceService(QDBusConnection::sessionBus(), deviceName);

tests/CMakeLists.txt

@@ -59,3 +59,8 @@ execute_process(COMMAND python -c "from distutils.sysconfig import get_python_li
 install(DIRECTORY ${AUTOPILOT_DIR}
     DESTINATION ${PYTHON_PACKAGE_DIR}
     )
+
+install(
+	DIRECTORY "data/sounds"
+	DESTINATION "${PYTHON_PACKAGE_DIR}/unity_voice/"
+)

tests/TestPronounceDict.cpp

@@ -16,7 +16,7 @@
  * Author: Marcus Tomlinson <[email protected]>
  */
 
-#include <libunityvoice/PronounceDict.h>
+#include <service/PronounceDict.h>
 
 #include <gtest/gtest.h>
 #include <iostream>

tests/autopilot/unity_voice/dbus_interface/tests/test_voice.py

@@ -6,7 +6,7 @@
 # by the Free Software Foundation.
 
 from autopilot.testcase import AutopilotTestCase
-from os.path import abspath, dirname, join
+from os.path import abspath, dirname, join, isdir
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
 import dbus
@@ -15,6 +15,7 @@
 import gobject
 import glob
 import subprocess
+import sys
 
 from unity_voice import DBusTestCase
 
@@ -52,9 +53,14 @@ def setUp(self):
 
         self.result = ""
         self.sound_file = ""
-        
+
+        # First try the in-source path
         self.sound_dir = abspath(join(dirname(__file__), '..', '..', '..', '..', 'data', 'sounds'))
 
+        # Now try the install path
+        if not isdir(self.sound_dir):
+            self.sound_dir = join(dirname(sys.modules['unity_voice'].__file__), 'sounds')
+
     def application_binary(self):
         cmds = glob.glob('/usr/lib/*/unity-voice-service')
         self.assertThat(len(cmds), Equals(1))