Use the same qface test file also for the QtRemotObject based autotests

This makes sure our templates support all tested types and generates
code which works as expected.

This already showed a problem when serializing a QFlag property (QTBUG-75676),
which gets fixed by registering a conversion function for our flags in
the autogenerated code.

Change-Id: I48e4c0a3ca5f98bdc45f3d7d6b83d88c1ae56c2c
Fixes: AUTOSUITE-794
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>

11 files changed, 141 insertions, 191 deletions

diff --git a/tests/auto/core/ivigenerator/ivigenerator.pro b/tests/auto/core/ivigenerator/ivigenerator.pro
index 2254d04..05b433a 100644
--- a/tests/auto/core/ivigenerator/ivigenerator.pro
+++ b/tests/auto/core/ivigenerator/ivigenerator.pro
@@ -4,5 +4,4 @@ SUBDIRS = projects
 
 OTHER_FILES = org.example.echo.qface \
               org.example.echo.yaml \
-              org.example.echo.noprivate.qface \
-              org.example.echo.qtro.qface
+              no-private.yaml
diff --git a/tests/auto/core/ivigenerator/org.example.echo.qface b/tests/auto/core/ivigenerator/org.example.echo.qface
index b44381b..6ea92bc 100644
--- a/tests/auto/core/ivigenerator/org.example.echo.qface
+++ b/tests/auto/core/ivigenerator/org.example.echo.qface
@@ -30,6 +30,7 @@ interface Echo {
     list<int> intList;
     list<Combo> comboList;
     WeekDay weekDay;
+    TestEnum testEnum;
     real UPPERCASEPROPERTY;
 
     string echo(string msg);
@@ -37,9 +38,11 @@ interface Echo {
     Combo getCombo();
     void voidSlot();
     void voidSlot2(int param);
+    void timer(int interval);
     signal anotherChanged(AnotherStruct another);
     signal foobar(string foo);
     signal somethingHappened();
+    signal newValueAvailable(var newValue);
 }
 
 @config: {id: "org.foo.idz.1.0", zoned: true}
@@ -68,12 +71,15 @@ interface EchoZoned {
     Combo combo;
     list<int> intList;
     list<Combo> comboList;
+    WeekDay weekDay;
+    TestEnum testEnum;
     real UPPERCASEPROPERTY;
 
     string echo(string msg);
     string id();
     var varMethod();
     Combo getCombo();
+    string timer(int interval);
 
     signal anotherChanged(AnotherStruct another);
     signal foobar(string foo);
@@ -108,6 +114,11 @@ flag WeekDay {
     Friday = 5
 }
 
+enum TestEnum {
+    FirstEnumValue = 1,
+    SecondEnumValue = 2
+}
+
 /**
  * The contact information
  */
diff --git a/tests/auto/core/ivigenerator/org.example.echo.qtro.qface b/tests/auto/core/ivigenerator/org.example.echo.qtro.qface
deleted file mode 100644
index 82f7f82..0000000
--- a/tests/auto/core/ivigenerator/org.example.echo.qtro.qface
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * module
- */
-@config: { interfaceBuilder: "echoInterfaceBuilder" }
-module org.example.echo 1.0
-
-/**
- * \brief the brief
- * the description
- * continues \l http://qt.io
- */
-@config: {id: "org.foo.id.1.0", qml_class_name: "UiEcho"}
-interface Echo {
-    /**
-     * \brief brief message
-     *
-     * Some more documentation
-     */
-    readonly string lastMessage;
-    int intValue;
-    var varValue;
-    @config_simulator: {minimum: 10.}
-    real floatValue1;
-    @config_simulator: {maximum: 10.}
-    real floatValue2;
-    string stringValue;
-    list<Contact> contactList;
-    Contact contact;
-    WeekDay weekDay;
-    real UPPERCASEPROPERTY;
-
-    string echo(string msg);
-    string id() const;
-    Combo getCombo();
-    void voidSlot();
-    void voidSlot2(int param);
-    void timer(int interval);
-
-    signal anotherChanged(AnotherStruct another);
-    signal foobar(string foo);
-    signal somethingHappened();
-    signal newValueAvailable(var newValue);
-
-    model<Contact> testList;
-}
-
-enum WeekDay {
-    Monday = 1,
-    Tuesday = 2,
-    Wednesday = 3,
-    Thursday = 4,
-    Friday = 5
-}
-
-/**
- * The contact information
- */
-struct Contact {
-    string name;
-    int age;
-    bool isMarried;
-    var additionalData;
-}
-
-struct Combo {
-    Contact contactInfo;
-    WeekDay day;
-}
-
-struct AnotherStruct {
-    int justANumber;
-}
-
-
-
-@config: {id: "org.foo.idz.1.0", zoned: true}
-interface EchoZoned {
-
-    /**
-     * \brief brief message
-     *
-     * Some more documentation
-     */
-    readonly string lastMessage;
-    int intValue;
-    var varValue;
-    @config_simulator: {domain: ["one", "two", "three"]}
-    string stringValue;
-    string unsupportedValue;
-    bool zonedValue;
-    bool valueWithDefault;
-    @config: { getter_name: "isEchoEnabled" }
-    bool echoEnabled;
-    AirflowDirection airflowDirection;
-    @config_simulator: {minimum: 10., maximum: 15.}
-    int rangedValue;
-    int rangedValueWithDefault;
-    Contact contact;
-    Combo combo;
-    list<int> intList;
-    list<Combo> comboList;
-    real UPPERCASEPROPERTY;
-
-    string echo(string msg);
-    string id();
-    var varMethod();
-    Combo getCombo();
-    string timer(int interval);
-
-    signal anotherChanged(AnotherStruct another);
-    signal foobar(string foo);
-    signal somethingHappened();
-    signal newValueAvailable(var newValue);
-}
-
-/**
- * \brief Control where the airflow goes
- */
-flag AirflowDirection {
-    /**
-     * \brief Airflow to the windshield
-     */
-    Windshield = 1,
-    /**
-     * \brief Airflow to the dashboard
-     */
-    Dashboard = 2,
-    /**
-     * \brief Airflow to the floor
-     */
-    Floor = 4
-}
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/backend_qtro.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/backend_qtro.pro
index 0bf0ee3..09efc01 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/backend_qtro.pro
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/backend_qtro.pro
@@ -14,4 +14,4 @@ QT += core ivicore
 macos: QMAKE_SONAME_PREFIX = @rpath
 
 QFACE_FORMAT = backend_qtro
-QFACE_SOURCES = ../../../org.example.echo.qtro.qface
+QFACE_SOURCES = ../../../org.example.echo.qface
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/frontend.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/frontend.pro
index 0754145..ec105e3 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/frontend.pro
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/frontend.pro
@@ -10,4 +10,4 @@ DEFINES += QT_BUILD_ORG_EXAMPLE_ECHO_LIB
 
 macos: QMAKE_SONAME_PREFIX = @rpath
 
-QFACE_SOURCES = ../../../org.example.echo.qtro.qface
+QFACE_SOURCES = ../../../org.example.echo.qface
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.cpp b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.cpp
index 3e81ded..80a2735 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.cpp
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.cpp
@@ -35,7 +35,7 @@ EchoService::EchoService()
     : m_testCombo(Contact(QStringLiteral("Antti"), 34, true, QVariant()), EchoModule::Friday)
     , m_testId(QStringLiteral("id123"))
 {
-
+    setTestEnum(EchoModule::FirstEnumValue);
 }
 
 void EchoService::setLastMessage(QString lastMessage)
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.cpp b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.cpp
index 40ad3c0..e5c6634 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.cpp
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.cpp
@@ -193,6 +193,26 @@ void EchoZonedService::setComboList(const QVariantList &comboList, const QString
     SET_VALUE(m_comboList, comboList, comboListChanged);
 }
 
+EchoModule::DaysOfTheWeek EchoZonedService::weekDay(const QString &zone)
+{
+   return m_zoneHash.value(zone).m_weekDay;
+}
+
+void EchoZonedService::setWeekDay(EchoModule::DaysOfTheWeek weekDay, const QString &zone)
+{
+    SET_VALUE(m_weekDay, weekDay, weekDayChanged);
+}
+
+EchoModule::TestEnum EchoZonedService::testEnum(const QString &zone)
+{
+    return m_zoneHash.value(zone).m_testEnum;
+}
+
+void EchoZonedService::setTestEnum(EchoModule::TestEnum testEnum, const QString &zone)
+{
+    SET_VALUE(m_testEnum, testEnum, testEnumChanged);
+}
+
 qreal EchoZonedService::UPPERCASEPROPERTY(const QString &zone)
 {
     return m_zoneHash.value(zone).m_UPPERCASEPROPERTY;
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.h b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.h
index 6bfb567..c0b72a9 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.h
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.h
@@ -67,6 +67,10 @@ public slots:
     void setIntList(const QVariantList &intList, const QString &zone) override;
     QVariantList comboList(const QString &zone) override;
     void setComboList(const QVariantList &comboList, const QString &zone) override;
+    EchoModule::DaysOfTheWeek weekDay(const QString &zone) override;
+    void setWeekDay(EchoModule::DaysOfTheWeek weekDay, const QString &zone) override;
+    EchoModule::TestEnum testEnum(const QString &zone) override;
+    void setTestEnum(EchoModule::TestEnum testEnum, const QString &zone) override;
     qreal UPPERCASEPROPERTY(const QString &zone) override;
     void setUPPERCASEPROPERTY(qreal UPPERCASEPROPERTY, const QString &zone) override;
     QStringList availableZones() override;
@@ -102,6 +106,8 @@ private:
             , m_combo(Combo())
             , m_intList(QVariantList())
             , m_comboList(QVariantList())
+            , m_weekDay(0)
+            , m_testEnum(EchoModule::FirstEnumValue)
             , m_UPPERCASEPROPERTY(qreal(0.0))
         {}
 
@@ -121,6 +127,8 @@ private:
         Combo m_combo;
         QVariantList m_intList;
         QVariantList m_comboList;
+        EchoModule::DaysOfTheWeek m_weekDay;
+        EchoModule::TestEnum m_testEnum;
         qreal m_UPPERCASEPROPERTY;
         QStringList m_propertiesToSync;
     };
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/server.cpp b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/server.cpp
index a1e5083..8d989c4 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/server.cpp
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/server.cpp
@@ -35,7 +35,7 @@ bool Server::start()
 {
     bool val =  true;
     val = val && Core::instance()->host()->enableRemoting(&m_echoService, QStringLiteral("org.example.echo.Echo"));
-    val = val && Core::instance()->host()->enableRemoting(&m_contactsModelService, QStringLiteral("org.example.echo.Echo.testList"));
+    val = val && Core::instance()->host()->enableRemoting(&m_contactsModelService, QStringLiteral("org.example.echo.Echo.contactList"));
     val = val && Core::instance()->host()->enableRemoting(&m_echoZonedService, QStringLiteral("org.example.echo.EchoZoned"));
     //Give QtRO time to announce the service
     QTest::qWait(200);
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/server_qtro_test.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/server_qtro_test.pro
index 85a933f..bc222d9 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/server_qtro_test.pro
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/server_qtro_test.pro
@@ -20,7 +20,7 @@ SOURCES += main.cpp \
     contactsmodelservice.cpp
 
 QFACE_FORMAT = server_qtro
-QFACE_SOURCES = ../../../org.example.echo.qtro.qface
+QFACE_SOURCES = ../../../org.example.echo.qface
 
 HEADERS += \
     server.h \
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/tst_echoqtro.cpp b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/tst_echoqtro.cpp
index 33508d7..7452a3e 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/tst_echoqtro.cpp
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/tst_echoqtro.cpp
@@ -61,9 +61,10 @@ void EchoQtroTest::testInit()
     QCOMPARE(client.floatValue1(), qreal(0.0));
     QCOMPARE(client.floatValue2(), qreal(0.0));
     QCOMPARE(client.stringValue(), QString());
-    QCOMPARE(client.contactList(), QVariantList());
+    QCOMPARE(client.comboList(), QVariantList());
     QCOMPARE(client.contact(), Contact());
-    QCOMPARE(client.weekDay(), EchoModule::Monday);
+    QCOMPARE(client.weekDay(), EchoModule::WeekDay());
+    QCOMPARE(client.testEnum(), EchoModule::FirstEnumValue);
 
     Server server;
 
@@ -73,30 +74,32 @@ void EchoQtroTest::testInit()
     QCOMPARE(server.m_echoService.floatValue1(), qreal(0.0));
     QCOMPARE(server.m_echoService.floatValue2(), qreal(0.0));
     QCOMPARE(server.m_echoService.stringValue(), QString());
-    QCOMPARE(server.m_echoService.contactList(), QVariantList());
+    QCOMPARE(server.m_echoService.comboList(), QVariantList());
     QCOMPARE(server.m_echoService.contact(), Contact());
     QCOMPARE(server.m_echoService.weekDay(), EchoModule::WeekDay());
+    QCOMPARE(server.m_echoService.testEnum(), EchoModule::FirstEnumValue);
 
     QLatin1String lastMessageTestValue("this is the last message");
     int intValueTestValue(789);
     qreal floatValue1TestValue(3.14);
     qreal floatValue2TestValue(2.71);
     QLatin1String stringValueTestValue("test string");
-    QVariantList contactListTestValue(
-                    { QVariant::fromValue<Contact>(Contact("Mr A.", 20, false, "foo")),
-                      QVariant::fromValue<Contact>(Contact("Mr B.", 40, true, "bar")) });
+    QVariantList comboListTestValue(
+                    { QVariant::fromValue<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), EchoModule::Monday)),
+                      QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), EchoModule::Wednesday)) });
     Contact contactTestValue(QStringLiteral("Nemo"), 47, true, 1);
     EchoModule::WeekDay weekDayTestValue = EchoModule::Wednesday;
