|
@@ -13,11 +13,23 @@
|
|
|
|
|
|
static UA_Server *server = NULL;
|
|
|
static UA_ServerConfig *config = NULL;
|
|
|
+static UA_Session *session = NULL;
|
|
|
+
|
|
|
+static void
|
|
|
+createSession(void) {
|
|
|
+ UA_CreateSessionRequest request;
|
|
|
+ UA_CreateSessionRequest_init(&request);
|
|
|
+ request.requestedSessionTimeout = UA_UINT32_MAX;
|
|
|
+ UA_StatusCode retval = UA_SessionManager_createSession(&server->sessionManager, NULL,
|
|
|
+ &request, &session);
|
|
|
+ ck_assert_uint_eq(retval, 0);
|
|
|
+}
|
|
|
|
|
|
static void setup(void) {
|
|
|
config = UA_ServerConfig_new_default();
|
|
|
server = UA_Server_new(config);
|
|
|
UA_Server_run_startup(server);
|
|
|
+ createSession();
|
|
|
}
|
|
|
|
|
|
static void teardown(void) {
|
|
@@ -31,6 +43,58 @@ static void teardown(void) {
|
|
|
UA_UInt32 subscriptionId;
|
|
|
UA_UInt32 monitoredItemId;
|
|
|
|
|
|
+static void
|
|
|
+createSubscription(void) {
|
|
|
+ UA_CreateSubscriptionRequest request;
|
|
|
+ UA_CreateSubscriptionRequest_init(&request);
|
|
|
+ request.publishingEnabled = true;
|
|
|
+
|
|
|
+ UA_CreateSubscriptionResponse response;
|
|
|
+ UA_CreateSubscriptionResponse_init(&response);
|
|
|
+
|
|
|
+ Service_CreateSubscription(server, session, &request, &response);
|
|
|
+ ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
+ subscriptionId = response.subscriptionId;
|
|
|
+
|
|
|
+ UA_CreateSubscriptionResponse_deleteMembers(&response);
|
|
|
+}
|
|
|
+
|
|
|
+static void
|
|
|
+createMonitoredItem(void) {
|
|
|
+ UA_CreateMonitoredItemsRequest request;
|
|
|
+ UA_CreateMonitoredItemsRequest_init(&request);
|
|
|
+ request.subscriptionId = subscriptionId;
|
|
|
+ request.timestampsToReturn = UA_TIMESTAMPSTORETURN_SERVER;
|
|
|
+ UA_MonitoredItemCreateRequest item;
|
|
|
+ UA_MonitoredItemCreateRequest_init(&item);
|
|
|
+ UA_ReadValueId rvi;
|
|
|
+ UA_ReadValueId_init(&rvi);
|
|
|
+ rvi.nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER);
|
|
|
+ rvi.attributeId = UA_ATTRIBUTEID_BROWSENAME;
|
|
|
+ rvi.indexRange = UA_STRING_NULL;
|
|
|
+ item.itemToMonitor = rvi;
|
|
|
+ item.monitoringMode = UA_MONITORINGMODE_REPORTING;
|
|
|
+ UA_MonitoringParameters params;
|
|
|
+ UA_MonitoringParameters_init(¶ms);
|
|
|
+ item.requestedParameters = params;
|
|
|
+ request.itemsToCreateSize = 1;
|
|
|
+ request.itemsToCreate = &item;
|
|
|
+
|
|
|
+ UA_CreateMonitoredItemsResponse response;
|
|
|
+ UA_CreateMonitoredItemsResponse_init(&response);
|
|
|
+
|
|
|
+ Service_CreateMonitoredItems(server, session, &request, &response);
|
|
|
+ ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
+ ck_assert_uint_eq(response.resultsSize, 1);
|
|
|
+ ck_assert_uint_eq(response.results[0].statusCode, UA_STATUSCODE_GOOD);
|
|
|
+
|
|
|
+ monitoredItemId = response.results[0].monitoredItemId;
|
|
|
+ ck_assert_uint_gt(monitoredItemId, 0);
|
|
|
+
|
|
|
+ UA_MonitoredItemCreateRequest_deleteMembers(&item);
|
|
|
+ UA_CreateMonitoredItemsResponse_deleteMembers(&response);
|
|
|
+}
|
|
|
+
|
|
|
START_TEST(Server_createSubscription) {
|
|
|
/* Create a subscription */
|
|
|
UA_CreateSubscriptionRequest request;
|
|
@@ -40,7 +104,7 @@ START_TEST(Server_createSubscription) {
|
|
|
UA_CreateSubscriptionResponse response;
|
|
|
UA_CreateSubscriptionResponse_init(&response);
|
|
|
|
|
|
- Service_CreateSubscription(server, &server->adminSession, &request, &response);
|
|
|
+ Service_CreateSubscription(server, session, &request, &response);
|
|
|
ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
subscriptionId = response.subscriptionId;
|
|
|
|
|
@@ -49,6 +113,10 @@ START_TEST(Server_createSubscription) {
|
|
|
END_TEST
|
|
|
|
|
|
START_TEST(Server_modifySubscription) {
|
|
|
+ /* Create a subscription */
|
|
|
+ createSubscription();
|
|
|
+
|
|
|
+ /* Modify the subscription */
|
|
|
UA_ModifySubscriptionRequest request;
|
|
|
UA_ModifySubscriptionRequest_init(&request);
|
|
|
request.subscriptionId = subscriptionId;
|
|
@@ -62,7 +130,7 @@ START_TEST(Server_modifySubscription) {
|
|
|
UA_ModifySubscriptionResponse response;
|
|
|
UA_ModifySubscriptionResponse_init(&response);
|
|
|
|
|
|
- Service_ModifySubscription(server, &server->adminSession, &request, &response);
|
|
|
+ Service_ModifySubscription(server, session, &request, &response);
|
|
|
ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
|
|
|
UA_ModifySubscriptionResponse_deleteMembers(&response);
|
|
@@ -70,6 +138,8 @@ START_TEST(Server_modifySubscription) {
|
|
|
END_TEST
|
|
|
|
|
|
START_TEST(Server_setPublishingMode) {
|
|
|
+ createSubscription();
|
|
|
+
|
|
|
UA_SetPublishingModeRequest request;
|
|
|
UA_SetPublishingModeRequest_init(&request);
|
|
|
request.publishingEnabled = UA_TRUE;
|
|
@@ -79,7 +149,7 @@ START_TEST(Server_setPublishingMode) {
|
|
|
UA_SetPublishingModeResponse response;
|
|
|
UA_SetPublishingModeResponse_init(&response);
|
|
|
|
|
|
- Service_SetPublishingMode(server, &server->adminSession, &request, &response);
|
|
|
+ Service_SetPublishingMode(server, session, &request, &response);
|
|
|
ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
ck_assert_uint_eq(response.resultsSize, 1);
|
|
|
ck_assert_uint_eq(response.results[0], UA_STATUSCODE_GOOD);
|
|
@@ -89,6 +159,8 @@ START_TEST(Server_setPublishingMode) {
|
|
|
END_TEST
|
|
|
|
|
|
START_TEST(Server_republish) {
|
|
|
+ createSubscription();
|
|
|
+
|
|
|
UA_RepublishRequest request;
|
|
|
UA_RepublishRequest_init(&request);
|
|
|
request.subscriptionId = subscriptionId;
|
|
@@ -97,7 +169,7 @@ START_TEST(Server_republish) {
|
|
|
UA_RepublishResponse response;
|
|
|
UA_RepublishResponse_init(&response);
|
|
|
|
|
|
- Service_Republish(server, &server->adminSession, &request, &response);
|
|
|
+ Service_Republish(server, session, &request, &response);
|
|
|
ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_BADMESSAGENOTAVAILABLE);
|
|
|
|
|
|
UA_RepublishResponse_deleteMembers(&response);
|
|
@@ -114,7 +186,7 @@ START_TEST(Server_republish_invalid) {
|
|
|
UA_RepublishResponse response;
|
|
|
UA_RepublishResponse_init(&response);
|
|
|
|
|
|
- Service_Republish(server, &server->adminSession, &request, &response);
|
|
|
+ Service_Republish(server, session, &request, &response);
|
|
|
ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID);
|
|
|
|
|
|
UA_RepublishResponse_deleteMembers(&response);
|
|
@@ -122,6 +194,8 @@ START_TEST(Server_republish_invalid) {
|
|
|
END_TEST
|
|
|
|
|
|
START_TEST(Server_deleteSubscription) {
|
|
|
+ createSubscription();
|
|
|
+
|
|
|
/* Remove the subscription */
|
|
|
UA_DeleteSubscriptionsRequest del_request;
|
|
|
UA_DeleteSubscriptionsRequest_init(&del_request);
|
|
@@ -131,7 +205,7 @@ START_TEST(Server_deleteSubscription) {
|
|
|
UA_DeleteSubscriptionsResponse del_response;
|
|
|
UA_DeleteSubscriptionsResponse_init(&del_response);
|
|
|
|
|
|
- Service_DeleteSubscriptions(server, &server->adminSession, &del_request, &del_response);
|
|
|
+ Service_DeleteSubscriptions(server, session, &del_request, &del_response);
|
|
|
ck_assert_uint_eq(del_response.resultsSize, 1);
|
|
|
ck_assert_uint_eq(del_response.results[0], UA_STATUSCODE_GOOD);
|
|
|
|
|
@@ -147,7 +221,7 @@ START_TEST(Server_publishCallback) {
|
|
|
UA_CreateSubscriptionRequest_init(&request);
|
|
|
request.publishingEnabled = true;
|
|
|
UA_CreateSubscriptionResponse_init(&response);
|
|
|
- Service_CreateSubscription(server, &server->adminSession, &request, &response);
|
|
|
+ Service_CreateSubscription(server, session, &request, &response);
|
|
|
ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
UA_UInt32 subscriptionId1 = response.subscriptionId;
|
|
|
UA_CreateSubscriptionResponse_deleteMembers(&response);
|
|
@@ -156,7 +230,7 @@ START_TEST(Server_publishCallback) {
|
|
|
UA_CreateSubscriptionRequest_init(&request);
|
|
|
request.publishingEnabled = true;
|
|
|
UA_CreateSubscriptionResponse_init(&response);
|
|
|
- Service_CreateSubscription(server, &server->adminSession, &request, &response);
|
|
|
+ Service_CreateSubscription(server, session, &request, &response);
|
|
|
ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
UA_UInt32 subscriptionId2 = response.subscriptionId;
|
|
|
UA_Double publishingInterval = response.revisedPublishingInterval;
|
|
@@ -165,7 +239,7 @@ START_TEST(Server_publishCallback) {
|
|
|
|
|
|
/* Keepalive is set to max initially */
|
|
|
UA_Subscription *sub;
|
|
|
- LIST_FOREACH(sub, &server->adminSession.serverSubscriptions, listEntry)
|
|
|
+ LIST_FOREACH(sub, &session->serverSubscriptions, listEntry)
|
|
|
ck_assert_uint_eq(sub->currentKeepAliveCount, sub->maxKeepAliveCount);
|
|
|
|
|
|
/* Sleep until the publishing interval times out */
|
|
@@ -173,7 +247,7 @@ START_TEST(Server_publishCallback) {
|
|
|
UA_Server_run_iterate(server, false);
|
|
|
UA_realSleep(100);
|
|
|
|
|
|
- LIST_FOREACH(sub, &server->adminSession.serverSubscriptions, listEntry) {
|
|
|
+ LIST_FOREACH(sub, &session->serverSubscriptions, listEntry) {
|
|
|
if ((sub->subscriptionId == subscriptionId1) || (sub->subscriptionId == subscriptionId2))
|
|
|
ck_assert_uint_eq(sub->currentKeepAliveCount, sub->maxKeepAliveCount+1);
|
|
|
}
|
|
@@ -188,7 +262,7 @@ START_TEST(Server_publishCallback) {
|
|
|
UA_DeleteSubscriptionsResponse del_response;
|
|
|
UA_DeleteSubscriptionsResponse_init(&del_response);
|
|
|
|
|
|
- Service_DeleteSubscriptions(server, &server->adminSession, &del_request, &del_response);
|
|
|
+ Service_DeleteSubscriptions(server, session, &del_request, &del_response);
|
|
|
ck_assert_uint_eq(del_response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
ck_assert_uint_eq(del_response.resultsSize, 2);
|
|
|
ck_assert_uint_eq(del_response.results[0], UA_STATUSCODE_GOOD);
|
|
@@ -199,42 +273,15 @@ START_TEST(Server_publishCallback) {
|
|
|
END_TEST
|
|
|
|
|
|
START_TEST(Server_createMonitoredItems) {
|
|
|
- UA_CreateMonitoredItemsRequest request;
|
|
|
- UA_CreateMonitoredItemsRequest_init(&request);
|
|
|
- request.subscriptionId = subscriptionId;
|
|
|
- request.timestampsToReturn = UA_TIMESTAMPSTORETURN_SERVER;
|
|
|
- UA_MonitoredItemCreateRequest item;
|
|
|
- UA_MonitoredItemCreateRequest_init(&item);
|
|
|
- UA_ReadValueId rvi;
|
|
|
- UA_ReadValueId_init(&rvi);
|
|
|
- rvi.nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER);
|
|
|
- rvi.attributeId = UA_ATTRIBUTEID_BROWSENAME;
|
|
|
- rvi.indexRange = UA_STRING_NULL;
|
|
|
- item.itemToMonitor = rvi;
|
|
|
- item.monitoringMode = UA_MONITORINGMODE_REPORTING;
|
|
|
- UA_MonitoringParameters params;
|
|
|
- UA_MonitoringParameters_init(¶ms);
|
|
|
- item.requestedParameters = params;
|
|
|
- request.itemsToCreateSize = 1;
|
|
|
- request.itemsToCreate = &item;
|
|
|
-
|
|
|
- UA_CreateMonitoredItemsResponse response;
|
|
|
- UA_CreateMonitoredItemsResponse_init(&response);
|
|
|
-
|
|
|
- Service_CreateMonitoredItems(server, &server->adminSession, &request, &response);
|
|
|
- ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
- ck_assert_uint_eq(response.resultsSize, 1);
|
|
|
- ck_assert_uint_eq(response.results[0].statusCode, UA_STATUSCODE_GOOD);
|
|
|
-
|
|
|
- monitoredItemId = response.results[0].monitoredItemId;
|
|
|
- ck_assert_uint_gt(monitoredItemId, 0);
|
|
|
-
|
|
|
- UA_MonitoredItemCreateRequest_deleteMembers(&item);
|
|
|
- UA_CreateMonitoredItemsResponse_deleteMembers(&response);
|
|
|
+ createSubscription();
|
|
|
+ createMonitoredItem();
|
|
|
}
|
|
|
END_TEST
|
|
|
|
|
|
START_TEST(Server_modifyMonitoredItems) {
|
|
|
+ createSubscription();
|
|
|
+ createMonitoredItem();
|
|
|
+
|
|
|
UA_ModifyMonitoredItemsRequest request;
|
|
|
UA_ModifyMonitoredItemsRequest_init(&request);
|
|
|
request.subscriptionId = subscriptionId;
|
|
@@ -256,7 +303,7 @@ START_TEST(Server_modifyMonitoredItems) {
|
|
|
UA_ModifyMonitoredItemsResponse response;
|
|
|
UA_ModifyMonitoredItemsResponse_init(&response);
|
|
|
|
|
|
- Service_ModifyMonitoredItems(server, &server->adminSession, &request, &response);
|
|
|
+ Service_ModifyMonitoredItems(server, session, &request, &response);
|
|
|
ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
ck_assert_uint_eq(response.resultsSize, 1);
|
|
|
ck_assert_uint_eq(response.results[0].statusCode, UA_STATUSCODE_GOOD);
|
|
@@ -274,7 +321,7 @@ START_TEST(Server_overflow) {
|
|
|
UA_CreateSubscriptionRequest_init(&createSubscriptionRequest);
|
|
|
createSubscriptionRequest.publishingEnabled = true;
|
|
|
UA_CreateSubscriptionResponse_init(&createSubscriptionResponse);
|
|
|
- Service_CreateSubscription(server, &server->adminSession, &createSubscriptionRequest, &createSubscriptionResponse);
|
|
|
+ Service_CreateSubscription(server, session, &createSubscriptionRequest, &createSubscriptionResponse);
|
|
|
ck_assert_uint_eq(createSubscriptionResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
UA_UInt32 localSubscriptionId = createSubscriptionResponse.subscriptionId;
|
|
|
UA_Double publishingInterval = createSubscriptionResponse.revisedPublishingInterval;
|
|
@@ -306,7 +353,7 @@ START_TEST(Server_overflow) {
|
|
|
UA_CreateMonitoredItemsResponse createMonitoredItemsResponse;
|
|
|
UA_CreateMonitoredItemsResponse_init(&createMonitoredItemsResponse);
|
|
|
|
|
|
- Service_CreateMonitoredItems(server, &server->adminSession, &createMonitoredItemsRequest, &createMonitoredItemsResponse);
|
|
|
+ Service_CreateMonitoredItems(server, session, &createMonitoredItemsRequest, &createMonitoredItemsResponse);
|
|
|
ck_assert_uint_eq(createMonitoredItemsResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
ck_assert_uint_eq(createMonitoredItemsResponse.resultsSize, 1);
|
|
|
ck_assert_uint_eq(createMonitoredItemsResponse.results[0].statusCode, UA_STATUSCODE_GOOD);
|
|
@@ -319,7 +366,7 @@ START_TEST(Server_overflow) {
|
|
|
|
|
|
UA_MonitoredItem *mon = NULL;
|
|
|
UA_Subscription *sub;
|
|
|
- LIST_FOREACH(sub, &server->adminSession.serverSubscriptions, listEntry) {
|
|
|
+ LIST_FOREACH(sub, &session->serverSubscriptions, listEntry) {
|
|
|
if(sub->subscriptionId == localSubscriptionId)
|
|
|
mon = UA_Subscription_getMonitoredItem(sub, localMonitoredItemId);
|
|
|
}
|
|
@@ -376,7 +423,7 @@ START_TEST(Server_overflow) {
|
|
|
UA_ModifyMonitoredItemsResponse modifyMonitoredItemsResponse;
|
|
|
UA_ModifyMonitoredItemsResponse_init(&modifyMonitoredItemsResponse);
|
|
|
|
|
|
- Service_ModifyMonitoredItems(server, &server->adminSession, &modifyMonitoredItemsRequest,
|
|
|
+ Service_ModifyMonitoredItems(server, session, &modifyMonitoredItemsRequest,
|
|
|
&modifyMonitoredItemsResponse);
|
|
|
ck_assert_uint_eq(modifyMonitoredItemsResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
ck_assert_uint_eq(modifyMonitoredItemsResponse.resultsSize, 1);
|
|
@@ -406,7 +453,7 @@ START_TEST(Server_overflow) {
|
|
|
|
|
|
UA_ModifyMonitoredItemsResponse_init(&modifyMonitoredItemsResponse);
|
|
|
|
|
|
- Service_ModifyMonitoredItems(server, &server->adminSession, &modifyMonitoredItemsRequest,
|
|
|
+ Service_ModifyMonitoredItems(server, session, &modifyMonitoredItemsRequest,
|
|
|
&modifyMonitoredItemsResponse);
|
|
|
ck_assert_uint_eq(modifyMonitoredItemsResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
ck_assert_uint_eq(modifyMonitoredItemsResponse.resultsSize, 1);
|
|
@@ -435,7 +482,7 @@ START_TEST(Server_overflow) {
|
|
|
|
|
|
UA_ModifyMonitoredItemsResponse_init(&modifyMonitoredItemsResponse);
|
|
|
|
|
|
- Service_ModifyMonitoredItems(server, &server->adminSession, &modifyMonitoredItemsRequest,
|
|
|
+ Service_ModifyMonitoredItems(server, session, &modifyMonitoredItemsRequest,
|
|
|
&modifyMonitoredItemsResponse);
|
|
|
ck_assert_uint_eq(modifyMonitoredItemsResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
ck_assert_uint_eq(modifyMonitoredItemsResponse.resultsSize, 1);
|
|
@@ -460,7 +507,7 @@ START_TEST(Server_overflow) {
|
|
|
UA_DeleteSubscriptionsResponse deleteSubscriptionsResponse;
|
|
|
UA_DeleteSubscriptionsResponse_init(&deleteSubscriptionsResponse);
|
|
|
|
|
|
- Service_DeleteSubscriptions(server, &server->adminSession, &deleteSubscriptionsRequest,
|
|
|
+ Service_DeleteSubscriptions(server, session, &deleteSubscriptionsRequest,
|
|
|
&deleteSubscriptionsResponse);
|
|
|
ck_assert_uint_eq(deleteSubscriptionsResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
ck_assert_uint_eq(deleteSubscriptionsResponse.resultsSize, 1);
|
|
@@ -472,6 +519,9 @@ START_TEST(Server_overflow) {
|
|
|
END_TEST
|
|
|
|
|
|
START_TEST(Server_setMonitoringMode) {
|
|
|
+ createSubscription();
|
|
|
+ createMonitoredItem();
|
|
|
+
|
|
|
UA_SetMonitoringModeRequest request;
|
|
|
UA_SetMonitoringModeRequest_init(&request);
|
|
|
request.subscriptionId = subscriptionId;
|
|
@@ -482,7 +532,7 @@ START_TEST(Server_setMonitoringMode) {
|
|
|
UA_SetMonitoringModeResponse response;
|
|
|
UA_SetMonitoringModeResponse_init(&response);
|
|
|
|
|
|
- Service_SetMonitoringMode(server, &server->adminSession, &request, &response);
|
|
|
+ Service_SetMonitoringMode(server, session, &request, &response);
|
|
|
ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
ck_assert_uint_eq(response.resultsSize, 1);
|
|
|
ck_assert_uint_eq(response.results[0], UA_STATUSCODE_GOOD);
|
|
@@ -492,6 +542,9 @@ START_TEST(Server_setMonitoringMode) {
|
|
|
END_TEST
|
|
|
|
|
|
START_TEST(Server_deleteMonitoredItems) {
|
|
|
+ createSubscription();
|
|
|
+ createMonitoredItem();
|
|
|
+
|
|
|
UA_DeleteMonitoredItemsRequest request;
|
|
|
UA_DeleteMonitoredItemsRequest_init(&request);
|
|
|
request.subscriptionId = subscriptionId;
|
|
@@ -501,7 +554,7 @@ START_TEST(Server_deleteMonitoredItems) {
|
|
|
UA_DeleteMonitoredItemsResponse response;
|
|
|
UA_DeleteMonitoredItemsResponse_init(&response);
|
|
|
|
|
|
- Service_DeleteMonitoredItems(server, &server->adminSession, &request, &response);
|
|
|
+ Service_DeleteMonitoredItems(server, session, &request, &response);
|
|
|
ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
ck_assert_uint_eq(response.resultsSize, 1);
|
|
|
ck_assert_uint_eq(response.results[0], UA_STATUSCODE_GOOD);
|
|
@@ -520,7 +573,7 @@ START_TEST(Server_lifeTimeCount) {
|
|
|
request.requestedLifetimeCount = 3;
|
|
|
request.requestedMaxKeepAliveCount = 1;
|
|
|
UA_CreateSubscriptionResponse_init(&response);
|
|
|
- Service_CreateSubscription(server, &server->adminSession, &request, &response);
|
|
|
+ Service_CreateSubscription(server, session, &request, &response);
|
|
|
ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
ck_assert_uint_eq(response.revisedMaxKeepAliveCount, 1);
|
|
|
ck_assert_uint_eq(response.revisedLifetimeCount, 3);
|
|
@@ -532,7 +585,7 @@ START_TEST(Server_lifeTimeCount) {
|
|
|
request.requestedLifetimeCount = 4;
|
|
|
request.requestedMaxKeepAliveCount = 2;
|
|
|
UA_CreateSubscriptionResponse_init(&response);
|
|
|
- Service_CreateSubscription(server, &server->adminSession, &request, &response);
|
|
|
+ Service_CreateSubscription(server, session, &request, &response);
|
|
|
ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
ck_assert_uint_eq(response.revisedMaxKeepAliveCount, 2);
|
|
|
/* revisedLifetimeCount is revised to 3*MaxKeepAliveCount == 3 */
|
|
@@ -565,7 +618,7 @@ START_TEST(Server_lifeTimeCount) {
|
|
|
|
|
|
UA_CreateMonitoredItemsResponse mresponse;
|
|
|
UA_CreateMonitoredItemsResponse_init(&mresponse);
|
|
|
- Service_CreateMonitoredItems(server, &server->adminSession, &mrequest, &mresponse);
|
|
|
+ Service_CreateMonitoredItems(server, session, &mrequest, &mresponse);
|
|
|
ck_assert_uint_eq(mresponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
|
|
|
ck_assert_uint_eq(mresponse.resultsSize, 1);
|
|
|
ck_assert_uint_eq(mresponse.results[0].statusCode, UA_STATUSCODE_GOOD);
|
|
@@ -577,7 +630,7 @@ START_TEST(Server_lifeTimeCount) {
|
|
|
UA_Server_run_iterate(server, false);
|
|
|
UA_UInt32 count = 0;
|
|
|
UA_Subscription *sub;
|
|
|
- LIST_FOREACH(sub, &server->adminSession.serverSubscriptions, listEntry) {
|
|
|
+ LIST_FOREACH(sub, &session->serverSubscriptions, listEntry) {
|
|
|
ck_assert_uint_eq(sub->currentLifetimeCount, 0);
|
|
|
count++;
|
|
|
}
|
|
@@ -587,7 +640,7 @@ START_TEST(Server_lifeTimeCount) {
|
|
|
UA_Server_run_iterate(server, false);
|
|
|
|
|
|
count = 0;
|
|
|
- LIST_FOREACH(sub, &server->adminSession.serverSubscriptions, listEntry) {
|
|
|
+ LIST_FOREACH(sub, &session->serverSubscriptions, listEntry) {
|
|
|
ck_assert_uint_eq(sub->currentLifetimeCount, 1);
|
|
|
count++;
|
|
|
}
|
|
@@ -598,7 +651,7 @@ START_TEST(Server_lifeTimeCount) {
|
|
|
UA_Server_run_iterate(server, false);
|
|
|
|
|
|
count = 0;
|
|
|
- LIST_FOREACH(sub, &server->adminSession.serverSubscriptions, listEntry) {
|
|
|
+ LIST_FOREACH(sub, &session->serverSubscriptions, listEntry) {
|
|
|
ck_assert_uint_eq(sub->currentLifetimeCount, 2);
|
|
|
count++;
|
|
|
}
|
|
@@ -609,7 +662,7 @@ START_TEST(Server_lifeTimeCount) {
|
|
|
UA_Server_run_iterate(server, false);
|
|
|
|
|
|
count = 0;
|
|
|
- LIST_FOREACH(sub, &server->adminSession.serverSubscriptions, listEntry) {
|
|
|
+ LIST_FOREACH(sub, &session->serverSubscriptions, listEntry) {
|
|
|
ck_assert_uint_eq(sub->currentLifetimeCount, 3);
|
|
|
count++;
|
|
|
}
|
|
@@ -620,7 +673,7 @@ START_TEST(Server_lifeTimeCount) {
|
|
|
UA_Server_run_iterate(server, false);
|
|
|
|
|
|
count = 0;
|
|
|
- LIST_FOREACH(sub, &server->adminSession.serverSubscriptions, listEntry) {
|
|
|
+ LIST_FOREACH(sub, &session->serverSubscriptions, listEntry) {
|
|
|
ck_assert_uint_eq(sub->currentLifetimeCount, 4);
|
|
|
count++;
|
|
|
}
|
|
@@ -631,7 +684,7 @@ START_TEST(Server_lifeTimeCount) {
|
|
|
UA_Server_run_iterate(server, false);
|
|
|
|
|
|
count = 0;
|
|
|
- LIST_FOREACH(sub, &server->adminSession.serverSubscriptions, listEntry) {
|
|
|
+ LIST_FOREACH(sub, &session->serverSubscriptions, listEntry) {
|
|
|
ck_assert_uint_eq(sub->currentLifetimeCount, 5);
|
|
|
count++;
|
|
|
}
|
|
@@ -642,7 +695,7 @@ START_TEST(Server_lifeTimeCount) {
|
|
|
UA_Server_run_iterate(server, false);
|
|
|
|
|
|
count = 0;
|
|
|
- LIST_FOREACH(sub, &server->adminSession.serverSubscriptions, listEntry) {
|
|
|
+ LIST_FOREACH(sub, &session->serverSubscriptions, listEntry) {
|
|
|
ck_assert_uint_eq(sub->currentLifetimeCount, 6);
|
|
|
count++;
|
|
|
}
|
|
@@ -654,7 +707,7 @@ START_TEST(Server_lifeTimeCount) {
|
|
|
UA_Server_run_iterate(server, false);
|
|
|
|
|
|
count = 0;
|
|
|
- LIST_FOREACH(sub, &server->adminSession.serverSubscriptions, listEntry) {
|
|
|
+ LIST_FOREACH(sub, &session->serverSubscriptions, listEntry) {
|
|
|
count++;
|
|
|
}
|
|
|
ck_assert_uint_eq(count, 0);
|