Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/serialport/qserialport.cpp
	src/serialport/qserialport.h
	src/serialport/qserialport_unix.cpp
	src/serialport/qserialport_unix_p.h
	src/serialport/qserialport_win.cpp
	src/serialport/qserialport_win_p.h
	src/serialport/qserialport_wince_p.h
	src/serialport/qt4support/include/private/qcore_unix_p.h

Change-Id: Ifaa5ce8c1c0eb1c70246c54782719b91f3c95771

5 files changed, 243 insertions, 1 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 14963a2..2fa03f0 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,2 +1,5 @@
 TEMPLATE = subdirs
-SUBDIRS += qserialport cmake
+SUBDIRS += qserialport qserialportinfo qserialportinfoprivate cmake
+
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+    qserialportinfoprivate
diff --git a/tests/auto/qserialportinfo/qserialportinfo.pro b/tests/auto/qserialportinfo/qserialportinfo.pro
new file mode 100644
index 0000000..b3e49bd
--- /dev/null
+++ b/tests/auto/qserialportinfo/qserialportinfo.pro
@@ -0,0 +1,11 @@
+QT = core testlib
+TARGET = tst_qserialportinfo
+#CONFIG += testcase
+
+greaterThan(QT_MAJOR_VERSION, 4) {
+    QT += serialport
+} else {
+    include($$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf)
+}
+
+SOURCES = tst_qserialportinfo.cpp
diff --git a/tests/auto/qserialportinfo/tst_qserialportinfo.cpp b/tests/auto/qserialportinfo/tst_qserialportinfo.cpp
new file mode 100644
index 0000000..afbcf0b
--- /dev/null
+++ b/tests/auto/qserialportinfo/tst_qserialportinfo.cpp
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Denis Shienkov <denis.shienkov@gmail.com>
+** 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 <QtTest/QtTest>
+#include <QtSerialPort/QSerialPort>
+#include <QtSerialPort/QSerialPortInfo>
+
+class tst_QSerialPortInfo : public QObject
+{
+    Q_OBJECT
+public:
+    explicit tst_QSerialPortInfo();
+
+private slots:
+    void initTestCase();
+
+    void constructors();
+    void assignment();
+
+private:
+    QString m_senderPortName;
+    QString m_receiverPortName;
+    QStringList m_availablePortNames;
+};
+
+tst_QSerialPortInfo::tst_QSerialPortInfo()
+{
+}
+
+void tst_QSerialPortInfo::initTestCase()
+{
+    m_senderPortName = QString::fromLocal8Bit(qgetenv("QTEST_SERIALPORT_SENDER"));
+    m_receiverPortName = QString::fromLocal8Bit(qgetenv("QTEST_SERIALPORT_RECEIVER"));
+    if (m_senderPortName.isEmpty() || m_receiverPortName.isEmpty()) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+        QSKIP("Test doesn't work because the names of serial ports aren't found in env.");
+#else
+        QSKIP("Test doesn't work because the names of serial ports aren't set found env.", SkipAll);
+#endif
+    } else {
+        m_availablePortNames << m_senderPortName << m_receiverPortName;
+    }
+}
+
+void tst_QSerialPortInfo::constructors()
+{
+    QSerialPortInfo empty;
+    QVERIFY(empty.isNull());
+    QSerialPortInfo empty2(QLatin1String("ABCD"));
+    QVERIFY(empty2.isNull());
+    QSerialPortInfo empty3(empty);
+    QVERIFY(empty3.isNull());
+
+    QSerialPortInfo exist(m_senderPortName);
+    QVERIFY(!exist.isNull());
+    QSerialPortInfo exist2(exist);
+    QVERIFY(!exist2.isNull());
+}
+
+void tst_QSerialPortInfo::assignment()
+{
+    QSerialPortInfo empty;
+    QVERIFY(empty.isNull());
+    QSerialPortInfo empty2;
+    empty2 = empty;
+    QVERIFY(empty2.isNull());
+
+    QSerialPortInfo exist(m_senderPortName);
+    QVERIFY(!exist.isNull());
+    QSerialPortInfo exist2;
+    exist2 = exist;
+    QVERIFY(!exist2.isNull());
+}
+
+QTEST_MAIN(tst_QSerialPortInfo)
+#include "tst_qserialportinfo.moc"
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 <denis.shienkov@gmail.com>
+** 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 <QtTest/QtTest>
+
+#include <private/qserialportinfo_p.h>
+
+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<QString>("source");
+    QTest::addColumn<QString>("name");
+    QTest::addColumn<QString>("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"