Browse Source

align the service attribute tests to the use of access level attributes

Julius Pfrommer 9 years ago
parent
commit
13a658f30e
2 changed files with 5 additions and 4 deletions
  1. 2 2
      src/server/ua_nodes.c
  2. 3 2
      tests/check_services_attributes.c

+ 2 - 2
src/server/ua_nodes.c

@@ -8,8 +8,8 @@ static void UA_Node_init(UA_Node *p) {
 	UA_QualifiedName_init(&p->browseName);
 	UA_LocalizedText_init(&p->displayName);
 	UA_LocalizedText_init(&p->description);
-	UA_UInt32_init(&p->writeMask);
-	UA_UInt32_init(&p->userWriteMask);
+	p->writeMask = 0;
+	p->userWriteMask = 0;
 	p->referencesSize = -1;
 	p->references = NULL;
 }

+ 3 - 2
tests/check_services_attributes.c

@@ -452,14 +452,15 @@ START_TEST(ReadSingleAttributeUserAccessLevelWithoutTimestamp) {
     rReq.nodesToRead[0].nodeId = UA_NODEID_STRING_ALLOC(1, "the.answer");
     rReq.nodesToRead[0].attributeId = UA_ATTRIBUTEID_USERACCESSLEVEL;
     Service_Read_single(server, &adminSession, UA_TIMESTAMPSTORETURN_NEITHER, &rReq.nodesToRead[0], &resp);
-    UA_VariableNode* compNode = makeCompareSequence();
+    const UA_VariableNode* compNode =
+        (const UA_VariableNode*)UA_NodeStore_get(server->nodestore, &rReq.nodesToRead[0].nodeId);
     ck_assert_int_eq(-1, resp.value.arrayLength);
     ck_assert_ptr_eq(&UA_TYPES[UA_TYPES_BYTE], resp.value.type);
     ck_assert_int_eq(*(UA_Byte*)resp.value.data, compNode->userAccessLevel);
+    UA_NodeStore_release((const UA_Node*)compNode);
     UA_Server_delete(server);
     UA_DataValue_deleteMembers(&resp);
     UA_ReadRequest_deleteMembers(&rReq);
-    UA_VariableNode_delete(compNode);
 } END_TEST
 
 START_TEST(ReadSingleAttributeMinimumSamplingIntervalWithoutTimestamp) {