hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename TestConnections::assert() to TestConnections::expect()

Browse Source 
Allows the including of <assert.h>.
This commit is contained in:
Johan Wikman
2018-09-10 10:24:46 +03:00
parent bcacdf9358
commit 6279ab350c
38 changed files with 117 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maxscale-system-test/mxs1889.cpp
View File

@ -23,15 +23,15 @@ string get_server_id(TestConnections& test, MYSQL* pMysql)
if (rv == 0)
{
MYSQL_RES* pResult = mysql_store_result(pMysql);
test.assert(pResult, "Could not store result.");
test.expect(pResult, "Could not store result.");
if (pResult)
{
unsigned int n = mysql_field_count(pMysql);
test.assert(n == 1, "Unexpected number of fields.");
test.expect(n == 1, "Unexpected number of fields.");
MYSQL_ROW pzRow = mysql_fetch_row(pResult);
test.assert(pzRow, "Returned row was NULL.");
test.expect(pzRow, "Returned row was NULL.");
if (pzRow)
{
@ -79,7 +79,7 @@ int main(int argc, char** argv)
string slave_id = get_server_id(test, test.maxscales->conn_slave[0]);
test.tprintf("Server id: %s", slave_id.c_str());
test.assert(slave_id != master_id, "Expected something else but %s", master_id.c_str());
test.expect(slave_id != master_id, "Expected something else but %s", master_id.c_str());
return test.global_result;
}