Merge branch '0.2'

src/client/ua_client_highlevel.c

@@ -13,6 +13,7 @@ UA_Client_NamespaceGetIndex(UA_Client *client, UA_String *namespaceUri,
     UA_ReadRequest request;
     UA_ReadRequest_init(&request);
     UA_ReadValueId id;
+    UA_ReadValueId_init(&id);  
     id.attributeId = UA_ATTRIBUTEID_VALUE;
     id.nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_NAMESPACEARRAY);
     request.nodesToRead = &id;

tests/check_services_view.c

@@ -4,39 +4,144 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <pthread.h>
+#include <server/ua_server_internal.h>
 
 #include "check.h"
 #include "ua_server.h"
 #include "ua_config_standard.h"
+#include "ua_network_tcp.h"
+
+UA_Server *server_translate_browse;
+UA_Boolean *running_translate_browse;
+UA_ServerNetworkLayer nl_translate_browse;
+pthread_t server_thread_translate_browse;
+
+static void *serverloop_register(void *_) {
+    while (*running_translate_browse)
+        UA_Server_run_iterate(server_translate_browse, true);
+    return NULL;
+}
+
+static void setup_server(void) {
+    // start server
+    running_translate_browse = UA_Boolean_new();
+    *running_translate_browse = true;
+    UA_ServerConfig config_register = UA_ServerConfig_standard;
+    config_register.applicationDescription.applicationUri = UA_String_fromChars("urn:open62541.test.server_translate_browse");
+    nl_translate_browse = UA_ServerNetworkLayerTCP(UA_ConnectionConfig_standard, 16664);
+    config_register.networkLayers = &nl_translate_browse;
+    config_register.networkLayersSize = 1;
+    server_translate_browse = UA_Server_new(config_register);
+    UA_Server_run_startup(server_translate_browse);
+    pthread_create(&server_thread_translate_browse, NULL, serverloop_register, NULL);
+}
+
+static void teardown_server(void) {
+    *running_translate_browse = false;
+    pthread_join(server_thread_translate_browse, NULL);
+    UA_Server_run_shutdown(server_translate_browse);
+    UA_Boolean_delete(running_translate_browse);
+    UA_String_deleteMembers(&server_translate_browse->config.applicationDescription.applicationUri);
+    UA_Server_delete(server_translate_browse);
+    nl_translate_browse.deleteMembers(&nl_translate_browse);
+}
+
 
 START_TEST(Service_Browse_WithBrowseName)
-{
-    UA_Server * server = UA_Server_new(UA_ServerConfig_standard);
+    {
+        UA_Server *server = UA_Server_new(UA_ServerConfig_standard);
 
-    UA_BrowseDescription bd;
-    UA_BrowseDescription_init(&bd);
-    bd.resultMask = UA_BROWSERESULTMASK_BROWSENAME;
-    bd.nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
-    bd.referenceTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
-    bd.browseDirection = UA_BROWSEDIRECTION_FORWARD;
+        UA_BrowseDescription bd;
+        UA_BrowseDescription_init(&bd);
+        bd.resultMask = UA_BROWSERESULTMASK_BROWSENAME;
+        bd.nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
+        bd.referenceTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
+        bd.browseDirection = UA_BROWSEDIRECTION_FORWARD;
 
-    UA_BrowseResult br = UA_Server_browse(server, 0, &bd);
+        UA_BrowseResult br = UA_Server_browse(server, 0, &bd);
 
-    ck_assert_int_eq(br.statusCode, UA_STATUSCODE_GOOD);
-    ck_assert(br.referencesSize > 0);
-    ck_assert(!UA_String_equal(&br.references[0].browseName.name, &UA_STRING_NULL));
+        ck_assert_int_eq(br.statusCode, UA_STATUSCODE_GOOD);
+        ck_assert(br.referencesSize > 0);
+        ck_assert(!UA_String_equal(&br.references[0].browseName.name, &UA_STRING_NULL));
 
-    UA_BrowseResult_deleteMembers(&br);
-    UA_Server_delete(server);
-}
+        UA_BrowseResult_deleteMembers(&br);
+        UA_Server_delete(server);
+    }
 END_TEST
 