-
+    EchoModule::TestEnum testEnumTestValue = EchoModule::SecondEnumValue;
 
     server.m_echoService.setLastMessage(lastMessageTestValue);
     server.m_echoService.setIntValue(intValueTestValue);
     server.m_echoService.setFloatValue1(floatValue1TestValue);
     server.m_echoService.setFloatValue2(floatValue2TestValue);
     server.m_echoService.setStringValue(stringValueTestValue);
-    server.m_echoService.setContactList(contactListTestValue);
+    server.m_echoService.setComboList(comboListTestValue);
     server.m_echoService.setContact(contactTestValue);
     server.m_echoService.setWeekDay(weekDayTestValue);
+    server.m_echoService.setTestEnum(testEnumTestValue);
 
     QVERIFY(!client.isInitialized());
     QCOMPARE(client.error(), QIviAbstractFeature::NoError);
@@ -121,11 +124,12 @@ void EchoQtroTest::testInit()
     QCOMPARE(client.floatValue1(), floatValue1TestValue);
     QCOMPARE(client.floatValue2(), floatValue2TestValue);
     QCOMPARE(client.stringValue(), stringValueTestValue);
-    QVariantList contactList = client.contactList();
-    QCOMPARE(contactList[0].value<Contact>(), contactListTestValue[0].value<Contact>());
-    QCOMPARE(contactList[1].value<Contact>(), contactListTestValue[1].value<Contact>());
+    QVariantList comboList = client.comboList();
+    QCOMPARE(comboList[0].value<Combo>(), comboListTestValue[0].value<Combo>());
+    QCOMPARE(comboList[1].value<Combo>(), comboListTestValue[1].value<Combo>());
     QCOMPARE(client.contact(), contactTestValue);
     QCOMPARE(client.weekDay(), weekDayTestValue);
