From ab51ad6a5f4e533c31bd8e5b6f16a3bcd09a3ee6 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Mon, 24 Nov 2014 18:21:57 +0300 Subject: Allow to use custom devices paths QSP incorrectly transforms non-standard device names to their paths and vice-versa (for example, "/home/ttyS0", "//./COM1", and so on). Now this problem is solved: * The transformation code is moved to QSPP. * Added autotests auto/qserialportinfoprivate to testing of conversion algorithm. These tests are private and can be activated with building of QtSerialPort with: qmake "QT_CONFIG+=private_tests warnings_are_errors" \ DEFINES+=QT_BUILD_INTERNAL Tested on Windows 8, Linux, OSX with auto-tests, with on-board and virtual serial ports. Task-number: QTBUG-38639 Change-Id: I43757a7f1390f53ed2b1d70de59c6bfb71892a59 Reviewed-by: Sergey Belyashov --- tests/auto/auto.pro | 5 +- .../qserialportinfoprivate.pro | 4 + .../tst_qserialportinfoprivate.cpp | 110 +++++++++++++++++++++ 3 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 tests/auto/qserialportinfoprivate/qserialportinfoprivate.pro create mode 100644 tests/auto/qserialportinfoprivate/tst_qserialportinfoprivate.cpp (limited to 'tests') diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 5e317d7..2fa03f0 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,2 +1,5 @@ TEMPLATE = subdirs -SUBDIRS += qserialport qserialportinfo cmake +SUBDIRS += qserialport qserialportinfo qserialportinfoprivate cmake + +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + qserialportinfoprivate diff --git a/tests/auto/qserialportinfoprivate/qserialportinfoprivate.pro b/tests/auto/qserialportinfoprivate/qserialportinfoprivate.pro new file mode 100644 index 0000000..f479a29 --- /dev/null +++ b/tests/auto/qserialportinfoprivate/qserialportinfoprivate.pro @@ -0,0 +1,4 @@ +QT = core testlib serialport-private +TARGET = tst_qserialportinfoprivate +#CONFIG += testcase +SOURCES = tst_qserialportinfoprivate.cpp diff --git a/tests/auto/qserialportinfoprivate/tst_qserialportinfoprivate.cpp b/tests/auto/qserialportinfoprivate/tst_qserialportinfoprivate.cpp new file mode 100644 index 0000000..cfd2d85 --- /dev/null +++ b/tests/auto/qserialportinfoprivate/tst_qserialportinfoprivate.cpp @@ -0,0 +1,110 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Denis Shienkov +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtSerialPort module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +#include + +class tst_QSerialPortInfoPrivate : public QObject +{ + Q_OBJECT +public: + explicit tst_QSerialPortInfoPrivate(); + +private slots: + void canonical_data(); + void canonical(); +}; + +tst_QSerialPortInfoPrivate::tst_QSerialPortInfoPrivate() +{ +} + +void tst_QSerialPortInfoPrivate::canonical_data() +{ + QTest::addColumn("source"); + QTest::addColumn("name"); + QTest::addColumn("location"); + +#if defined (Q_OS_WINCE) + QTest::newRow("Test1") << "COM1" << "COM1" << "COM1:"; + QTest::newRow("Test2") << "COM1:" << "COM1" << "COM1:"; +#elif defined (Q_OS_WIN32) + QTest::newRow("Test1") << "COM1" << "COM1" << "\\\\.\\COM1"; + QTest::newRow("Test2") << "\\\\.\\COM1" << "COM1" << "\\\\.\\COM1"; + QTest::newRow("Test3") << "//./COM1" << "COM1" << "//./COM1"; +#elif defined (Q_OS_OSX) + QTest::newRow("Test1") << "ttyS0" << "ttyS0" << "/dev/ttyS0"; + QTest::newRow("Test2") << "cu.serial1" << "cu.serial1" << "/dev/cu.serial1"; + QTest::newRow("Test3") << "tty.serial1" << "tty.serial1" << "/dev/tty.serial1"; + QTest::newRow("Test4") << "/dev/ttyS0" << "ttyS0" << "/dev/ttyS0"; + QTest::newRow("Test5") << "/dev/tty.serial1" << "tty.serial1" << "/dev/tty.serial1"; + QTest::newRow("Test6") << "/dev/cu.serial1" << "cu.serial1" << "/dev/cu.serial1"; + QTest::newRow("Test7") << "/dev/serial/ttyS0" << "serial/ttyS0" << "/dev/serial/ttyS0"; + QTest::newRow("Test8") << "/home/ttyS0" << "/home/ttyS0" << "/home/ttyS0"; + QTest::newRow("Test9") << "/home/serial/ttyS0" << "/home/serial/ttyS0" << "/home/serial/ttyS0"; + QTest::newRow("Test10") << "serial/ttyS0" << "serial/ttyS0" << "/dev/serial/ttyS0"; + QTest::newRow("Test11") << "./ttyS0" << "./ttyS0" << "./ttyS0"; + QTest::newRow("Test12") << "../ttyS0" << "../ttyS0" << "../ttyS0"; +#elif defined (Q_OS_UNIX) + QTest::newRow("Test1") << "ttyS0" << "ttyS0" << "/dev/ttyS0"; + QTest::newRow("Test2") << "/dev/ttyS0" << "ttyS0" << "/dev/ttyS0"; + QTest::newRow("Test3") << "/dev/serial/ttyS0" << "serial/ttyS0" << "/dev/serial/ttyS0"; + QTest::newRow("Test4") << "/home/ttyS0" << "/home/ttyS0" << "/home/ttyS0"; + QTest::newRow("Test5") << "/home/serial/ttyS0" << "/home/serial/ttyS0" << "/home/serial/ttyS0"; + QTest::newRow("Test6") << "serial/ttyS0" << "serial/ttyS0" << "/dev/serial/ttyS0"; + QTest::newRow("Test7") << "./ttyS0" << "./ttyS0" << "./ttyS0"; + QTest::newRow("Test8") << "../ttyS0" << "../ttyS0" << "../ttyS0"; +#endif +} + +void tst_QSerialPortInfoPrivate::canonical() +{ + QFETCH(QString, source); + QFETCH(QString, name); + QFETCH(QString, location); + + QCOMPARE(QSerialPortInfoPrivate::portNameFromSystemLocation(source), name); + QCOMPARE(QSerialPortInfoPrivate::portNameToSystemLocation(source), location); +} + +QTEST_MAIN(tst_QSerialPortInfoPrivate) +#include "tst_qserialportinfoprivate.moc" -- cgit v1.2.1