1 files changed, 56 insertions, 21 deletions

diff --git a/tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml b/tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml
index 8c721a5..a8d3225 100644
--- a/tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml
+++ b/tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
 ** 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 The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** 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 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company 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 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -33,21 +28,61 @@
 
 import QtQuick 2.5
 import QtWebSockets 1.0
+import QtTest 1.1
 
 Rectangle {
     width: 360
     height: 360
 
-    function appendMessage(message) {
-        messageBox.text += "\n" + message
-    }
-
     WebSocketServer {
         id: server
         port: 1337
+
+        onClientConnected: {
+            currentSocket = webSocket;
+        }
+
+        property var currentSocket
     }
 
     WebSocket {
         id: socket
+        url: server.url
+    }
+
+    TestCase {
+        function ensureConnected() {
+            socket.active = true;
+            server.listen = true;
+            tryCompare(socket, 'status', WebSocket.Open);
+            verify(server.currentSocket);
+        }
+
+        function ensureDisconnected() {
+            socket.active = false;
+            server.listen = false;
+            tryCompare(socket, 'status', WebSocket.Closed);
+            server.currentSocket = null;
+        }
+
+        function test_send_receive_text() {
+            ensureConnected();
+
+            var o = {};
+            var sending = 'hello.';
+            server.currentSocket.textMessageReceived.connect(function(received) {
+                compare(received, sending);
+                o.called = true;
+            });
+
+            socket.sendTextMessage(sending);
+            tryCompare(o, 'called', true);
+        }
+
+        function test_send_text_error_closed() {
+            ensureDisconnected();
+            socket.sendTextMessage('hello');
+            tryCompare(socket, 'status', WebSocket.Error);
+        }
     }
 }