on xenial help sign in
Refactor mocks to use IntegratedLightDM name
commitbbd96235f1fcb34ccb1bdd1e0558c688d70dd414 authorJosh Arenson <joshua.arenson@canonical.com> dateFri 22 May 2015, 12:29 (11 years ago) parent9bec3c0
24 files changed+24−26
plugins/IntegratedLightDM/CMakeLists.txt+1−1 tests/CMakeLists.txt+2−2 tests/mocks/CMakeLists.txt+1−1 tests/mocks/LightDM/CMakeLists.txt → tests/mocks/IntegratedLightDM/CMakeLists.txt+6−6 tests/mocks/LightDM/LightDM.qmltypes → tests/mocks/IntegratedLightDM/IntegratedLightDM.qmltypes+6−8 tests/mocks/LightDM/MockGreeter.cpp → tests/mocks/IntegratedLightDM/MockGreeter.cpp tests/mocks/LightDM/MockGreeter.h → tests/mocks/IntegratedLightDM/MockGreeter.h tests/mocks/LightDM/MockUsersModel.cpp → tests/mocks/IntegratedLightDM/MockUsersModel.cpp tests/mocks/LightDM/MockUsersModel.h → tests/mocks/IntegratedLightDM/MockUsersModel.h tests/mocks/LightDM/QLightDM/Greeter → tests/mocks/IntegratedLightDM/QLightDM/Greeter tests/mocks/LightDM/QLightDM/UsersModel → tests/mocks/IntegratedLightDM/QLightDM/UsersModel tests/mocks/LightDM/liblightdm/CMakeLists.txt → tests/mocks/IntegratedLightDM/liblightdm/CMakeLists.txt tests/mocks/LightDM/liblightdm/Greeter.cpp → tests/mocks/IntegratedLightDM/liblightdm/Greeter.cpp tests/mocks/LightDM/liblightdm/Greeter.h → tests/mocks/IntegratedLightDM/liblightdm/Greeter.h tests/mocks/LightDM/liblightdm/GreeterPrivate.cpp → tests/mocks/IntegratedLightDM/liblightdm/GreeterPrivate.cpp tests/mocks/LightDM/liblightdm/GreeterPrivate.h → tests/mocks/IntegratedLightDM/liblightdm/GreeterPrivate.h tests/mocks/LightDM/liblightdm/UsersModel.cpp → tests/mocks/IntegratedLightDM/liblightdm/UsersModel.cpp tests/mocks/LightDM/liblightdm/UsersModel.h → tests/mocks/IntegratedLightDM/liblightdm/UsersModel.h tests/mocks/LightDM/liblightdm/UsersModelPrivate.cpp → tests/mocks/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp tests/mocks/LightDM/liblightdm/UsersModelPrivate.h → tests/mocks/IntegratedLightDM/liblightdm/UsersModelPrivate.h tests/mocks/LightDM/plugin.cpp → tests/mocks/IntegratedLightDM/plugin.cpp+3−3 tests/mocks/LightDM/plugin.h → tests/mocks/IntegratedLightDM/plugin.h+2−2 tests/mocks/IntegratedLightDM/qmldir+3 tests/mocks/LightDM/qmldir−3
plugins/IntegratedLightDM/CMakeLists.txt+1−1
@@ -8,7 +8,7 @@ include_directories(
88 ${CMAKE_CURRENT_SOURCE_DIR}
99 ${CMAKE_CURRENT_BINARY_DIR}
1010 ${CMAKE_SOURCE_DIR}/plugins/Utils
11− ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
11+ ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
1212 #${LIBLIGHTDM_INCLUDE_DIRS}
1313 ${libunity8-private_SOURCE_DIR}
1414 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
tests/CMakeLists.txt+2−2
@@ -10,7 +10,7 @@ add_dependencies(qmltests qmlunittests qmluitests)
1010add_subdirectory(libs)
1111add_subdirectory(qmltests)
1212add_subdirectory(mocks)
13−#add_subdirectory(whitespace)
14−#add_subdirectory(plugins)
13+add_subdirectory(whitespace)
14+add_subdirectory(plugins)
1515add_subdirectory(utils)
1616add_subdirectory(uqmlscene)
tests/mocks/CMakeLists.txt+1−1
@@ -32,7 +32,7 @@ add_subdirectory(AccountsService)
3232add_subdirectory(GSettings.1.0)
3333add_subdirectory(indicator-service)
3434add_subdirectory(libusermetrics)
35−#add_subdirectory(LightDM)
35+add_subdirectory(IntegratedLightDM)
3636add_subdirectory(Lights)
3737add_subdirectory(MeeGo)
3838add_subdirectory(Powerd)
tests/mocks/LightDM/CMakeLists.txt → tests/mocks/IntegratedLightDM/CMakeLists.txtrenamed+6−6
@@ -10,16 +10,16 @@ include_directories(
1010 ${CMAKE_CURRENT_SOURCE_DIR}
1111 ${CMAKE_CURRENT_BINARY_DIR}
1212 ${CMAKE_SOURCE_DIR}/plugins/Utils
13− ${CMAKE_SOURCE_DIR}/plugins/LightDM
13+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
1414 ${CMAKE_SOURCE_DIR}/tests/mocks/libusermetrics
1515 ${libunity8-private_SOURCE_DIR}
1616)
1717
1818set(QMLPLUGIN_SRC
19− ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeter.cpp
20− ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeterList.cpp
21− ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
22− ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
19+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/DBusGreeter.cpp
20+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/DBusGreeterList.cpp
21+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/Greeter.cpp
22+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/UsersModel.cpp
2323 ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
2424 MockGreeter.cpp
2525 MockUsersModel.cpp
@@ -42,7 +42,7 @@ target_link_libraries(MockLightDM-qml
4242
4343qt5_use_modules(MockLightDM-qml DBus Gui Qml)
4444
45−add_unity8_mock(LightDM 0.1 LightDM
45+add_unity8_mock(IntegratedLightDM 0.1 IntegratedLightDM
4646 PREFIX mocks
4747 TARGETS MockLightDM-qml
4848 ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/liblightdm"
tests/mocks/LightDM/LightDM.qmltypes → tests/mocks/IntegratedLightDM/IntegratedLightDM.qmltypesrenamed+6−8
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
44// It is used for QML tooling purposes only.
55//
66// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable LightDM 0.1 tests/mocks'
7+// 'qmlplugindump -notrelocatable IntegratedLightDM 0.1 tests/mocks'
88
99Module {
1010 Component {
@@ -61,7 +61,7 @@ Module {
6161 Component {
6262 name: "MockGreeter"
6363 prototype: "Greeter"
64− exports: ["LightDM/Greeter 0.1"]
64+ exports: ["IntegratedLightDM/Greeter 0.1"]
6565 isCreatable: false
6666 isSingleton: true
6767 exportMetaObjectRevisions: [0]
@@ -74,7 +74,7 @@ Module {
7474 Component {
7575 name: "MockUsersModel"
7676 prototype: "UsersModel"
77− exports: ["LightDM/Users 0.1"]
77+ exports: ["IntegratedLightDM/Users 0.1"]
7878 isCreatable: false
7979 isSingleton: true
8080 exportMetaObjectRevisions: [0]
@@ -92,7 +92,7 @@ Module {
9292 Component {
9393 name: "QLightDM::UsersModel"
9494 prototype: "QAbstractListModel"
95− exports: ["LightDM/UserRoles 0.1"]
95+ exports: ["IntegratedLightDM/UserRoles 0.1"]
9696 isCreatable: false
9797 exportMetaObjectRevisions: [0]
9898 Enum {
@@ -207,7 +207,7 @@ Module {
207207 Component {
208208 name: "UserMetricsOutput::UserMetrics"
209209 prototype: "QObject"
210− exports: ["LightDM/Infographic 0.1"]
210+ exports: ["IntegratedLightDM/Infographic 0.1"]
211211 isCreatable: false
212212 isSingleton: true
213213 exportMetaObjectRevisions: [0]
@@ -246,7 +246,7 @@ Module {
246246 }
247247 Signal {
248248 name: "currentDayChanged"
249− Parameter { name: "currentDay"; type: "int" }
249+ Parameter { name: "length"; type: "int" }
250250 }
251251 Signal {
252252 name: "secondColorChanged"
@@ -264,8 +264,6 @@ Module {
264264 Signal { name: "dataChanged" }
265265 Signal { name: "dataAboutToDisappear" }
266266 Signal { name: "dataDisappeared" }
267− Method { name: "nextDataSourceSlot" }
268− Method { name: "readyForDataChangeSlot" }
269267 }
270268 Component { name: "UsersModel"; prototype: "UnitySortFilterProxyModelQML" }
271269}
tests/mocks/LightDM/MockGreeter.cpp → tests/mocks/IntegratedLightDM/MockGreeter.cpprenamed

The content is the same.

tests/mocks/LightDM/MockGreeter.h → tests/mocks/IntegratedLightDM/MockGreeter.hrenamed

The content is the same.

tests/mocks/LightDM/MockUsersModel.cpp → tests/mocks/IntegratedLightDM/MockUsersModel.cpprenamed

The content is the same.

tests/mocks/LightDM/MockUsersModel.h → tests/mocks/IntegratedLightDM/MockUsersModel.hrenamed

The content is the same.

tests/mocks/LightDM/QLightDM/Greeter → tests/mocks/IntegratedLightDM/QLightDM/Greeterrenamed

The content is the same.

tests/mocks/LightDM/QLightDM/UsersModel → tests/mocks/IntegratedLightDM/QLightDM/UsersModelrenamed

The content is the same.

tests/mocks/LightDM/liblightdm/CMakeLists.txt → tests/mocks/IntegratedLightDM/liblightdm/CMakeLists.txtrenamed

The content is the same.

tests/mocks/LightDM/liblightdm/Greeter.cpp → tests/mocks/IntegratedLightDM/liblightdm/Greeter.cpprenamed

The content is the same.

tests/mocks/LightDM/liblightdm/Greeter.h → tests/mocks/IntegratedLightDM/liblightdm/Greeter.hrenamed

The content is the same.

tests/mocks/LightDM/liblightdm/GreeterPrivate.cpp → tests/mocks/IntegratedLightDM/liblightdm/GreeterPrivate.cpprenamed

The content is the same.

tests/mocks/LightDM/liblightdm/GreeterPrivate.h → tests/mocks/IntegratedLightDM/liblightdm/GreeterPrivate.hrenamed

The content is the same.

tests/mocks/LightDM/liblightdm/UsersModel.cpp → tests/mocks/IntegratedLightDM/liblightdm/UsersModel.cpprenamed

The content is the same.

tests/mocks/LightDM/liblightdm/UsersModel.h → tests/mocks/IntegratedLightDM/liblightdm/UsersModel.hrenamed

The content is the same.

tests/mocks/LightDM/liblightdm/UsersModelPrivate.cpp → tests/mocks/IntegratedLightDM/liblightdm/UsersModelPrivate.cpprenamed

The content is the same.

tests/mocks/LightDM/liblightdm/UsersModelPrivate.h → tests/mocks/IntegratedLightDM/liblightdm/UsersModelPrivate.hrenamed

The content is the same.

tests/mocks/LightDM/plugin.cpp → tests/mocks/IntegratedLightDM/plugin.cpprenamed+3−3
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014, 2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -53,12 +53,12 @@ static QObject *infographic_provider(QQmlEngine *engine, QJSEngine *scriptEngine
5353 return UserMetricsOutput::UserMetrics::getInstance();
5454}
5555
56−void LightDMPlugin::registerTypes(const char *uri)
56+void IntegratedLightDMPlugin::registerTypes(const char *uri)
5757{
5858 qmlRegisterType<QAbstractItemModel>();
5959 qmlRegisterType<UserMetricsOutput::ColorTheme>();
6060
61− Q_ASSERT(uri == QLatin1String("LightDM"));
61+ Q_ASSERT(uri == QLatin1String("IntegratedLightDM"));
6262 qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
6363 qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
6464 qmlRegisterSingletonType<MockGreeter>(uri, 0, 1, "Greeter", greeter_provider);
tests/mocks/LightDM/plugin.h → tests/mocks/IntegratedLightDM/plugin.hrenamed+2−2
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014, 2015 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
2020#include <QtQml/QQmlEngine>
2121#include <QtQml/QQmlExtensionPlugin>
2222
23−class LightDMPlugin : public QQmlExtensionPlugin
23+class IntegratedLightDMPlugin : public QQmlExtensionPlugin
2424{
2525 Q_OBJECT
2626 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
tests/mocks/IntegratedLightDM/qmldirnew file+3
@@ -0,0 +1,3 @@
1+module IntegratedLightDM
2+plugin MockLightDM-qml
3+typeinfo IntegratedLightDM.qmltypes
tests/mocks/LightDM/qmldirdeleted−3
@@ -1,3 +0,0 @@
1−module LightDM
2−plugin MockLightDM-qml
3−typeinfo LightDM.qmltypes