+    QCOMPARE(client.testEnum(), testEnumTestValue);
 
 
     lastMessageChangedSpy.clear();
@@ -160,8 +164,9 @@ void EchoQtroTest::testZonedInit()
     QCOMPARE(client.stringValue(), QString());
     QCOMPARE(client.airflowDirection(), EchoModule::AirflowDirections());
     QCOMPARE(client.contact(), Contact());
-    QCOMPARE(client.combo(), Combo());
+    QCOMPARE(client.comboList(), QVariantList());
     QCOMPARE(client.UPPERCASEPROPERTY(), qreal(0.0));
+    QCOMPARE(client.testEnum(), EchoModule::FirstEnumValue);
     QCOMPARE(client.availableZones(), QStringList());
 
     Server server;
@@ -172,19 +177,20 @@ void EchoQtroTest::testZonedInit()
     QCOMPARE(server.m_echoZonedService.stringValue(QString()), QString());
     QCOMPARE(server.m_echoZonedService.airflowDirection(QString()), EchoModule::AirflowDirections());
     QCOMPARE(server.m_echoZonedService.contact(QString()), Contact());
-    QCOMPARE(server.m_echoZonedService.combo(QString()), Combo());
+    QCOMPARE(server.m_echoZonedService.comboList(QString()), QVariantList());
     QCOMPARE(server.m_echoZonedService.UPPERCASEPROPERTY(QString()), qreal(0.0));
