瀏覽代碼

fix attribute unit test

Julius Pfrommer 8 年之前
父節點
當前提交
10d60837f5
共有 2 個文件被更改,包括 5 次插入5 次删除
  1. 3 3
      src/server/ua_services_attribute.c
  2. 2 2
      tests/check_services_attributes.c

+ 3 - 3
src/server/ua_services_attribute.c

@@ -687,7 +687,7 @@ void Service_Read_single(UA_Server *server, UA_Session *session,
         userWriteMask &=
             server->config.accessControl.getUserRightsMask(&session->sessionId,
                                                            session->sessionHandle, &id->nodeId);
-        forceVariantSetScalar(&v->value, &userWriteMask, &UA_TYPES[UA_TYPES_UINT32]);
+        UA_Variant_setScalarCopy(&v->value, &userWriteMask, &UA_TYPES[UA_TYPES_UINT32]);
         break; }
     case UA_ATTRIBUTEID_ISABSTRACT:
         retval = readIsAbstractAttribute(node, &v->value);
@@ -742,7 +742,7 @@ void Service_Read_single(UA_Server *server, UA_Session *session,
         userAccessLevel &=
             server->config.accessControl.getUserAccessLevel(&session->sessionId,
                                                             session->sessionHandle, &id->nodeId);
-        forceVariantSetScalar(&v->value, &userAccessLevel, &UA_TYPES[UA_TYPES_BYTE]);
+        UA_Variant_setScalarCopy(&v->value, &userAccessLevel, &UA_TYPES[UA_TYPES_BYTE]);
         break; }
     case UA_ATTRIBUTEID_MINIMUMSAMPLINGINTERVAL:
         CHECK_NODECLASS(UA_NODECLASS_VARIABLE);
@@ -765,7 +765,7 @@ void Service_Read_single(UA_Server *server, UA_Session *session,
         userExecutable &=
             server->config.accessControl.getUserExecutable(&session->sessionId,
                                                            session->sessionHandle, &id->nodeId);
-        forceVariantSetScalar(&v->value, &userExecutable, &UA_TYPES[UA_TYPES_BOOLEAN]);
+        UA_Variant_setScalarCopy(&v->value, &userExecutable, &UA_TYPES[UA_TYPES_BOOLEAN]);
         break; }
     default:
         retval = UA_STATUSCODE_BADATTRIBUTEIDINVALID;

+ 2 - 2
tests/check_services_attributes.c

@@ -319,10 +319,10 @@ START_TEST(ReadSingleAttributeUserWriteMaskWithoutTimestamp) {
     rReq.nodesToRead[0].nodeId = UA_NODEID_STRING_ALLOC(1, "the.answer");
     rReq.nodesToRead[0].attributeId = UA_ATTRIBUTEID_USERWRITEMASK;
     Service_Read_single(server, &adminSession, UA_TIMESTAMPSTORETURN_NEITHER, &rReq.nodesToRead[0], &resp);
-    UA_UInt32* respval = (UA_UInt32*) resp.value.data;
+    UA_UInt32 respval = *(UA_UInt32*)resp.value.data;
     ck_assert_int_eq(0, resp.value.arrayLength);
     ck_assert_ptr_eq(&UA_TYPES[UA_TYPES_UINT32], resp.value.type);
-    ck_assert_int_eq(0,*respval);
+    ck_assert_int_eq(0, respval);
     UA_ReadRequest_deleteMembers(&rReq);
     UA_DataValue_deleteMembers(&resp);
     UA_Server_delete(server);