Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 12:28:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

removed unused code, renamed UnitTest.ready() to UnitTest.done()

Browse source
This commit is contained in:
Thijs Wenker 2015-08-21 19:07:33 +02:00
parent 7f5fc64f6c
commit 55fd847636
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/libraries/unitTest.js
View file

@ -173,7 +173,7 @@ UnitTest.prototype.raises = function(func, message) {
throw new UnthrownException(message); throw new UnthrownException(message);
} }
UnitTest.prototype.ready = function() { UnitTest.prototype.done = function() {
if (this.timeout !== undefined) { if (this.timeout !== undefined) {
Script.clearTimeout(this.timeoutTimer); Script.clearTimeout(this.timeoutTimer);
this.successCallback(this); this.successCallback(this);

6
examples/utilities/diagnostics/testWebSocket.js
View file

@ -35,7 +35,7 @@ unitTests.addTest("Test default WebSocket values", function(finished) {
}); });
webSocket.onclose = this.registerCallbackFunction(function(event) { webSocket.onclose = this.registerCallbackFunction(function(event) {
_this.assertEquals(webSocket.CLOSED, webSocket.readyState, "readyState should be CLOSED"); _this.assertEquals(webSocket.CLOSED, webSocket.readyState, "readyState should be CLOSED");
_this.ready(); _this.done();
}); });
this.assertEquals(webSocket.CONNECTING, webSocket.readyState, "readyState should be CONNECTING"); this.assertEquals(webSocket.CONNECTING, webSocket.readyState, "readyState should be CONNECTING");
this.assertEquals("blob", webSocket.binaryType, "binaryType should be 'blob'"); this.assertEquals("blob", webSocket.binaryType, "binaryType should be 'blob'");
@ -55,7 +55,7 @@ unitTests.addTest("Test WebSocket invalid URL", function(finished) {
webSocket.onclose = this.registerCallbackFunction(function(event) { webSocket.onclose = this.registerCallbackFunction(function(event) {
_this.assertEquals(true, hadError, "hadError should be true"); _this.assertEquals(true, hadError, "hadError should be true");
_this.assertEquals(webSocket.CLOSED, webSocket.readyState, "readyState should be CLOSED"); _this.assertEquals(webSocket.CLOSED, webSocket.readyState, "readyState should be CLOSED");
_this.ready(); _this.done();
}); });
this.assertEquals(webSocket.CONNECTING, webSocket.readyState, "readyState should be CONNECTING"); this.assertEquals(webSocket.CONNECTING, webSocket.readyState, "readyState should be CONNECTING");
this.assertEquals(WEBSOCKET_INVALID_URL, webSocket.url, "url should be '" + WEBSOCKET_INVALID_URL + "'"); this.assertEquals(WEBSOCKET_INVALID_URL, webSocket.url, "url should be '" + WEBSOCKET_INVALID_URL + "'");
@ -78,7 +78,7 @@ unitTests.addTest("Test WebSocketServer with three clients", function(finished)
if (respondedClients === NUMBER_OF_CLIENTS) { if (respondedClients === NUMBER_OF_CLIENTS) {
webSocketServer.close(); webSocketServer.close();
_this.assertEquals(false, webSocketServer.listening, "listening should be false"); _this.assertEquals(false, webSocketServer.listening, "listening should be false");
_this.ready(); _this.done();
} }
}); });
newClient.send(JSON.stringify({message: TEST_MESSAGE, client: connectedClients})); newClient.send(JSON.stringify({message: TEST_MESSAGE, client: connectedClients}));

1
libraries/script-engine/src/WebSocketClass.cpp
View file

@ -39,7 +39,6 @@ void WebSocketClass::initialize() {
QScriptValue WebSocketClass::constructor(QScriptContext* context, QScriptEngine* engine) { QScriptValue WebSocketClass::constructor(QScriptContext* context, QScriptEngine* engine) {
QString url; QString url;
QScriptValue callee = context->callee();
if (context->argumentCount() == 1) { if (context->argumentCount() == 1) {
url = context->argument(0).toString(); url = context->argument(0).toString();
} }