|
|
@@ -684,6 +684,166 @@ START_TEST(SinglePublishSubscribeInt32) {
|
|
|
UA_Variant_delete(publishedNodeData);
|
|
|
} END_TEST
|
|
|
|
|
|
+START_TEST(SinglePublishSubscribeInt64) {
|
|
|
+ /* To check status after running both publisher and subscriber */
|
|
|
+ UA_StatusCode retVal = UA_STATUSCODE_GOOD;
|
|
|
+ UA_PublishedDataSetConfig pdsConfig;
|
|
|
+ UA_NodeId dataSetWriter;
|
|
|
+ UA_NodeId readerIdentifier;
|
|
|
+ UA_NodeId writerGroup;
|
|
|
+ UA_DataSetReaderConfig readerConfig;
|
|
|
+
|
|
|
+ /* Published DataSet */
|
|
|
+ memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
|
|
|
+ pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
|
|
|
+ pdsConfig.name = UA_STRING("PublishedDataSet Test");
|
|
|
+ UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetTest);
|
|
|
+ ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
|
|
|
+
|
|
|
+ /* Create variable to publish integer data */
|
|
|
+ UA_NodeId publisherNode;
|
|
|
+ UA_VariableAttributes attr = UA_VariableAttributes_default;
|
|
|
+ attr.description = UA_LOCALIZEDTEXT("en-US","Published Int64");
|
|
|
+ attr.displayName = UA_LOCALIZEDTEXT("en-US","Published Int64");
|
|
|
+ attr.dataType = UA_TYPES[UA_TYPES_INT64].typeId;
|
|
|
+ UA_Int64 publisherData = 64;
|
|
|
+ UA_Variant_setScalar(&attr.value, &publisherData, &UA_TYPES[UA_TYPES_INT64]);
|
|
|
+ retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID),
|
|
|
+ UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
|
|
|
+ UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
|
|
|
+ UA_QUALIFIEDNAME(1, "Published Int64"),
|
|
|
+ UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
|
|
|
+ attr, NULL, &publisherNode);
|
|
|
+ ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
|
|
|
+
|
|
|
+ /* Data Set Field */
|
|
|
+ UA_NodeId dataSetFieldIdent;
|
|
|
+ UA_DataSetFieldConfig dataSetFieldConfig;
|
|
|
+ memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
|
|
|
+ dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
|
|
|
+ dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Published Int64");
|
|
|
+ dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
|
|
|
+ dataSetFieldConfig.field.variable.publishParameters.publishedVariable = publisherNode;
|
|
|
+ dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
|
|
|
+ UA_Server_addDataSetField (server, publishedDataSetTest, &dataSetFieldConfig, &dataSetFieldIdent);
|
|
|
+
|
|
|
+ /* Writer group */
|
|
|
+ UA_WriterGroupConfig writerGroupConfig;
|
|
|
+ memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
|
|
|
+ writerGroupConfig.name = UA_STRING("WriterGroup Test");
|
|
|
+ writerGroupConfig.publishingInterval = PUBLISH_INTERVAL;
|
|
|
+ writerGroupConfig.enabled = UA_FALSE;
|
|
|
+ writerGroupConfig.writerGroupId = WRITER_GROUP_ID;
|
|
|
+ writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
|
|
|
+ retVal |= UA_Server_addWriterGroup(server, connection_test, &writerGroupConfig, &writerGroup);
|
|
|
+ ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
|
|
|
+
|
|
|
+ /* DataSetWriter */
|
|
|
+ UA_DataSetWriterConfig dataSetWriterConfig;
|
|
|
+ memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
|
|
|
+ dataSetWriterConfig.name = UA_STRING("DataSetWriter Test");
|
|
|
+ dataSetWriterConfig.dataSetWriterId = DATASET_WRITER_ID;
|
|
|
+ dataSetWriterConfig.keyFrameCount = 10;
|
|
|
+ retVal |= UA_Server_addDataSetWriter(server, writerGroup, publishedDataSetTest, &dataSetWriterConfig, &dataSetWriter);
|
|
|
+ ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
|
|
|
+
|
|
|
+ /* Reader Group */
|
|
|
+ UA_ReaderGroupConfig readerGroupConfig;
|
|
|
+ memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
|
|
|
+ readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
|
|
|
+ retVal |= UA_Server_addReaderGroup(server, connection_test, &readerGroupConfig, &readerGroupTest);
|
|
|
+
|
|
|
+ /* Data Set Reader */
|
|
|
+ /* Parameters to filter received NetworkMessage */
|
|
|
+ memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
|
|
|
+ readerConfig.name = UA_STRING ("DataSetReader Test");
|
|
|
+ readerConfig.dataSetWriterId = DATASET_WRITER_ID;
|
|
|
+ /* Setting up Meta data configuration in DataSetReader */
|
|
|
+ UA_DataSetMetaDataType *pMetaData = &readerConfig.dataSetMetaData;
|
|
|
+ /* FilltestMetadata function in subscriber implementation */
|
|
|
+ UA_DataSetMetaDataType_init (pMetaData);
|
|
|
+ pMetaData->name = UA_STRING ("DataSet Test");
|
|
|
+ /* Static definition of number of fields size to 1 to create one
|
|
|
+ targetVariable */
|
|
|
+ pMetaData->fieldsSize = 1;
|
|
|
+ pMetaData->fields = (UA_FieldMetaData*)UA_Array_new (pMetaData->fieldsSize,
|
|
|
+ &UA_TYPES[UA_TYPES_FIELDMETADATA]);
|
|
|
+ /* Unsigned Integer DataType */
|
|
|
+ UA_FieldMetaData_init (&pMetaData->fields[0]);
|
|
|
+ UA_NodeId_copy (&UA_TYPES[UA_TYPES_INT64].typeId,
|
|
|
+ &pMetaData->fields[0].dataType);
|
|
|
+ pMetaData->fields[0].builtInType = UA_NS0ID_INT64;
|
|
|
+ pMetaData->fields[0].valueRank = -1; /* scalar */
|
|
|
+ retVal |= UA_Server_addDataSetReader(server, readerGroupTest, &readerConfig,
|
|
|
+ &readerIdentifier);
|
|
|
+ ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
|
|
|
+ /* Add Subscribed Variables */
|
|
|
+ UA_NodeId folderId;
|
|
|
+ UA_NodeId newnodeId;
|
|
|
+ UA_String folderName = readerConfig.dataSetMetaData.name;
|
|
|
+ UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
|
|
|
+ UA_QualifiedName folderBrowseName;
|
|
|
+ if (folderName.length > 0) {
|
|
|
+ oAttr.displayName.locale = UA_STRING ("en-US");
|
|
|
+ oAttr.displayName.text = folderName;
|
|
|
+ folderBrowseName.namespaceIndex = 1;
|
|
|
+ folderBrowseName.name = folderName;
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ oAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Variables");
|
|
|
+ folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
|
|
|
+ }
|
|
|
+
|
|
|
+ retVal = UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, SUBSCRIBEOBJECT_NODEID),
|
|
|
+ UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
|
|
|
+ UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
|
|
|
+ folderBrowseName, UA_NODEID_NUMERIC(0,
|
|
|
+ UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
|
|
|
+ ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
|
|
|
+
|
|
|
+ /* Variable to subscribe data */
|
|
|
+ UA_VariableAttributes vAttr = UA_VariableAttributes_default;
|
|
|
+ vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int64");
|
|
|
+ vAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int64");
|
|
|
+ vAttr.dataType = UA_TYPES[UA_TYPES_INT64].typeId;
|
|
|
+ retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID),
|
|
|
+ UA_NODEID_NUMERIC(1, SUBSCRIBEOBJECT_NODEID),
|
|
|
+ UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), UA_QUALIFIEDNAME(1, "Subscribed Int64"),
|
|
|
+ UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, &newnodeId);
|
|
|
+ ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
|
|
|
+ UA_TargetVariablesDataType targetVars;
|
|
|
+ targetVars.targetVariablesSize = 1;
|
|
|
+ targetVars.targetVariables = (UA_FieldTargetDataType *)
|
|
|
+ UA_calloc(targetVars.targetVariablesSize,
|
|
|
+ sizeof(UA_FieldTargetDataType));
|
|
|
+ /* For creating Targetvariable */
|
|
|
+ UA_FieldTargetDataType_init(&targetVars.targetVariables[0]);
|
|
|
+ targetVars.targetVariables[0].attributeId = UA_ATTRIBUTEID_VALUE;
|
|
|
+ targetVars.targetVariables[0].targetNodeId = newnodeId;
|
|
|
+ retVal |= UA_Server_DataSetReader_createTargetVariables(server, readerIdentifier,
|
|
|
+ &targetVars);
|
|
|
+ ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
|
|
|
+ UA_TargetVariablesDataType_deleteMembers(&targetVars);
|
|
|
+ UA_free(pMetaData->fields);
|
|
|
+ /* run server - publisher and subscriber */
|
|
|
+ UA_Server_run_iterate(server,true);
|
|
|
+
|
|
|
+ /* Read data sent by the Publisher */
|
|
|
+ UA_Variant *publishedNodeData = UA_Variant_new();
|
|
|
+ retVal = UA_Server_readValue(server, UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID), publishedNodeData);
|
|
|
+ ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
|
|
|
+
|
|
|
+ /* Read data received by the Subscriber */
|
|
|
+ UA_Variant *subscribedNodeData = UA_Variant_new();
|
|
|
+ retVal = UA_Server_readValue(server, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID), subscribedNodeData);
|
|
|
+ ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
|
|
|
+
|
|
|
+ /* Check if data sent from Publisher is being received by Subscriber */
|
|
|
+ ck_assert_int_eq(*(UA_Int64 *)publishedNodeData->data, *(UA_Int64 *)subscribedNodeData->data);
|
|
|
+ UA_Variant_delete(subscribedNodeData);
|
|
|
+ UA_Variant_delete(publishedNodeData);
|
|
|
+ } END_TEST
|
|
|
+
|
|
|
int main(void) {
|
|
|
TCase *tc_add_pubsub_readergroup = tcase_create("PubSub readerGroup items handling");
|
|
|
tcase_add_checked_fixture(tc_add_pubsub_readergroup, setup, teardown);
|
|
|
@@ -716,6 +876,7 @@ int main(void) {
|
|
|
tcase_add_checked_fixture(tc_pubsub_publish_subscribe, setup, teardown);
|
|
|
tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribeDateTime);
|
|
|
tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribeInt32);
|
|
|
+ tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribeInt64);
|
|
|
|
|
|
Suite *suite = suite_create("PubSub readerGroups/reader/Fields handling and publishing");
|
|
|
suite_add_tcase(suite, tc_add_pubsub_readergroup);
|
Thangavaila Kalyani Thangaraja