diff options
author | Dominik Holland <dominik.holland@pelagicore.com> | 2018-05-22 10:54:47 +0200 |
---|---|---|
committer | Antti Hölttä <ahoelttae@luxoft.com> | 2018-05-24 13:08:33 +0000 |
commit | 7fbebc5487d39b6561e7e36b6b18801e64c4b79c (patch) | |
tree | 4bd021790d1dedf2f18a61319c64c8e05c12cbdd /tests | |
parent | 8e52e01e46445ee1c6d489ef397852426b6e3936 (diff) |
Move the simulator features into it's own test folder
Previously it was part of the noprivate folder and this is now just
using an additional annotation file.
The new folder is also needed because the test is now using a special
qface file, which only contains the supported features of the simulator
Change-Id: I738e2db73b662049489e45f47a859bd77ce78d88
Reviewed-by: Antti Hölttä <ahoelttae@luxoft.com>
Diffstat (limited to 'tests')
11 files changed, 142 insertions, 16 deletions
diff --git a/tests/auto/core/ivigenerator/ivigenerator.pro b/tests/auto/core/ivigenerator/ivigenerator.pro index 2254d04..87b0c0b 100644 --- a/tests/auto/core/ivigenerator/ivigenerator.pro +++ b/tests/auto/core/ivigenerator/ivigenerator.pro @@ -5,4 +5,5 @@ SUBDIRS = projects OTHER_FILES = org.example.echo.qface \ org.example.echo.yaml \ org.example.echo.noprivate.qface \ - org.example.echo.qtro.qface + org.example.echo.qtro.qface \ + org.example.echo.simulator.qface diff --git a/tests/auto/core/ivigenerator/org.example.echo.simulator.qface b/tests/auto/core/ivigenerator/org.example.echo.simulator.qface new file mode 100644 index 0000000..ff88ce1 --- /dev/null +++ b/tests/auto/core/ivigenerator/org.example.echo.simulator.qface @@ -0,0 +1,53 @@ +/** + * module + */ +module org.example.echo.simulator 1.0 + +/** + * @brief the brief + * @description the description + * continues {@link http://qt.io} + * @deprecated + * @see org.example.echo.Echo + * @see org.example + * @see http://qt.io + * @anything hello + */ +@config: {"id": "org.foo.id.1.0"} +interface Echo { + /** + * @brief brief message + * @details long message + * + * @param msg the message + * @return the echo + */ + readonly string lastMessage; + int intValue; + string stringValue; + + string echo(string msg); + string id(); + + signal valueChanged(int value); +} + +@config: {"id": "org.foo.idz.1.0", "zoned": true} +interface EchoZoned { + /** + * @brief brief message + * @details long message + * + * @param msg the message + * @return the echo + */ + readonly string lastMessage; + int intValue; + string stringValue; + + string echo(string msg); + string id(); + + signal valueChanged(int value); +} + diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/control_panel/control_panel.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/control_panel/control_panel.pro deleted file mode 100644 index 04b6964..0000000 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/control_panel/control_panel.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE=app -TARGET= echo_noprivate_control_panel -DESTDIR = ../ - -CONFIG += ivigenerator - -QT += ivicore ivicore-private qml quick - -QFACE_FORMAT = control_panel -QFACE_SOURCES = ../../../org.example.echo.qface -QFACE_ANNOTATIONS += ../../../no-private.yaml diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/org-example-echo-noprivate.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/org-example-echo-noprivate.pro index 40feb20..898a129 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/org-example-echo-noprivate.pro +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/org-example-echo-noprivate.pro @@ -7,10 +7,6 @@ SUBDIRS = frontend \ validator \ test -qtConfig(simulator) { - SUBDIRS += control_panel -} - backend_simulator.depends = frontend validator.depends = frontend test.depends = frontend diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/backend_simulator/backend_simulator.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/backend_simulator/backend_simulator.pro new file mode 100644 index 0000000..0264f84 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/backend_simulator/backend_simulator.pro @@ -0,0 +1,16 @@ +TEMPLATE=lib +TARGET = $$qtLibraryTarget(echo_backend_simulator) +LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_simulator_frontend) +DESTDIR = ../qtivi + +CONFIG += warn_off ivigenerator plugin + +INCLUDEPATH += $$OUT_PWD/../frontend +PLUGIN_TYPE = qtivi +PLUGIN_EXTENDS = qtivi +PLUGIN_CLASS_NAME = QIviServiceInterface + +QT += core ivicore + +QFACE_FORMAT = backend_simulator +QFACE_SOURCES = ../../../org.example.echo.simulator.qface diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/control_panel/control_panel.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/control_panel/control_panel.pro new file mode 100644 index 0000000..8521a23 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/control_panel/control_panel.pro @@ -0,0 +1,10 @@ +TEMPLATE=app +TARGET= echo_simulator_control_panel +DESTDIR = ../ + +CONFIG += ivigenerator + +QT += ivicore ivicore-private qml quick + +QFACE_FORMAT = control_panel +QFACE_SOURCES = ../../../org.example.echo.simulator.qface diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/frontend/frontend.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/frontend/frontend.pro new file mode 100644 index 0000000..156a404 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/frontend/frontend.pro @@ -0,0 +1,14 @@ +TEMPLATE=lib +TARGET= $$qtLibraryTarget(echo_simulator_frontend) +DESTDIR = ../ + +CONFIG += ivigenerator + +QT += ivicore ivicore-private qml quick + +DEFINES += QT_BUILD_ECHO_LIB + +macos: QMAKE_SONAME_PREFIX = @rpath + +QFACE_SOURCES = ../../../org.example.echo.simulator.qface + diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/org-example-echo-simulator.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/org-example-echo-simulator.pro new file mode 100644 index 0000000..eeb5bbb --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/org-example-echo-simulator.pro @@ -0,0 +1,13 @@ +TEMPLATE = subdirs + +QT_FOR_CONFIG += ivicore + +SUBDIRS = frontend \ + backend_simulator \ + control_panel \ + validator \ + test + +backend_simulator.depends = frontend +validator.depends = frontend +test.depends = frontend diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/test/test.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/test/test.pro new file mode 100644 index 0000000..89887f5 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/test/test.pro @@ -0,0 +1,14 @@ +TARGET = tst_org-example-echo-simulator +QMAKE_PROJECT_NAME = $$TARGET +DESTDIR = ../ + +QT += testlib core ivicore +CONFIG += c++11 ivigenerator testcase + +INCLUDEPATH += $$OUT_PWD/../frontend +LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_simulator_frontend) + +QMAKE_RPATHDIR += $$OUT_PWD/.. + +QFACE_FORMAT = test +QFACE_SOURCES = ../../../org.example.echo.simulator.qface diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/validator/validator.pro b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/validator/validator.pro new file mode 100644 index 0000000..fccb3c6 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-simulator/validator/validator.pro @@ -0,0 +1,16 @@ +TEMPLATE = app +TARGET = validator_org-example-echo-simulator +QMAKE_PROJECT_NAME = $$TARGET +LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_simulator_frontend) + +DESTDIR = .. + +CONFIG += c++11 ivigenerator +CONFIG -= app_bundle + +INCLUDEPATH += $$OUT_PWD/../frontend + +QT += qml quick core ivicore + +QFACE_FORMAT = generation_validator +QFACE_SOURCES = ../../../org.example.echo.simulator.qface diff --git a/tests/auto/core/ivigenerator/projects/projects.pro b/tests/auto/core/ivigenerator/projects/projects.pro index 66ea031..cc11805 100644 --- a/tests/auto/core/ivigenerator/projects/projects.pro +++ b/tests/auto/core/ivigenerator/projects/projects.pro @@ -8,3 +8,7 @@ SUBDIRS = org-example-echo \ qtConfig(remoteobjects) { SUBDIRS += org-example-echo-qtro } + +qtConfig(simulator) { + SUBDIRS += org-example-echo-simulator +} |