diff options
Diffstat (limited to 'tests/auto/core')
11 files changed, 124 insertions, 124 deletions
diff --git a/tests/auto/core/ivigenerator/no-private.yaml b/tests/auto/core/ivigenerator/no-private.yaml index f502f08..f10123c 100644 --- a/tests/auto/core/ivigenerator/no-private.yaml +++ b/tests/auto/core/ivigenerator/no-private.yaml @@ -1,4 +1,4 @@ -org.example.echo: +org.example.echomodule: config: disablePrivateIVI: true interfaceBuilder: false diff --git a/tests/auto/core/ivigenerator/org.example.echo.noannotation.qface b/tests/auto/core/ivigenerator/org.example.echo.noannotation.qface index 263dc16..0978388 100644 --- a/tests/auto/core/ivigenerator/org.example.echo.noannotation.qface +++ b/tests/auto/core/ivigenerator/org.example.echo.noannotation.qface @@ -1,7 +1,7 @@ /** * module */ -module org.example.echo 1.0 +module org.example.echomodule 1.0 /** * \brief the brief diff --git a/tests/auto/core/ivigenerator/org.example.echo.qface b/tests/auto/core/ivigenerator/org.example.echo.qface index faed373..7c5779e 100644 --- a/tests/auto/core/ivigenerator/org.example.echo.qface +++ b/tests/auto/core/ivigenerator/org.example.echo.qface @@ -2,7 +2,7 @@ * module */ @config: { interfaceBuilder: "echoInterfaceBuilder" } -module org.example.echo 1.0 +module org.example.echomodule 1.0 /** * \brief the brief diff --git a/tests/auto/core/ivigenerator/org.example.echo.yaml b/tests/auto/core/ivigenerator/org.example.echo.yaml index d1750bf..9c566fd 100644 --- a/tests/auto/core/ivigenerator/org.example.echo.yaml +++ b/tests/auto/core/ivigenerator/org.example.echo.yaml @@ -1,87 +1,87 @@ -org.example.echo.EchoZoned#stringValue: +org.example.echomodule.EchoZoned#stringValue: config_simulator: default: "two" -org.example.echo.Echo#intValue: +org.example.echomodule.Echo#intValue: config_simulator: default_value: 61 range_high: 150 range_low: 0 -org.example.echo.Echo#contact: +org.example.echomodule.Echo#contact: config_simulator: zoned: true default: [ "foo", 23, true, 1234 ] -org.example.echo.Echo#combo: +org.example.echomodule.Echo#combo: config_simulator: zoned: true default: [ [ "foo", 23, true, 1234 ], WeekDay.Monday ] -org.example.echo.Echo#intList: +org.example.echomodule.Echo#intList: config_simulator: default: [1, 2, 3, 4] -org.example.echo.Echo#comboList: +org.example.echomodule.Echo#comboList: config_simulator: default: [[ [ "foo", 23, true, 1234 ], WeekDay.Monday ], [ [ "bar", 21, false, "foo" ], WeekDay.Tuesday ]] -org.example.echo.Echo#contactList: +org.example.echomodule.Echo#contactList: config_simulator: default: [[ "foo", 23, true, WeekDay.Monday ], [ "bar", 12, false, false ]] -org.example.echo.EchoZoned: +org.example.echomodule.EchoZoned: config_simulator: zones: [ FrontLeft, FrontRight, Rear ] -org.example.echo.EchoZoned#stringValue: +org.example.echomodule.EchoZoned#stringValue: config_simulator: default: { FrontLeft: "two", Rear: "one", =: "general" } -org.example.echo.EchoZoned#intValue: +org.example.echomodule.EchoZoned#intValue: config_simulator: default: 11 range: { FrontLeft: [10, 33], Rear: [0, 11] } -org.example.echo.EchoZoned#zonedValue: +org.example.echomodule.EchoZoned#zonedValue: config_simulator: default: true zoned: true -org.example.echo.EchoZoned#valueWithDefault: +org.example.echomodule.EchoZoned#valueWithDefault: config_simulator: default: true -org.example.echo.EchoZoned#unsupportedValue: +org.example.echomodule.EchoZoned#unsupportedValue: config_simulator: unsupported: true -org.example.echo.EchoZoned#rangedValue: +org.example.echomodule.EchoZoned#rangedValue: config_simulator: range_high: 50 range_low: 0 -org.example.echo.EchoZoned#rangedValueWithDefault: +org.example.echomodule.EchoZoned#rangedValueWithDefault: config_simulator: default_value: 42 range_high: 150 range_low: 0 -org.example.echo.EchoZoned#contact: +org.example.echomodule.EchoZoned#contact: config_simulator: zoned: true default: { FrontLeft: [ "foo", 23, true, 1234 ], Rear: [ "bar", 1, false, 3456 ] } -org.example.echo.EchoZoned#combo: +org.example.echomodule.EchoZoned#combo: config_simulator: zoned: true default: [ [ "foo", 23, true, 1234 ], WeekDay.Monday ] -org.example.echo.EchoZoned#intList: +org.example.echomodule.EchoZoned#intList: config_simulator: default: [1, 2, 3, 4] -org.example.echo.EchoZoned#comboList: +org.example.echomodule.EchoZoned#comboList: config_simulator: default: [[ [ "foo", 23, true, 1234 ], WeekDay.Monday ], [ [ "bar", 21, false, "foo" ], WeekDay.Tuesday ]] 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 8088015..cdcfc42 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 @@ -32,10 +32,10 @@ #include <QTimer> EchoService::EchoService() - : m_testCombo(Contact(QStringLiteral("Antti"), 34, true, QVariant()), EchoModule::Friday) + : m_testCombo(Contact(QStringLiteral("Antti"), 34, true, QVariant()), Echomodule::Friday) , m_testId(QStringLiteral("id123")) { - setTestEnum(EchoModule::FirstEnumValue); + setTestEnum(Echomodule::FirstEnumValue); } void EchoService::setLastMessage(QString lastMessage) @@ -83,13 +83,13 @@ QVariant EchoService::timer(int interval) return QVariant::fromValue(pendingResult); } -QVariant EchoService::flagMethod(EchoModule::AirflowDirections direction) +QVariant EchoService::flagMethod(Echomodule::AirflowDirections direction) { emit flagMethodCalled(direction); return QVariant::fromValue(direction); } -QVariant EchoService::enumMethod(EchoModule::TestEnum testEnum) +QVariant EchoService::enumMethod(Echomodule::TestEnum testEnum) { emit enumMethodCalled(testEnum); return QVariant::fromValue(testEnum); diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.h b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.h index 8e53388..1bfcc06 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.h +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.h @@ -51,8 +51,8 @@ public Q_SLOTS: QVariant voidSlot() override; QVariant voidSlot2(int param) override; QVariant timer(int interval) override; - QVariant flagMethod(EchoModule::AirflowDirections direction) override; - QVariant enumMethod(EchoModule::TestEnum testEnum) override; + QVariant flagMethod(Echomodule::AirflowDirections direction) override; + QVariant enumMethod(Echomodule::TestEnum testEnum) override; Q_SIGNALS: void echoSlotCalled(const QString &msg); @@ -60,8 +60,8 @@ Q_SIGNALS: void getComboSlotCalled(); void voidSlotCalled(); void voidSlot2Called(int param); - void flagMethodCalled(EchoModule::AirflowDirections direction); - void enumMethodCalled(EchoModule::TestEnum testEnum); + void flagMethodCalled(Echomodule::AirflowDirections direction); + void enumMethodCalled(Echomodule::TestEnum testEnum); }; #endif // ECHOSERVICE_H 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 0010d89..8e0c764 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 @@ -41,7 +41,7 @@ EchoZonedService::EchoZonedService(QObject *parent) : EchoZonedSimpleSource(parent) - , m_testCombo(Contact(QStringLiteral("Antti"), 34, true, QVariant()), EchoModule::Friday) + , m_testCombo(Contact(QStringLiteral("Antti"), 34, true, QVariant()), Echomodule::Friday) , m_testId(QStringLiteral("id123")) { m_zoneHash.insert(QString(), ZoneObject()); @@ -123,12 +123,12 @@ void EchoZonedService::setEchoEnabled(bool echoEnabled, const QString &zone) SET_VALUE(m_echoEnabled, echoEnabled, echoEnabledChanged); } -EchoModule::AirflowDirections EchoZonedService::airflowDirection(const QString &zone) +Echomodule::AirflowDirections EchoZonedService::airflowDirection(const QString &zone) { return m_zoneHash.value(zone).m_airflowDirection; } -void EchoZonedService::setAirflowDirection(EchoModule::AirflowDirections airflowDirection, const QString &zone) +void EchoZonedService::setAirflowDirection(Echomodule::AirflowDirections airflowDirection, const QString &zone) { SET_VALUE(m_airflowDirection, airflowDirection, airflowDirectionChanged); } @@ -193,22 +193,22 @@ void EchoZonedService::setComboList(const QVariantList &comboList, const QString SET_VALUE(m_comboList, comboList, comboListChanged); } -EchoModule::DaysOfTheWeek EchoZonedService::weekDay(const QString &zone) +Echomodule::DaysOfTheWeek EchoZonedService::weekDay(const QString &zone) { return m_zoneHash.value(zone).m_weekDay; } -void EchoZonedService::setWeekDay(EchoModule::DaysOfTheWeek weekDay, const QString &zone) +void EchoZonedService::setWeekDay(Echomodule::DaysOfTheWeek weekDay, const QString &zone) { SET_VALUE(m_weekDay, weekDay, weekDayChanged); } -EchoModule::TestEnum EchoZonedService::testEnum(const QString &zone) +Echomodule::TestEnum EchoZonedService::testEnum(const QString &zone) { return m_zoneHash.value(zone).m_testEnum; } -void EchoZonedService::setTestEnum(EchoModule::TestEnum testEnum, const QString &zone) +void EchoZonedService::setTestEnum(Echomodule::TestEnum testEnum, const QString &zone) { SET_VALUE(m_testEnum, testEnum, testEnumChanged); } @@ -264,13 +264,13 @@ QVariant EchoZonedService::timer(int interval, const QString &zone) return QVariant::fromValue(pendingResult); } -QVariant EchoZonedService::flagMethod(EchoModule::AirflowDirections direction, const QString &zone) +QVariant EchoZonedService::flagMethod(Echomodule::AirflowDirections direction, const QString &zone) { emit flagMethodCalled(direction, zone); return QVariant::fromValue(direction); } -QVariant EchoZonedService::enumMethod(EchoModule::TestEnum testEnum, const QString &zone) +QVariant EchoZonedService::enumMethod(Echomodule::TestEnum testEnum, const QString &zone) { emit enumMethodCalled(testEnum, zone); return QVariant::fromValue(testEnum); 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 cf7cf63..7cf4daa 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 @@ -53,8 +53,8 @@ public slots: void setValueWithDefault(bool valueWithDefault, const QString &zone) override; bool isEchoEnabled(const QString &zone) override; void setEchoEnabled(bool echoEnabled, const QString &zone) override; - EchoModule::AirflowDirections airflowDirection(const QString &zone) override; - void setAirflowDirection(EchoModule::AirflowDirections airflowDirection, const QString &zone) override; + Echomodule::AirflowDirections airflowDirection(const QString &zone) override; + void setAirflowDirection(Echomodule::AirflowDirections airflowDirection, const QString &zone) override; int rangedValue(const QString &zone) override; void setRangedValue(int rangedValue, const QString &zone) override; int rangedValueWithDefault(const QString &zone) override; @@ -67,10 +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; + 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; @@ -79,8 +79,8 @@ public slots: QVariant varMethod(const QString &zone) override; QVariant getCombo(const QString &zone) override; QVariant timer(int interval, const QString &zone) override; - QVariant flagMethod(EchoModule::AirflowDirections direction, const QString &zone) override; - QVariant enumMethod(EchoModule::TestEnum testEnum, const QString &zone) override; + QVariant flagMethod(Echomodule::AirflowDirections direction, const QString &zone) override; + QVariant enumMethod(Echomodule::TestEnum testEnum, const QString &zone) override; Q_SIGNALS: void echoSlotCalled(const QString &msg, const QString& zone); @@ -89,8 +89,8 @@ Q_SIGNALS: void getComboSlotCalled(const QString& zone); void voidSlotCalled(const QString& zone); void voidSlot2Called(int param, const QString& zone); - void flagMethodCalled(EchoModule::AirflowDirections direction, const QString& zone); - void enumMethodCalled(EchoModule::TestEnum testEnum, const QString& zone); + void flagMethodCalled(Echomodule::AirflowDirections direction, const QString& zone); + void enumMethodCalled(Echomodule::TestEnum testEnum, const QString& zone); private: struct ZoneObject { @@ -103,7 +103,7 @@ private: , m_zonedValue(bool(false)) , m_valueWithDefault(bool(false)) , m_echoEnabled(bool(false)) - , m_airflowDirection(EchoModule::AirflowDirections()) + , m_airflowDirection(Echomodule::AirflowDirections()) , m_rangedValue(int(0)) , m_rangedValueWithDefault(int(0)) , m_contact(Contact()) @@ -111,7 +111,7 @@ private: , m_intList(QVariantList()) , m_comboList(QVariantList()) , m_weekDay(0) - , m_testEnum(EchoModule::FirstEnumValue) + , m_testEnum(Echomodule::FirstEnumValue) , m_UPPERCASEPROPERTY(qreal(0.0)) {} @@ -124,15 +124,15 @@ private: bool m_zonedValue; bool m_valueWithDefault; bool m_echoEnabled; - EchoModule::AirflowDirections m_airflowDirection; + Echomodule::AirflowDirections m_airflowDirection; int m_rangedValue; int m_rangedValueWithDefault; Contact m_contact; Combo m_combo; QVariantList m_intList; QVariantList m_comboList; - EchoModule::DaysOfTheWeek m_weekDay; - EchoModule::TestEnum m_testEnum; + 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 8d989c4..f80537e 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 @@ -34,9 +34,9 @@ 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.contactList")); - val = val && Core::instance()->host()->enableRemoting(&m_echoZonedService, QStringLiteral("org.example.echo.EchoZoned")); + val = val && Core::instance()->host()->enableRemoting(&m_echoService, QStringLiteral("org.example.echomodule.Echo")); + val = val && Core::instance()->host()->enableRemoting(&m_contactsModelService, QStringLiteral("org.example.echomodule.Echo.contactList")); + val = val && Core::instance()->host()->enableRemoting(&m_echoZonedService, QStringLiteral("org.example.echomodule.EchoZoned")); //Give QtRO time to announce the service QTest::qWait(200); return val; 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 2befbe2..daac1e6 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 @@ -43,7 +43,7 @@ static QString frontLeftZone = QStringLiteral("FrontLeft"); EchoQtroTest::EchoQtroTest() :QObject() { - EchoModule::registerTypes(); + Echomodule::registerTypes(); } void EchoQtroTest::cleanup() @@ -62,8 +62,8 @@ void EchoQtroTest::testInit() QCOMPARE(client.stringValue(), QString()); QCOMPARE(client.comboList(), QVariantList()); QCOMPARE(client.contact(), Contact()); - QCOMPARE(client.weekDay(), EchoModule::WeekDay()); - QCOMPARE(client.testEnum(), EchoModule::FirstEnumValue); + QCOMPARE(client.weekDay(), Echomodule::WeekDay()); + QCOMPARE(client.testEnum(), Echomodule::FirstEnumValue); Server server; @@ -75,8 +75,8 @@ void EchoQtroTest::testInit() QCOMPARE(server.m_echoService.stringValue(), QString()); 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); + QCOMPARE(server.m_echoService.weekDay(), Echomodule::WeekDay()); + QCOMPARE(server.m_echoService.testEnum(), Echomodule::FirstEnumValue); QLatin1String lastMessageTestValue("this is the last message"); int intValueTestValue(789); @@ -84,11 +84,11 @@ void EchoQtroTest::testInit() qreal floatValue2TestValue(2.71); QLatin1String stringValueTestValue("test string"); 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)) }); + { 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; + Echomodule::WeekDay weekDayTestValue = Echomodule::Wednesday; + Echomodule::TestEnum testEnumTestValue = Echomodule::SecondEnumValue; server.m_echoService.setLastMessage(lastMessageTestValue); server.m_echoService.setIntValue(intValueTestValue); @@ -161,11 +161,11 @@ void EchoQtroTest::testZonedInit() QCOMPARE(client.intValue(), 0); QCOMPARE(client.varValue(), QVariant()); QCOMPARE(client.stringValue(), QString()); - QCOMPARE(client.airflowDirection(), EchoModule::AirflowDirections()); + QCOMPARE(client.airflowDirection(), Echomodule::AirflowDirections()); QCOMPARE(client.contact(), Contact()); QCOMPARE(client.comboList(), QVariantList()); QCOMPARE(client.UPPERCASEPROPERTY(), qreal(0.0)); - QCOMPARE(client.testEnum(), EchoModule::FirstEnumValue); + QCOMPARE(client.testEnum(), Echomodule::FirstEnumValue); QCOMPARE(client.availableZones(), QStringList()); Server server; @@ -174,22 +174,22 @@ void EchoQtroTest::testZonedInit() QCOMPARE(server.m_echoZonedService.intValue(QString()), 0); QCOMPARE(server.m_echoZonedService.varValue(QString()), QVariant()); QCOMPARE(server.m_echoZonedService.stringValue(QString()), QString()); - QCOMPARE(server.m_echoZonedService.airflowDirection(QString()), EchoModule::AirflowDirections()); + QCOMPARE(server.m_echoZonedService.airflowDirection(QString()), Echomodule::AirflowDirections()); QCOMPARE(server.m_echoZonedService.contact(QString()), Contact()); QCOMPARE(server.m_echoZonedService.comboList(QString()), QVariantList()); QCOMPARE(server.m_echoZonedService.UPPERCASEPROPERTY(QString()), qreal(0.0)); - QCOMPARE(server.m_echoZonedService.testEnum(QString()), EchoModule::FirstEnumValue); + 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<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), EchoModule::Monday)), - QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), EchoModule::Wednesday)) }); + { 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::AirflowDirections airflowTestValue = EchoModule::Windshield; - EchoModule::TestEnum testEnumTestValue = EchoModule::SecondEnumValue; + Echomodule::AirflowDirections airflowTestValue = Echomodule::Windshield; + Echomodule::TestEnum testEnumTestValue = Echomodule::SecondEnumValue; server.m_echoZonedService.setIntValue(intValueTestValue, QString()); @@ -368,8 +368,8 @@ void EchoQtroTest::testClient2Server() 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)) }); + { 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()); @@ -387,21 +387,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::DaysOfTheWeek))); + QSignalSpy weekDaySpy(&server.m_echoService, SIGNAL(weekDayChanged(Echomodule::DaysOfTheWeek))); QVERIFY(weekDaySpy.isValid()); - EchoModule::DaysOfTheWeek 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::DaysOfTheWeek>(), weekDayTestValue); + QCOMPARE(weekDaySpy[0][0].value<Echomodule::DaysOfTheWeek>(), weekDayTestValue); - QSignalSpy testEnumSpy(&server.m_echoService, SIGNAL(testEnumChanged(EchoModule::TestEnum))); + QSignalSpy testEnumSpy(&server.m_echoService, SIGNAL(testEnumChanged(Echomodule::TestEnum))); QVERIFY(testEnumSpy.isValid()); - EchoModule::TestEnum testEnumTestValue = EchoModule::SecondEnumValue; + 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); + QCOMPARE(testEnumSpy[0][0].value<Echomodule::TestEnum>(), testEnumTestValue); } void EchoQtroTest::testZonedClient2Server() @@ -452,8 +452,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::Monday)), - QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), EchoModule::Wednesday)) }); + { 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); @@ -474,22 +474,22 @@ void EchoQtroTest::testZonedClient2Server() QCOMPARE(contactSpy[0][0].value<Contact>(), contactTestValue); QCOMPARE(contactSpy[0][1].toString(), frontLeftZone); - QSignalSpy airflowSpy(&server.m_echoZonedService, SIGNAL(airflowDirectionChanged(EchoModule::AirflowDirections, QString))); + QSignalSpy airflowSpy(&server.m_echoZonedService, SIGNAL(airflowDirectionChanged(Echomodule::AirflowDirections, QString))); QVERIFY(airflowSpy.isValid()); - EchoModule::AirflowDirections airflowTestValue = EchoModule::Windshield; + Echomodule::AirflowDirections airflowTestValue = Echomodule::Windshield; zone->setAirflowDirection(airflowTestValue); WAIT_AND_COMPARE(airflowSpy, 1); QCOMPARE(server.m_echoZonedService.airflowDirection(frontLeftZone), airflowTestValue); - QCOMPARE(airflowSpy[0][0].value<EchoModule::AirflowDirections>(), 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))); + QSignalSpy testEnumSpy(&server.m_echoZonedService, SIGNAL(testEnumChanged(Echomodule::TestEnum, QString))); QVERIFY(testEnumSpy.isValid()); - EchoModule::TestEnum testEnumTestValue = EchoModule::SecondEnumValue; + 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][0].value<Echomodule::TestEnum>(), testEnumTestValue); QCOMPARE(testEnumSpy[0][1].toString(), frontLeftZone); } @@ -544,8 +544,8 @@ void EchoQtroTest::testServer2Client() 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)) }); + { 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()); @@ -563,22 +563,22 @@ void EchoQtroTest::testServer2Client() QCOMPARE(client.contact(), contactTestValue); QCOMPARE(contactSpy[0][0].value<Contact>(), contactTestValue); - QSignalSpy weekDaySpy(&client, SIGNAL(weekDayChanged(EchoModule::DaysOfTheWeek))); + QSignalSpy weekDaySpy(&client, SIGNAL(weekDayChanged(Echomodule::DaysOfTheWeek))); QVERIFY(weekDaySpy.isValid()); - EchoModule::WeekDay weekDayTestValue = EchoModule::Friday; + 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::DaysOfTheWeek>(), weekDayTestValue); + QCOMPARE(weekDaySpy[0][0].value<Echomodule::DaysOfTheWeek>(), weekDayTestValue); - QSignalSpy testEnumSpy(&client, SIGNAL(testEnumChanged(EchoModule::TestEnum))); + QSignalSpy testEnumSpy(&client, SIGNAL(testEnumChanged(Echomodule::TestEnum))); QVERIFY(testEnumSpy.isValid()); - EchoModule::TestEnum testEnumTestValue = EchoModule::SecondEnumValue; + 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); + QCOMPARE(testEnumSpy[0][0].value<Echomodule::TestEnum>(), testEnumTestValue); } void EchoQtroTest::testZonedServer2Client() @@ -626,8 +626,8 @@ void EchoQtroTest::testZonedServer2Client() QSignalSpy comboListSpy(zone, SIGNAL(comboListChanged(QVariantList))); 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::Thursday)), + QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), Echomodule::Tuesday)) }); server.m_echoZonedService.setComboList(comboListTestValue, frontLeftZone); WAIT_AND_COMPARE(comboListSpy, 1); QVariantList comboList = zone->comboList(); @@ -646,21 +646,21 @@ void EchoQtroTest::testZonedServer2Client() QCOMPARE(zone->contact(), contactTestValue); QCOMPARE(contactSpy[0][0].value<Contact>(), contactTestValue); - QSignalSpy airflowSpy(zone, SIGNAL(airflowDirectionChanged(EchoModule::AirflowDirections))); + QSignalSpy airflowSpy(zone, SIGNAL(airflowDirectionChanged(Echomodule::AirflowDirections))); QVERIFY(airflowSpy.isValid()); - EchoModule::AirflowDirections airflowTestValue = EchoModule::Windshield; + Echomodule::AirflowDirections airflowTestValue = Echomodule::Windshield; server.m_echoZonedService.setAirflowDirection(airflowTestValue, frontLeftZone); WAIT_AND_COMPARE(airflowSpy, 1); QCOMPARE(zone->airflowDirection(), airflowTestValue); - QCOMPARE(airflowSpy[0][0].value<EchoModule::AirflowDirections>(), airflowTestValue); + QCOMPARE(airflowSpy[0][0].value<Echomodule::AirflowDirections>(), airflowTestValue); - QSignalSpy testEnumSpy(zone, SIGNAL(testEnumChanged(EchoModule::TestEnum))); + QSignalSpy testEnumSpy(zone, SIGNAL(testEnumChanged(Echomodule::TestEnum))); QVERIFY(testEnumSpy.isValid()); - EchoModule::TestEnum testEnumTestValue = EchoModule::SecondEnumValue; + 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); + QCOMPARE(testEnumSpy[0][0].value<Echomodule::TestEnum>(), testEnumTestValue); } void EchoQtroTest::testSlots() @@ -718,25 +718,25 @@ void EchoQtroTest::testSlots() QCOMPARE(voidSlot2Spy.count(), 1); QCOMPARE(voidSlot2Spy[0][0].toInt(), voidSlot2TestValue); - QSignalSpy flagMethodSpy(&server.m_echoService, SIGNAL(flagMethodCalled(EchoModule::AirflowDirections))); + QSignalSpy flagMethodSpy(&server.m_echoService, SIGNAL(flagMethodCalled(Echomodule::AirflowDirections))); QVERIFY(flagMethodSpy.isValid()); - EchoModule::AirflowDirections flagTestValue = EchoModule::Dashboard; - QIviPendingReply<EchoModule::AirflowDirections> flagMethodReply = client.flagMethod(flagTestValue); + Echomodule::AirflowDirections flagTestValue = Echomodule::Dashboard; + QIviPendingReply<Echomodule::AirflowDirections> flagMethodReply = client.flagMethod(flagTestValue); QSignalSpy flagMethodReplySpy(flagMethodReply.watcher(), SIGNAL(replySuccess())); WAIT_AND_COMPARE(flagMethodReplySpy, 1); QCOMPARE(flagMethodReply.reply(), flagTestValue); QCOMPARE(flagMethodSpy.count(), 1); - QCOMPARE(flagMethodSpy[0][0].value<EchoModule::AirflowDirections>(), flagTestValue); + QCOMPARE(flagMethodSpy[0][0].value<Echomodule::AirflowDirections>(), flagTestValue); - QSignalSpy enumMethodSpy(&server.m_echoService, SIGNAL(enumMethodCalled(EchoModule::TestEnum))); + QSignalSpy enumMethodSpy(&server.m_echoService, SIGNAL(enumMethodCalled(Echomodule::TestEnum))); QVERIFY(enumMethodSpy.isValid()); - EchoModule::TestEnum enumTestValue = EchoModule::SecondEnumValue; - QIviPendingReply<EchoModule::TestEnum> enumMethodReply = client.enumMethod(enumTestValue); + Echomodule::TestEnum enumTestValue = Echomodule::SecondEnumValue; + QIviPendingReply<Echomodule::TestEnum> enumMethodReply = client.enumMethod(enumTestValue); QSignalSpy enumMethodReplySpy(enumMethodReply.watcher(), SIGNAL(replySuccess())); WAIT_AND_COMPARE(enumMethodReplySpy, 1); QCOMPARE(enumMethodReply.reply(), enumTestValue); QCOMPARE(enumMethodSpy.count(), 1); - QCOMPARE(enumMethodSpy[0][0].value<EchoModule::TestEnum>(), enumTestValue); + QCOMPARE(enumMethodSpy[0][0].value<Echomodule::TestEnum>(), enumTestValue); } void EchoQtroTest::testZonedSlots() @@ -786,26 +786,26 @@ void EchoQtroTest::testZonedSlots() QCOMPARE(comboReply.reply(), server.m_echoService.m_testCombo); QCOMPARE(getComboSpy.count(), 1); - QSignalSpy flagMethodSpy(&server.m_echoZonedService, SIGNAL(flagMethodCalled(EchoModule::AirflowDirections, QString))); + QSignalSpy flagMethodSpy(&server.m_echoZonedService, SIGNAL(flagMethodCalled(Echomodule::AirflowDirections, QString))); QVERIFY(flagMethodSpy.isValid()); - EchoModule::AirflowDirections flagTestValue = EchoModule::Dashboard; - QIviPendingReply<EchoModule::AirflowDirections> flagMethodReply = zone->flagMethod(flagTestValue); + Echomodule::AirflowDirections flagTestValue = Echomodule::Dashboard; + QIviPendingReply<Echomodule::AirflowDirections> flagMethodReply = zone->flagMethod(flagTestValue); QSignalSpy flagMethodReplySpy(flagMethodReply.watcher(), SIGNAL(replySuccess())); WAIT_AND_COMPARE(flagMethodReplySpy, 1); QCOMPARE(flagMethodReply.reply(), flagTestValue); QCOMPARE(flagMethodSpy.count(), 1); - QCOMPARE(flagMethodSpy[0][0].value<EchoModule::AirflowDirections>(), flagTestValue); + QCOMPARE(flagMethodSpy[0][0].value<Echomodule::AirflowDirections>(), flagTestValue); QCOMPARE(flagMethodSpy[0][1].toString(), frontLeftZone); - QSignalSpy enumMethodSpy(&server.m_echoZonedService, SIGNAL(enumMethodCalled(EchoModule::TestEnum, QString))); + QSignalSpy enumMethodSpy(&server.m_echoZonedService, SIGNAL(enumMethodCalled(Echomodule::TestEnum, QString))); QVERIFY(enumMethodSpy.isValid()); - EchoModule::TestEnum enumTestValue = EchoModule::SecondEnumValue; - QIviPendingReply<EchoModule::TestEnum> enumMethodReply = zone->enumMethod(enumTestValue); + Echomodule::TestEnum enumTestValue = Echomodule::SecondEnumValue; + QIviPendingReply<Echomodule::TestEnum> enumMethodReply = zone->enumMethod(enumTestValue); QSignalSpy enumMethodReplySpy(enumMethodReply.watcher(), SIGNAL(replySuccess())); WAIT_AND_COMPARE(enumMethodReplySpy, 1); QCOMPARE(enumMethodReply.reply(), enumTestValue); QCOMPARE(enumMethodSpy.count(), 1); - QCOMPARE(enumMethodSpy[0][0].value<EchoModule::TestEnum>(), enumTestValue); + QCOMPARE(enumMethodSpy[0][0].value<Echomodule::TestEnum>(), enumTestValue); QCOMPARE(enumMethodSpy[0][1].toString(), frontLeftZone); } diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/backend_simulator.cpp b/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/backend_simulator.cpp index d2bb99f..a406556 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/backend_simulator.cpp +++ b/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/backend_simulator.cpp @@ -1,10 +1,10 @@ #include "echobackend.h" #include "echozonedbackend.h" -#include "echosimulatorplugin.h" +#include "echomodulesimulatorplugin.h" QT_BEGIN_NAMESPACE -extern QVector<QIviFeatureInterface *> echoInterfaceBuilder(EchoSimulatorPlugin *plugin) +extern QVector<QIviFeatureInterface *> echoInterfaceBuilder(EchomoduleSimulatorPlugin *plugin) { QVector<QIviFeatureInterface *> res; res << new EchoBackend(plugin); |