mirror of
https://github.com/pocoproject/poco.git
synced 2025-10-29 12:18:01 +01:00
Poco 1.9.1 assert true (#2255)
* Rename assert by assertTrue * Update submodules * Missing assertTrue * Rename poco_assertTrue to poco_assert * Rename poco_assertTrue to poco_assert
This commit is contained in:
committed by
Aleksandar Fabijanic
parent
5a1bf5eb4a
commit
960ecb38f0
@@ -128,25 +128,25 @@ void WebSocketTest::testWebSocket()
|
||||
char buffer[1024];
|
||||
int flags;
|
||||
int n = ws.receiveFrame(buffer, sizeof(buffer), flags);
|
||||
assert (n == payload.size());
|
||||
assert (payload.compare(0, payload.size(), buffer, 0, n) == 0);
|
||||
assert (flags == WebSocket::FRAME_TEXT);
|
||||
assertTrue (n == payload.size());
|
||||
assertTrue (payload.compare(0, payload.size(), buffer, 0, n) == 0);
|
||||
assertTrue (flags == WebSocket::FRAME_TEXT);
|
||||
|
||||
for (int i = 2; i < 20; i++)
|
||||
{
|
||||
payload.assign(i, 'x');
|
||||
ws.sendFrame(payload.data(), (int) payload.size());
|
||||
n = ws.receiveFrame(buffer, sizeof(buffer), flags);
|
||||
assert (n == payload.size());
|
||||
assert (payload.compare(0, payload.size(), buffer, 0, n) == 0);
|
||||
assert (flags == WebSocket::FRAME_TEXT);
|
||||
assertTrue (n == payload.size());
|
||||
assertTrue (payload.compare(0, payload.size(), buffer, 0, n) == 0);
|
||||
assertTrue (flags == WebSocket::FRAME_TEXT);
|
||||
|
||||
ws.sendFrame(payload.data(), (int) payload.size());
|
||||
Poco::Buffer<char> pocobuffer(0);
|
||||
n = ws.receiveFrame(pocobuffer, flags);
|
||||
assert (n == payload.size());
|
||||
assert (payload.compare(0, payload.size(), pocobuffer.begin(), 0, n) == 0);
|
||||
assert (flags == WebSocket::FRAME_TEXT);
|
||||
assertTrue (n == payload.size());
|
||||
assertTrue (payload.compare(0, payload.size(), pocobuffer.begin(), 0, n) == 0);
|
||||
assertTrue (flags == WebSocket::FRAME_TEXT);
|
||||
}
|
||||
|
||||
for (int i = 125; i < 129; i++)
|
||||
@@ -154,36 +154,36 @@ void WebSocketTest::testWebSocket()
|
||||
payload.assign(i, 'x');
|
||||
ws.sendFrame(payload.data(), (int) payload.size());
|
||||
n = ws.receiveFrame(buffer, sizeof(buffer), flags);
|
||||
assert (n == payload.size());
|
||||
assert (payload.compare(0, payload.size(), buffer, 0, n) == 0);
|
||||
assert (flags == WebSocket::FRAME_TEXT);
|
||||
assertTrue (n == payload.size());
|
||||
assertTrue (payload.compare(0, payload.size(), buffer, 0, n) == 0);
|
||||
assertTrue (flags == WebSocket::FRAME_TEXT);
|
||||
|
||||
ws.sendFrame(payload.data(), (int) payload.size());
|
||||
Poco::Buffer<char> pocobuffer(0);
|
||||
n = ws.receiveFrame(pocobuffer, flags);
|
||||
assert (n == payload.size());
|
||||
assert (payload.compare(0, payload.size(), pocobuffer.begin(), 0, n) == 0);
|
||||
assert (flags == WebSocket::FRAME_TEXT);
|
||||
assertTrue (n == payload.size());
|
||||
assertTrue (payload.compare(0, payload.size(), pocobuffer.begin(), 0, n) == 0);
|
||||
assertTrue (flags == WebSocket::FRAME_TEXT);
|
||||
}
|
||||
|
||||
payload = "Hello, world!";
|
||||
ws.sendFrame(payload.data(), (int) payload.size());
|
||||
n = ws.receiveFrame(buffer, sizeof(buffer), flags);
|
||||
assert (n == payload.size());
|
||||
assert (payload.compare(0, payload.size(), buffer, 0, n) == 0);
|
||||
assert (flags == WebSocket::FRAME_TEXT);
|
||||
assertTrue (n == payload.size());
|
||||
assertTrue (payload.compare(0, payload.size(), buffer, 0, n) == 0);
|
||||
assertTrue (flags == WebSocket::FRAME_TEXT);
|
||||
|
||||
payload = "Hello, universe!";
|
||||
ws.sendFrame(payload.data(), (int) payload.size(), WebSocket::FRAME_BINARY);
|
||||
n = ws.receiveFrame(buffer, sizeof(buffer), flags);
|
||||
assert (n == payload.size());
|
||||
assert (payload.compare(0, payload.size(), buffer, 0, n) == 0);
|
||||
assert (flags == WebSocket::FRAME_BINARY);
|
||||
assertTrue (n == payload.size());
|
||||
assertTrue (payload.compare(0, payload.size(), buffer, 0, n) == 0);
|
||||
assertTrue (flags == WebSocket::FRAME_BINARY);
|
||||
|
||||
ws.shutdown();
|
||||
n = ws.receiveFrame(buffer, sizeof(buffer), flags);
|
||||
assert (n == 2);
|
||||
assert ((flags & WebSocket::FRAME_OP_BITMASK) == WebSocket::FRAME_OP_CLOSE);
|
||||
assertTrue (n == 2);
|
||||
assertTrue ((flags & WebSocket::FRAME_OP_BITMASK) == WebSocket::FRAME_OP_CLOSE);
|
||||
|
||||
server.stop();
|
||||
}
|
||||
@@ -218,8 +218,8 @@ void WebSocketTest::testWebSocketLarge()
|
||||
n += ws.receiveFrame(buffer + n, sizeof(buffer) - n, flags);
|
||||
} while (n > 0 && n < msgSize);
|
||||
|
||||
assert (n == payload.size());
|
||||
assert (payload.compare(0, payload.size(), buffer, 0, n) == 0);
|
||||
assertTrue (n == payload.size());
|
||||
assertTrue (payload.compare(0, payload.size(), buffer, 0, n) == 0);
|
||||
}
|
||||
|
||||
|
||||
@@ -246,16 +246,16 @@ void WebSocketTest::testOneLargeFrame(int msgSize)
|
||||
int n;
|
||||
|
||||
n = ws.receiveFrame(buffer.begin(), buffer.size(), flags);
|
||||
assert (n == payload.size());
|
||||
assert (payload.compare(0, payload.size(), buffer.begin(), 0, n) == 0);
|
||||
assertTrue (n == payload.size());
|
||||
assertTrue (payload.compare(0, payload.size(), buffer.begin(), 0, n) == 0);
|
||||
|
||||
ws.sendFrame(payload.data(), msgSize);
|
||||
|
||||
Poco::Buffer<char> pocobuffer(0);
|
||||
|
||||
n = ws.receiveFrame(pocobuffer, flags);
|
||||
assert (n == payload.size());
|
||||
assert (payload.compare(0, payload.size(), pocobuffer.begin(), 0, n) == 0);
|
||||
assertTrue (n == payload.size());
|
||||
assertTrue (payload.compare(0, payload.size(), pocobuffer.begin(), 0, n) == 0);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user