diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2012-02-02 11:18:08 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-10 11:49:38 +0100 |
commit | 9daf11cede6a13fb95f202b2bdee7966a502d3f7 (patch) | |
tree | ae09d426af7edb1e998eeb45f1afb7a644a19800 /tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp | |
parent | e761f5b906c427433325debb9f08c4f2d0ba902d (diff) |
Debugger: Consistenly use 'state' instead of 'status'
Fix inconsistent naming e.g. in QtDeclarativeEngineDebug by always
using 'state' instead of 'status'. This is in line with the other
source code, which also seems to favor 'state'.
Change-Id: I65a7a3bd0eb7dfffeb37b5f8dad15b0a4a78de70
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Diffstat (limited to 'tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp')
-rw-r--r-- | tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp index 89cea1692e..c38b7854e0 100644 --- a/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp +++ b/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp @@ -67,7 +67,7 @@ private slots: void name(); void version(); - void status(); + void state(); void sendMessage(); void idForObject(); void objectForId(); @@ -112,23 +112,23 @@ void tst_QDeclarativeDebugService::version() QCOMPARE(service.version(), 2.0f); } -void tst_QDeclarativeDebugService::status() +void tst_QDeclarativeDebugService::state() { - QDeclarativeDebugTestService service("tst_QDeclarativeDebugService::status()"); - QCOMPARE(service.status(), QDeclarativeDebugService::Unavailable); + QDeclarativeDebugTestService service("tst_QDeclarativeDebugService::state()"); + QCOMPARE(service.state(), QDeclarativeDebugService::Unavailable); { - QDeclarativeDebugTestClient client("tst_QDeclarativeDebugService::status()", m_conn); - QTRY_COMPARE(client.status(), QDeclarativeDebugClient::Enabled); - QTRY_COMPARE(service.status(), QDeclarativeDebugService::Enabled); + QDeclarativeDebugTestClient client("tst_QDeclarativeDebugService::state()", m_conn); + QTRY_COMPARE(client.state(), QDeclarativeDebugClient::Enabled); + QTRY_COMPARE(service.state(), QDeclarativeDebugService::Enabled); } - QTRY_COMPARE(service.status(), QDeclarativeDebugService::Unavailable); + QTRY_COMPARE(service.state(), QDeclarativeDebugService::Unavailable); - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugService: Conflicting plugin name \"tst_QDeclarativeDebugService::status()\" "); - QDeclarativeDebugTestService duplicate("tst_QDeclarativeDebugService::status()"); - QCOMPARE(duplicate.status(), QDeclarativeDebugService::NotConnected); + QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugService: Conflicting plugin name \"tst_QDeclarativeDebugService::state()\" "); + QDeclarativeDebugTestService duplicate("tst_QDeclarativeDebugService::state()"); + QCOMPARE(duplicate.state(), QDeclarativeDebugService::NotConnected); } void tst_QDeclarativeDebugService::sendMessage() @@ -138,8 +138,8 @@ void tst_QDeclarativeDebugService::sendMessage() QByteArray msg = "hello!"; - QTRY_COMPARE(client.status(), QDeclarativeDebugClient::Enabled); - QTRY_COMPARE(service.status(), QDeclarativeDebugService::Enabled); + QTRY_COMPARE(client.state(), QDeclarativeDebugClient::Enabled); + QTRY_COMPARE(service.state(), QDeclarativeDebugService::Enabled); client.sendMessage(msg); QByteArray resp = client.waitForResponse(); |