Tests: Various fixes for the unit tests on MinGW

tests/client/check_client.c

@@ -101,7 +101,7 @@ START_TEST(Client_endpoints) {
     UA_StatusCode retval = UA_Client_getEndpoints(client, "opc.tcp://localhost:4840",
                                                   &endpointArraySize, &endpointArray);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_msg(endpointArraySize > 0);
+    ck_assert(endpointArraySize > 0);
 
     UA_Array_delete(endpointArray,endpointArraySize, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 
@@ -134,7 +134,7 @@ START_TEST(Client_endpoints_empty) {
 
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
 
-    ck_assert_msg(response.endpointsSize > 0);
+    ck_assert(response.endpointsSize > 0);
 
     UA_GetEndpointsResponse_deleteMembers(&response);
     UA_GetEndpointsRequest_deleteMembers(&request);
@@ -243,7 +243,7 @@ END_TEST
 START_TEST(Client_delete_without_connect) {
     UA_Client *client = UA_Client_new();
     UA_ClientConfig_setDefault(UA_Client_getConfig(client));
-    ck_assert_msg(client != NULL);
+    ck_assert(client != NULL);
     UA_Client_delete(client);
 }
 END_TEST

tests/client/check_client_async.c

@@ -98,10 +98,7 @@ START_TEST(Client_highlevel_async_readValue) {
 
         UA_Client_disconnect(client);
         UA_Client_delete(client);
-    }
-}
-
-
+} END_TEST
 
 START_TEST(Client_read_async) {
         UA_Client *client = UA_Client_new();

tests/client/check_client_securechannel.c

@@ -115,7 +115,7 @@ START_TEST(SecureChannel_networkfail) {
     UA_Variant_init(&val);
     UA_NodeId nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
     retval = UA_Client_readValueAttribute(client, nodeId, &val);
-    ck_assert_msg(retval == UA_STATUSCODE_BADSECURECHANNELCLOSED);
+    ck_assert(retval == UA_STATUSCODE_BADSECURECHANNELCLOSED);
 
     UA_Client_disconnect(client);
     UA_Client_delete(client);
@@ -169,7 +169,7 @@ START_TEST(SecureChannel_cableunplugged) {
     retval = UA_Client_readValueAttribute(client, nodeId, &val);
     ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONCLOSED);
 
-    ck_assert_msg(UA_Client_getState(client) == UA_CLIENTSTATE_DISCONNECTED);
+    ck_assert(UA_Client_getState(client) == UA_CLIENTSTATE_DISCONNECTED);
 
     UA_Client_recvTesting_result = UA_STATUSCODE_GOOD;
 

tests/server/check_server.c

@@ -35,12 +35,12 @@ START_TEST(checkGetConfig) {
 } END_TEST
 
 START_TEST(checkGetNamespaceByName) {
-    size_t notFoundIndex = -1;
+    size_t notFoundIndex = 62541;
     UA_StatusCode notFound = UA_Server_getNamespaceByName(server, UA_STRING("http://opcfoundation.org/UA/invalid"), &notFoundIndex);
-    ck_assert_int_eq(notFoundIndex, -1); // not changed
+    ck_assert_int_eq(notFoundIndex, 62541); // not changed
     ck_assert_int_eq(notFound, UA_STATUSCODE_BADNOTFOUND);
 
-    size_t foundIndex = -1;
+    size_t foundIndex = 62541;
     UA_StatusCode found = UA_Server_getNamespaceByName(server, UA_STRING("http://opcfoundation.org/UA/"), &foundIndex);
     ck_assert_int_eq(foundIndex, 0); // this namespace always has index 0 (defined by the standard)
     ck_assert_int_eq(found, UA_STATUSCODE_GOOD);