summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel d'Andrada <daniel.dandrada@luxoft.com>2018-12-10 09:21:15 +0100
committerRobert Griebl <robert.griebl@pelagicore.com>2018-12-12 11:56:54 +0000
commitb50ba65d0f08faf76a33bb6e58cef3bf52f73b06 (patch)
tree07853192e4572eddccb53c3902658b4d75afe999
parentadb23a6ea8ba07c648bfc436c355a56db5cc7e2e (diff)
Remove test for component that no longer exists
SystemMonitor was removed in commit e6d886635a59905ed58318d75702f538b5112a3b "Introduce MonitorModel & friends". Change-Id: I06acbffba68798ced097ca3ef733ad4b1c707a6a Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com> (cherry picked from commit c53affd67bf53f0956a84db7bd7c360a41b83b06)
-rw-r--r--tests/qml/monitoring/am-config.yaml16
-rw-r--r--tests/qml/monitoring/monitoring.pro4
-rw-r--r--tests/qml/monitoring/tst_monitoring.qml112
-rw-r--r--tests/qml/qml.pro1
4 files changed, 0 insertions, 133 deletions
diff --git a/tests/qml/monitoring/am-config.yaml b/tests/qml/monitoring/am-config.yaml
deleted file mode 100644
index 00c43b53..00000000
--- a/tests/qml/monitoring/am-config.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-formatVersion: 1
-formatType: am-configuration
----
-applications:
- builtinAppsManifestDir: "${CONFIG_PWD}/apps"
- installedAppsManifestDir: "/tmp/am-monitoring-test/manifests"
- appImageMountDir: "/tmp/am-monitoring-test/image-mounts"
- database: "/tmp/am-monitoring-test/apps.db"
-
-installationLocations:
-- id: "internal-0"
- installationPath: "/tmp/am-monitoring-test/apps"
- documentPath: "/tmp/am-monitoring-test/docs"
- mountPoint: "/tmp"
- isDefault: true
-
diff --git a/tests/qml/monitoring/monitoring.pro b/tests/qml/monitoring/monitoring.pro
deleted file mode 100644
index efdca89a..00000000
--- a/tests/qml/monitoring/monitoring.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-AM_CONFIG = am-config.yaml
-TEST_FILES = tst_monitoring.qml
-
-load(am-qml-testcase)
diff --git a/tests/qml/monitoring/tst_monitoring.qml b/tests/qml/monitoring/tst_monitoring.qml
deleted file mode 100644
index fbe1e80e..00000000
--- a/tests/qml/monitoring/tst_monitoring.qml
+++ /dev/null
@@ -1,112 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 Pelagicore AG
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Pelagicore Application Manager.
-**
-** $QT_BEGIN_LICENSE:LGPL-QTAS$
-** Commercial License Usage
-** Licensees holding valid commercial Qt Automotive Suite licenses may use
-** this file in accordance with the commercial license agreement provided
-** with the Software or, alternatively, in accordance with the terms
-** contained in a written agreement between you and The Qt Company. For
-** licensing terms and conditions see https://www.qt.io/terms-conditions.
-** For further information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-** SPDX-License-Identifier: LGPL-3.0
-**
-****************************************************************************/
-
-import QtQuick 2.6
-import QtTest 1.0
-import QtApplicationManager.SystemUI 1.0
-import QtApplicationManager 1.0
-
-TestCase {
- id: testCase
- when: windowShown
- name: "Monitoring"
-
- SystemMonitor {
- id: systemMonitor
- }
-
- ListView {
- id: listView
- model: systemMonitor
- delegate: Item {}
- }
-
- SignalSpy {
- id: memoryReportingChangedSpy
- target: systemMonitor
- signalName: "memoryReportingChanged"
- }
-
- function test_mem_reporting() {
- compare(systemMonitor.count, 10);
- verify(!systemMonitor.memoryReportingEnabled);
-
- systemMonitor.reportingInterval = 80
- systemMonitor.count = 5;
- systemMonitor.memoryReportingEnabled = true;
-
- compare(systemMonitor.reportingInterval, 80);
- compare(systemMonitor.count, 5);
- verify(systemMonitor.memoryReportingEnabled);
-
- if (memoryReportingChangedSpy.count < 1)
- memoryReportingChangedSpy.wait(1000 * AmTest.timeoutFactor);
- compare(memoryReportingChangedSpy.count, 1);
- console.info("Used Memory: " + (memoryReportingChangedSpy.signalArguments[0][0]/1e9).toFixed(1) + " GB");
- var mem = [memoryReportingChangedSpy.signalArguments[0][0]];
- verify(mem[0] > 16000);
- compare(listView.model.get(0).memoryUsed, mem[0]);
-
- if (memoryReportingChangedSpy.count < 2)
- memoryReportingChangedSpy.wait(1000 * AmTest.timeoutFactor);
- compare(memoryReportingChangedSpy.count, 2);
- mem[1] = memoryReportingChangedSpy.signalArguments[1][0];
- verify(mem[1] > 16000);
- compare(listView.model.get(0).memoryUsed, mem[1]);
- compare(listView.model.get(1).memoryUsed, mem[0]);
-
- systemMonitor.count = 4;
- compare(listView.model.get(0).memoryUsed, mem[1]);
- compare(listView.model.get(1).memoryUsed, mem[0]);
-
- systemMonitor.reportingInterval = 85;
- compare(listView.model.get(0).memoryUsed, 0);
- compare(listView.model.get(1).memoryUsed, 0);
- }
-
- function test_static() {
- console.info("CPU Cores: " + systemMonitor.cpuCores);
- console.info("Total Memory: " + (systemMonitor.totalMemory/1e9).toFixed(1) + " GB");
- verify(systemMonitor.cpuCores >= 1);
- verify(systemMonitor.totalMemory > 64000);
- compare(systemMonitor.idleLoadThreshold, 0.1);
- }
-}
diff --git a/tests/qml/qml.pro b/tests/qml/qml.pro
index 54e83ed0..78ac75a5 100644
--- a/tests/qml/qml.pro
+++ b/tests/qml/qml.pro
@@ -5,7 +5,6 @@ SUBDIRS = \
windowitem \
windowitem2 \
installer \
- monitoring \
quicklaunch \
intents \
crash/apps/tld.test.crash/terminator2 \