-static Suite* testSuite_Service_TranslateBrowsePathsToNodeIds(void) {
+#define BROWSE_PATHS_SIZE 3
+
+START_TEST(Service_TranslateBrowsePathsToNodeIds)
+    {
+        UA_Client *client = UA_Client_new(UA_ClientConfig_standard);
+
+        UA_StatusCode retVal = UA_Client_connect(client, "opc.tcp://localhost:16664");
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        // Just for testing we want to translate the following path to its corresponding node id
+        // /Objects/Server/ServerStatus/State
+        // Equals the following node IDs:
+        // /85/2253/2256/2259
+
+        char *paths[BROWSE_PATHS_SIZE] = {"Server", "ServerStatus", "State"};
+        UA_UInt32 ids[BROWSE_PATHS_SIZE] = {2253, 2256, 2259};
+
+
+        UA_BrowsePath *browsePaths = UA_Array_new(BROWSE_PATHS_SIZE, &UA_TYPES[UA_TYPES_BROWSEPATH]);
+
+        for (unsigned int i = 0; i < BROWSE_PATHS_SIZE; i++) {
+            UA_BrowsePath_init(&browsePaths[i]);
+            browsePaths[i].startingNode = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
+            browsePaths[i].relativePath.elementsSize = i + 1;
+            browsePaths[i].relativePath.elements = UA_Array_new(i + 1, &UA_TYPES[UA_TYPES_RELATIVEPATHELEMENT]);
+            for (unsigned int j = 0; j <= i; j++) {
+                UA_RelativePathElement_init(&browsePaths[i].relativePath.elements[j]);
+                browsePaths[i].relativePath.elements[j].isInverse = UA_TRUE;
+
+                browsePaths[i].relativePath.elements[j].targetName = UA_QUALIFIEDNAME_ALLOC(0, paths[j]);
+            }
+        }
+
+        UA_TranslateBrowsePathsToNodeIdsRequest request;
+        UA_TranslateBrowsePathsToNodeIdsRequest_init(&request);
+        request.browsePaths = browsePaths;
+        request.browsePathsSize = BROWSE_PATHS_SIZE;
+
+        {
+
+            UA_TranslateBrowsePathsToNodeIdsResponse response = UA_Client_Service_translateBrowsePathsToNodeIds(client, request);
+
+            ck_assert_int_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+            ck_assert_int_eq(response.resultsSize, BROWSE_PATHS_SIZE);
+
+            for (int i = 0; i < BROWSE_PATHS_SIZE; i++) {
+                ck_assert_int_eq(response.results[i].targetsSize, 1);
+                ck_assert_int_eq(response.results[i].targets[0].targetId.nodeId.identifierType, UA_NODEIDTYPE_NUMERIC);
+                ck_assert_int_eq(response.results[i].targets[0].targetId.nodeId.identifier.numeric, ids[i]);
+
+            }
+
+            UA_TranslateBrowsePathsToNodeIdsRequest_deleteMembers(&request);
+            UA_TranslateBrowsePathsToNodeIdsResponse_deleteMembers(&response);
+            retVal = UA_Client_disconnect(client);
+            ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+            UA_Client_delete(client);
+        }
+    }
+END_TEST
+
+static Suite *testSuite_Service_TranslateBrowsePathsToNodeIds(void) {
     Suite *s = suite_create("Service_TranslateBrowsePathsToNodeIds");
     TCase *tc_browse = tcase_create("Browse Service");
     tcase_add_test(tc_browse, Service_Browse_WithBrowseName);
+    suite_add_tcase(s, tc_browse);
+
+    TCase *tc_translate = tcase_create("TranslateBrowsePathsToNodeIds");
+    tcase_add_unchecked_fixture(tc_translate, setup_server, teardown_server);
+    tcase_add_test(tc_translate, Service_TranslateBrowsePathsToNodeIds);
 
-    suite_add_tcase(s,tc_browse);
+    suite_add_tcase(s, tc_translate);
     return s;
 }