+    QCOMPARE(server.m_echoZonedService.testEnum(QString()), EchoModule::FirstEnumValue);
 
     int intValueTestValue(789);
     QVariant varValueTestValue(789);
     qreal floatValueTestValue(3.14);
     QLatin1String stringValueTestValue("test string");
     QVariantList comboListTestValue(
-                    { QVariant::fromValue<Contact>(Contact("Mr A.", 20, false, "foo")),
-                      QVariant::fromValue<Contact>(Contact("Mr B.", 40, true, "bar")) });
+                    { QVariant::fromValue<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), EchoModule::Monday)),
+                      QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), EchoModule::Wednesday)) });
     Contact contactTestValue(QStringLiteral("Nemo"), 47, true, 1);
-    Combo comboTestValue(Contact(QStringLiteral("Nemo"), 47, true, 1), EchoModule::Wednesday);
     EchoModule::AirflowDirections airflowTestValue = EchoModule::Windshield;
+    EchoModule::TestEnum testEnumTestValue = EchoModule::SecondEnumValue;
 
 
     server.m_echoZonedService.setIntValue(intValueTestValue, QString());
@@ -193,8 +199,9 @@ void EchoQtroTest::testZonedInit()
 
     server.m_echoZonedService.setAirflowDirection(airflowTestValue, frontLeftZone);
     server.m_echoZonedService.setContact(contactTestValue, frontLeftZone);
