2 files changed, 30 insertions, 4 deletions
diff --git a/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp b/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
index d307b7e..938cd51 100644
--- a/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
+++ b/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
@@ -90,7 +90,7 @@ public:
         return m_zones;
     }
 
-    void initializeAttributes() Q_DECL_OVERRIDE
+    void initialize() Q_DECL_OVERRIDE
     {
         emit airflowDirectionsChanged(m_airflowDirections);
         emit airflowDirectionsAttributeChanged(m_airflowDirectionsAttribute);
@@ -537,11 +537,24 @@ private:
     ClimateControlTestBackend *m_backend;
 };
 
+class InvalidInterface : public QIviFeatureInterface
+{
+public:
+    InvalidInterface(QObject *parent)
+        : QIviFeatureInterface(parent)
+    {}
+
+    void initialize() Q_DECL_OVERRIDE
+    {
+        emit initializationDone();
+    }
+};
+
 class ClimateControlInvalidServiceObject : public QIviServiceObject {
 
 public:
     explicit ClimateControlInvalidServiceObject(QObject *parent=0) :
-        QIviServiceObject(parent), m_name(QLatin1String("")), m_dummyBackend(new QIviFeatureInterface(this))
+        QIviServiceObject(parent), m_name(QLatin1String("")), m_dummyBackend(new InvalidInterface(this))
     {
         m_interfaces << QIviClimateControl_iid;
     }
diff --git a/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp b/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp
index d5249d2..bc9f488 100644
--- a/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp
+++ b/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp
@@ -62,7 +62,7 @@ public:
         return m_zoneMap.keys();
     }
 
-    void initializeAttributes() Q_DECL_OVERRIDE
+    void initialize() Q_DECL_OVERRIDE
     {
         const QStringList zones = availableZones();
         //zones.removeLast(); // Do not init zone "Dummy"
@@ -257,11 +257,24 @@ private:
     WindowControlTestBackend *m_backend;
 };
 
+class InvalidInterface : public QIviFeatureInterface
+{
+public:
+    InvalidInterface(QObject *parent)
+        : QIviFeatureInterface(parent)
+    {}
+
+    void initialize() Q_DECL_OVERRIDE
+    {
+        emit initializationDone();
+    }
+};
+
 class WindowControlInvalidServiceObject : public QIviServiceObject {
 
 public:
     explicit WindowControlInvalidServiceObject(QObject *parent=0) :
-        QIviServiceObject(parent), m_name(QLatin1String("")), m_dummyBackend(new QIviFeatureInterface(this))
+        QIviServiceObject(parent), m_name(QLatin1String("")), m_dummyBackend(new InvalidInterface(this))
     {
         m_interfaces << QIviWindowControl_iid;
     }