-    server.m_echoZonedService.setCombo(comboTestValue, frontLeftZone);
+    server.m_echoZonedService.setComboList(comboListTestValue, frontLeftZone);
     server.m_echoZonedService.setUPPERCASEPROPERTY(floatValueTestValue, frontLeftZone);
+    server.m_echoZonedService.setTestEnum(testEnumTestValue, frontLeftZone);
 
 
     QVERIFY(!client.isInitialized());
@@ -226,8 +233,11 @@ void EchoQtroTest::testZonedInit()
     QVERIFY(zone);
     QCOMPARE(zone->airflowDirection(), airflowTestValue);
     QCOMPARE(zone->contact(), contactTestValue);
-    QCOMPARE(zone->combo(), comboTestValue);
+    QVariantList comboList = zone->comboList();
+    QCOMPARE(comboList[0].value<Combo>(), comboListTestValue[0].value<Combo>());
+    QCOMPARE(comboList[1].value<Combo>(), comboListTestValue[1].value<Combo>());
     QCOMPARE(zone->UPPERCASEPROPERTY(), floatValueTestValue);
+    QCOMPARE(zone->testEnum(), testEnumTestValue);
 
     stringValueChangedSpy.clear();
     //test that a second instance is also initialized with the correct values
@@ -356,19 +366,19 @@ void EchoQtroTest::testClient2Server()
     QCOMPARE(server.m_echoService.stringValue(), stringValueTestValue);
     QCOMPARE(stringValueSpy[0][0].toString(), stringValueTestValue);
 
-    QSignalSpy contactListSpy(&server.m_echoService, SIGNAL(contactListChanged(QVariantList)));
-    QVERIFY(contactListSpy.isValid());
-    QVariantList contactListTestValue(
-                    { QVariant::fromValue<Contact>(Contact("Mr A.", 20, false, "foo")),
-                      QVariant::fromValue<Contact>(Contact("Mr B.", 40, true, "bar")) });
-    client.setContactList(contactListTestValue);
-    WAIT_AND_COMPARE(contactListSpy, 1);
-    QCOMPARE(server.m_echoService.contactList().count(),contactListTestValue.count());
-    QCOMPARE(server.m_echoService.contactList().at(0).value<Contact>(), contactListTestValue[0].value<Contact>());
-    QCOMPARE(server.m_echoService.contactList().at(1).value<Contact>(), contactListTestValue[1].value<Contact>());
-    QVariantList signalArgs = contactListSpy[0][0].toList();
-    QCOMPARE(signalArgs[0].value<Contact>(), contactListTestValue[0].value<Contact>());
-    QCOMPARE(signalArgs[1].value<Contact>(), contactListTestValue[1].value<Contact>());
+    QSignalSpy comboListSpy(&server.m_echoService, SIGNAL(comboListChanged(QVariantList)));
+    QVERIFY(comboListSpy.isValid());
+    QVariantList comboListTestValue(
+                    { QVariant::fromValue<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), EchoModule::Monday)),
+                      QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), EchoModule::Wednesday)) });
+    client.setComboList(comboListTestValue);
+    WAIT_AND_COMPARE(comboListSpy, 1);
+    QCOMPARE(server.m_echoService.comboList().count(),comboListTestValue.count());
+    QCOMPARE(server.m_echoService.comboList().at(0).value<Combo>(), comboListTestValue[0].value<Combo>());
+    QCOMPARE(server.m_echoService.comboList().at(1).value<Combo>(), comboListTestValue[1].value<Combo>());
+    QVariantList signalArgs = comboListSpy[0][0].toList();
+    QCOMPARE(signalArgs[0].value<Combo>(), comboListTestValue[0].value<Combo>());
+    QCOMPARE(signalArgs[1].value<Combo>(), comboListTestValue[1].value<Combo>());
 
     QSignalSpy contactSpy(&server.m_echoService, SIGNAL(contactChanged(Contact)));
     QVERIFY(contactSpy.isValid());
@@ -378,13 +388,21 @@ void EchoQtroTest::testClient2Server()
     QCOMPARE(server.m_echoService.contact(), contactTestValue);
     QCOMPARE(contactSpy[0][0].value<Contact>(), contactTestValue);
 
-    QSignalSpy weekDaySpy(&server.m_echoService, SIGNAL(weekDayChanged(EchoModule::WeekDay)));
+    QSignalSpy weekDaySpy(&server.m_echoService, SIGNAL(weekDayChanged(EchoModule::DaysOfTheWeek)));
     QVERIFY(weekDaySpy.isValid());
-    EchoModule::WeekDay weekDayTestValue = EchoModule::Thursday;
+    EchoModule::DaysOfTheWeek weekDayTestValue = EchoModule::Thursday;
     client.setWeekDay(weekDayTestValue);
     WAIT_AND_COMPARE(weekDaySpy, 1);
     QCOMPARE(server.m_echoService.weekDay(), weekDayTestValue);
-    QCOMPARE(weekDaySpy[0][0].value<EchoModule::WeekDay>(), weekDayTestValue);
+    QCOMPARE(weekDaySpy[0][0].value<EchoModule::DaysOfTheWeek>(), weekDayTestValue);
+
+    QSignalSpy testEnumSpy(&server.m_echoService, SIGNAL(testEnumChanged(EchoModule::TestEnum)));
+    QVERIFY(testEnumSpy.isValid());
+    EchoModule::TestEnum testEnumTestValue = EchoModule::SecondEnumValue;
+    client.setTestEnum(testEnumTestValue);
+    WAIT_AND_COMPARE(testEnumSpy, 1);
+    QCOMPARE(server.m_echoService.testEnum(), testEnumTestValue);
+    QCOMPARE(testEnumSpy[0][0].value<EchoModule::TestEnum>(), testEnumTestValue);
 }
 
 void EchoQtroTest::testZonedClient2Server()
@@ -435,8 +453,8 @@ void EchoQtroTest::testZonedClient2Server()
     QSignalSpy comboListSpy(&server.m_echoZonedService, SIGNAL(comboListChanged(QVariantList, QString)));
     QVERIFY(comboListSpy.isValid());
     QVariantList comboListTestValue(
-                    { QVariant::fromValue<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), EchoModule::Thursday)),
-                      QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), EchoModule::Tuesday)) });
+                    { QVariant::fromValue<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), EchoModule::Monday)),
+                      QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), EchoModule::Wednesday)) });
     zone->setComboList(comboListTestValue);
     WAIT_AND_COMPARE(comboListSpy, 1);
     QVariantList comboList = server.m_echoZonedService.comboList(frontLeftZone);
@@ -465,6 +483,15 @@ void EchoQtroTest::testZonedClient2Server()
     QCOMPARE(server.m_echoZonedService.airflowDirection(frontLeftZone), airflowTestValue);
     QCOMPARE(airflowSpy[0][0].value<EchoModule::AirflowDirections>(), airflowTestValue);
     QCOMPARE(airflowSpy[0][1].toString(), frontLeftZone);
+
+    QSignalSpy testEnumSpy(&server.m_echoZonedService, SIGNAL(testEnumChanged(EchoModule::TestEnum, QString)));
+    QVERIFY(testEnumSpy.isValid());
+    EchoModule::TestEnum testEnumTestValue = EchoModule::SecondEnumValue;
+    zone->setTestEnum(testEnumTestValue);
+    WAIT_AND_COMPARE(testEnumSpy, 1);
+    QCOMPARE(server.m_echoZonedService.testEnum(frontLeftZone), testEnumTestValue);
+    QCOMPARE(testEnumSpy[0][0].value<EchoModule::TestEnum>(), testEnumTestValue);
+    QCOMPARE(testEnumSpy[0][1].toString(), frontLeftZone);
 }
 
 void EchoQtroTest::testServer2Client()
@@ -515,19 +542,19 @@ void EchoQtroTest::testServer2Client()
     QCOMPARE(client.stringValue(), stringValueTestValue);
     QCOMPARE(stringValueSpy[0][0].toString(), stringValueTestValue);
 
-    QSignalSpy contactListSpy(&client, SIGNAL(contactListChanged(QVariantList)));
-    QVERIFY(contactListSpy.isValid());
-    QVariantList contactListTestValue(
-                    { QVariant::fromValue<Contact>(Contact("Mr A.", 20, false, "foo")),
-                      QVariant::fromValue<Contact>(Contact("Mr B.", 40, true, "bar")) });
-    server.m_echoService.setContactList(contactListTestValue);
-    WAIT_AND_COMPARE(contactListSpy, 1);
-    QCOMPARE(client.contactList().count(),contactListTestValue.count());
-    QCOMPARE(client.contactList().at(0).value<Contact>(), contactListTestValue[0].value<Contact>());
-    QCOMPARE(client.contactList().at(1).value<Contact>(), contactListTestValue[1].value<Contact>());
-    QVariantList signalArgs = contactListSpy[0][0].toList();
-    QCOMPARE(signalArgs[0].value<Contact>(), contactListTestValue[0].value<Contact>());
-    QCOMPARE(signalArgs[1].value<Contact>(), contactListTestValue[1].value<Contact>());
+    QSignalSpy comboListSpy(&client, SIGNAL(comboListChanged(QVariantList)));
+    QVERIFY(comboListSpy.isValid());
+    QVariantList comboListTestValue(
+                    { QVariant::fromValue<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), EchoModule::Monday)),
+                      QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), EchoModule::Wednesday)) });
+    server.m_echoService.setComboList(comboListTestValue);
+    WAIT_AND_COMPARE(comboListSpy, 1);
+    QCOMPARE(client.comboList().count(),comboListTestValue.count());
+    QCOMPARE(client.comboList().at(0).value<Combo>(), comboListTestValue[0].value<Combo>());
+    QCOMPARE(client.comboList().at(1).value<Combo>(), comboListTestValue[1].value<Combo>());
+    QVariantList signalArgs = comboListSpy[0][0].toList();
+    QCOMPARE(signalArgs[0].value<Combo>(), comboListTestValue[0].value<Combo>());
+    QCOMPARE(signalArgs[1].value<Combo>(), comboListTestValue[1].value<Combo>());
 
     QSignalSpy contactSpy(&client, SIGNAL(contactChanged(Contact)));
     QVERIFY(contactSpy.isValid());
@@ -537,13 +564,22 @@ void EchoQtroTest::testServer2Client()
     QCOMPARE(client.contact(), contactTestValue);
     QCOMPARE(contactSpy[0][0].value<Contact>(), contactTestValue);
 
-    QSignalSpy weekDaySpy(&client, SIGNAL(weekDayChanged(EchoModule::WeekDay)));
+    QSignalSpy weekDaySpy(&client, SIGNAL(weekDayChanged(EchoModule::DaysOfTheWeek)));
     QVERIFY(weekDaySpy.isValid());
     EchoModule::WeekDay weekDayTestValue = EchoModule::Friday;
     server.m_echoService.setWeekDay(weekDayTestValue);
     WAIT_AND_COMPARE(weekDaySpy, 1);
+
     QCOMPARE(client.weekDay(), weekDayTestValue);
-    QCOMPARE(weekDaySpy[0][0].value<EchoModule::WeekDay>(), weekDayTestValue);
+    QCOMPARE(weekDaySpy[0][0].value<EchoModule::DaysOfTheWeek>(), weekDayTestValue);
+
+    QSignalSpy testEnumSpy(&client, SIGNAL(testEnumChanged(EchoModule::TestEnum)));
+    QVERIFY(testEnumSpy.isValid());
+    EchoModule::TestEnum testEnumTestValue = EchoModule::SecondEnumValue;
+    server.m_echoService.setTestEnum(testEnumTestValue);
+    WAIT_AND_COMPARE(testEnumSpy, 1);
+    QCOMPARE(client.testEnum(), testEnumTestValue);
+    QCOMPARE(testEnumSpy[0][0].value<EchoModule::TestEnum>(), testEnumTestValue);
 }
 
 void EchoQtroTest::testZonedServer2Client()
@@ -618,6 +654,14 @@ void EchoQtroTest::testZonedServer2Client()
     WAIT_AND_COMPARE(airflowSpy, 1);
     QCOMPARE(zone->airflowDirection(), airflowTestValue);
     QCOMPARE(airflowSpy[0][0].value<EchoModule::AirflowDirections>(), airflowTestValue);
+
+    QSignalSpy testEnumSpy(zone, SIGNAL(testEnumChanged(EchoModule::TestEnum)));
+    QVERIFY(testEnumSpy.isValid());
+    EchoModule::TestEnum testEnumTestValue = EchoModule::SecondEnumValue;
+    server.m_echoZonedService.setTestEnum(testEnumTestValue, frontLeftZone);
+    WAIT_AND_COMPARE(testEnumSpy, 1);
+    QCOMPARE(zone->testEnum(), testEnumTestValue);
+    QCOMPARE(testEnumSpy[0][0].value<EchoModule::TestEnum>(), testEnumTestValue);
 }
 
 void EchoQtroTest::testSlots()
@@ -950,7 +994,7 @@ void EchoQtroTest::testModel()
     //Give QtRO time to actually call our server side
     QTest::qWait(200);
 
-    QIviPagingModel* model = client.testList();
+    QIviPagingModel* model = client.contactList();
     QVERIFY(model->isInitialized());
     QCOMPARE(model->rowCount(), 0);