---
opensaf.spec.in | 1 +
src/evt/Makefile.am | 17 ++
src/evt/apitest/Makefile | 20 +++
src/evt/apitest/evttest.c | 44 +++++
src/evt/apitest/tet_eda.c | 335 +++++++++++++++++++++++-------------
src/evt/apitest/tet_eda.h | 22 ++-
src/evt/apitest/tet_edsv_func.c | 54 ++----
src/evt/apitest/tet_edsv_util.c | 201 +++++++++++++++++++++-
src/evt/apitest/tet_edsv_wrappers.c | 62 ++++++-
9 files changed, 579 insertions(+), 177 deletions(-)
create mode 100644 src/evt/apitest/Makefile
create mode 100644 src/evt/apitest/evttest.c
diff --git a/opensaf.spec.in b/opensaf.spec.in
index 5ae2070..b7c37d9 100644
--- a/opensaf.spec.in
+++ b/opensaf.spec.in
@@ -1533,6 +1533,7 @@ fi
%{_bindir}/clmtest
%{_bindir}/mdstest
%{_bindir}/amftest
+%{_bindir}/evttest
%if %is_ais_smf
#SMF: Demo and test of CCB handling
%{_bindir}/ccbdemo_create
diff --git a/src/evt/Makefile.am b/src/evt/Makefile.am
index 0c36ea6..819bab8 100644
--- a/src/evt/Makefile.am
+++ b/src/evt/Makefile.am
@@ -137,9 +137,26 @@ bin_osafevtd_LDADD = \
if ENABLE_TESTS
+bin_evttest_CPPFLAGS = \
+ $(AM_CPPFLAGS)
+
+bin_PROGRAMS += bin/evttest
+
noinst_HEADERS += \
src/evt/apitest/tet_eda.h
+bin_evttest_SOURCES = \
+ src/evt/apitest/tet_edsv_wrappers.c \
+ src/evt/apitest/tet_eda.c \
+ src/evt/apitest/tet_edsv_func.c \
+ src/evt/apitest/tet_edsv_util.c \
+ src/evt/apitest/evttest.c
+
+bin_evttest_LDADD = \
+ lib/libSaEvt.la \
+ lib/libopensaf_core.la \
+ lib/libapitest.la
+
endif
endif
diff --git a/src/evt/apitest/Makefile b/src/evt/apitest/Makefile
new file mode 100644
index 0000000..561fe8b
--- /dev/null
+++ b/src/evt/apitest/Makefile
@@ -0,0 +1,20 @@
+# -*- OpenSAF -*-
+#
+#(C) Copyright 2017 The OpenSAF Foundation
+#
+#This program is distributed in the hope that it will be useful, but
+#WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#or FITNESS FOR A PARTICULAR PURPOSE. This file and program are licensed
+#under the GNU Lesser General Public License Version 2.1, February 1999.
+#The complete license can be accessed from the following location:
+#http://opensource.org/licenses/lgpl-license.php
+#See the Copying file included with the OpenSAF distribution for full
+# licensing terms.
+#
+# Author(s): High Availability Solutions
+#
+#
+
+all:
+ $(MAKE) -C ../../.. bin/evttest
+
diff --git a/src/evt/apitest/evttest.c b/src/evt/apitest/evttest.c
new file mode 100644
index 0000000..180539a
--- /dev/null
+++ b/src/evt/apitest/evttest.c
@@ -0,0 +1,44 @@
+/* -*- OpenSAF -*-
+ *
+ * (C) Copyright 2017 The OpenSAF Foundation
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. This file and program are licensed
+ * under the GNU Lesser General Public License Version 2.1, February 1999.
+ * The complete license can be accessed from the following location:
+ * http://opensource.org/licenses/lgpl-license.php
+ * See the Copying file included with the OpenSAF distribution for full
+ * licensing terms.
+ *
+ * Author(s): High Availability Solutions
+ *
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include "osaf/apitest/utest.h"
+#include "osaf/apitest/util.h"
+
+int main(int argc, char **argv)
+{
+ int suite = ALL_SUITES, tcase = ALL_TESTS;
+
+ srandom(getpid());
+
+ if (argc > 1) {
+ suite = atoi(argv[1]);
+ }
+
+ if (argc > 2) {
+ tcase = atoi(argv[2]);
+ }
+
+ if (suite == 0) {
+ test_list();
+ return 0;
+ }
+
+ return test_run(suite, tcase);
+}
+
diff --git a/src/evt/apitest/tet_eda.c b/src/evt/apitest/tet_eda.c
index bfd9d2e..7629cb9 100644
--- a/src/evt/apitest/tet_eda.c
+++ b/src/evt/apitest/tet_eda.c
@@ -1,13 +1,28 @@
+#include <stdio.h>
#include <string.h>
-#include "tet_api.h"
-#include "tet_startup.h"
#include "tet_eda.h"
+#include "osaf/apitest/utest.h"
+#define m_NCS_TASK_RELEASE(t_handle) ncs_task_release(t_handle)
void tet_edsv_startup(void);
void tet_edsv_cleanup(void);
extern int gl_sync_pointnum;
extern int fill_syncparameters(int);
extern int maa_switch(int);
+
+uint32_t ncs_task_release(void *task_handle)
+{
+ NCS_OS_TASK task;
+ memset(&task, 0, sizeof(task));
+
+ if (task_handle == NULL)
+ return NCSCC_RC_SUCCESS;
+
+ task.info.release.i_handle = task_handle;
+
+ return m_NCS_OS_TASK(&task, NCS_OS_TASK_RELEASE);
+}
+
/*Initializing Global Varibles*/
int gl_jCount = 0;
int gl_err = 1;
@@ -55,6 +70,7 @@ void tet_saEvtInitializeCases(int iOption)
gl_rc = saEvtInitialize(NULL, &gl_evtCallbacks, &gl_version);
result("saEvtInitialize() with NULL event handle",
SA_AIS_ERR_INVALID_PARAM);
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
break;
case 2:
@@ -65,7 +81,7 @@ void tet_saEvtInitializeCases(int iOption)
gl_rc = saEvtInitialize(&gl_evtHandle, NULL, &gl_version);
result("saEvtInitialize() with NULL pointer to callbacks",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -94,7 +110,7 @@ void tet_saEvtInitializeCases(int iOption)
result(
"saEvtInitialize() with uninitialized pointer to callbacks",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -111,7 +127,7 @@ void tet_saEvtInitializeCases(int iOption)
"saEvtInitialize() with NULL saEvtChannelOpenCallback and
NULL \
saEvtEventDeliverCallback",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -126,7 +142,7 @@ void tet_saEvtInitializeCases(int iOption)
&gl_version);
result("saEvtInitialize() with NULL saEvtChannelOpenCallback",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -141,7 +157,7 @@ void tet_saEvtInitializeCases(int iOption)
&gl_version);
result("saEvtInitialize() with NULL saEvtEventDeliverCallback",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -152,6 +168,7 @@ void tet_saEvtInitializeCases(int iOption)
gl_rc = saEvtInitialize(&gl_evtHandle, &gl_evtCallbacks, NULL);
result("saEvtInitialize() with NULL version",
SA_AIS_ERR_INVALID_PARAM);
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
break;
case 9:
@@ -169,6 +186,7 @@ void tet_saEvtInitializeCases(int iOption)
tet_printf("Version Delivered : %c %d %d",
gl_version.releaseCode, gl_version.majorVersion,
gl_version.minorVersion);
+ rc_validate(gl_rc, SA_AIS_ERR_VERSION);
break;
case 10:
@@ -186,6 +204,7 @@ void tet_saEvtInitializeCases(int iOption)
tet_printf("Version Delivered : %c %d %d",
gl_version.releaseCode, gl_version.majorVersion,
gl_version.minorVersion);
+ rc_validate(gl_rc, SA_AIS_ERR_VERSION);
break;
case 11:
@@ -207,7 +226,8 @@ void tet_saEvtInitializeCases(int iOption)
#if 0
tet_saEvtFinalize(&gl_evtHandle);
#endif
- break;
+ rc_validate(gl_rc, SA_AIS_OK);
+ break;
case 12:
gl_version.releaseCode = 'B';
@@ -221,6 +241,7 @@ void tet_saEvtInitializeCases(int iOption)
result("saEvtInitialize() with major version set to 3",
SA_AIS_OK);
+ rc_validate(gl_rc, SA_AIS_OK);
#if 0
tet_saEvtFinalize(&gl_evtHandle);
#endif
@@ -244,6 +265,7 @@ void tet_saEvtInitializeCases(int iOption)
gl_version.releaseCode, gl_version.majorVersion,
gl_version.minorVersion);
+ rc_validate(gl_rc, SA_AIS_ERR_VERSION);
#if 0
tet_saEvtFinalize(&gl_evtHandle);
#endif
@@ -253,6 +275,7 @@ void tet_saEvtInitializeCases(int iOption)
var_initialize();
tet_saEvtInitialize(&gl_evtHandle);
tet_saEvtFinalize(&gl_evtHandle);
+ rc_validate(gl_rc, SA_AIS_OK);
break;
case 15:
@@ -261,6 +284,7 @@ void tet_saEvtInitializeCases(int iOption)
var_initialize();
tet_saEvtInitialize(&gl_evtHandle);
tet_saEvtFinalize(&gl_evtHandle);
+ rc_validate(gl_rc, SA_AIS_OK);
break;
case 16:
@@ -281,7 +305,7 @@ void tet_saEvtInitializeCases(int iOption)
tet_printf("Version Delivered : %c %d %d",
gl_version.releaseCode, gl_version.majorVersion,
gl_version.minorVersion);
-
+ rc_validate(gl_rc, SA_AIS_ERR_UNAVAILABLE);
break;
}
printf("\n-------------------- END : %d ------------------------",
@@ -294,7 +318,7 @@ void tet_Initialize(void)
var_initialize();
tet_saEvtInitialize(&gl_evtHandle);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtFinalize(&gl_evtHandle);
printf("\n------------ END -----------\n");
}
@@ -312,6 +336,7 @@ void tet_saEvtSelectionObjectGetCases(int iOption)
&gl_selObject);
result("saEvtSelectionObjectGet() with NULL event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 2:
@@ -321,12 +346,14 @@ void tet_saEvtSelectionObjectGetCases(int iOption)
result(
"saEvtSelectionObjectGet() with uninitialized event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 3:
gl_rc = saEvtSelectionObjectGet(-123, &gl_selObject);
result("saEvtSelectionObjectGet() with garbage event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 4:
@@ -339,7 +366,7 @@ void tet_saEvtSelectionObjectGetCases(int iOption)
result(
"saEvtSelectionObjectGet() with NULL event callbacks
handle",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -354,7 +381,7 @@ void tet_saEvtSelectionObjectGetCases(int iOption)
"saEvtSelectionObjectGet() with NULL
saEvtChannelOpenCallback \
event handle",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -369,7 +396,7 @@ event handle",
"saEvtSelectionObjectGet() with NULL
saEvtEventDeliverCallback \
event handle",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -380,7 +407,7 @@ event handle",
gl_rc = saEvtSelectionObjectGet(gl_evtHandle, NULL);
result("saEvtSelectionObjectGet() with NULL selection object",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -388,13 +415,14 @@ event handle",
var_initialize();
tet_saEvtInitialize(&gl_evtHandle);
- gl_rc = saEvtSelectionObjectGet((SaEvtHandleT)(long)NULL,
- (SaSelectionObjectT)(long)NULL);
+
+ gl_rc = (saEvtSelectionObjectGet((SaEvtHandleT)(long)NULL,
+ NULL));
result(
"saEvtSelectionObjectGet() with NULL event handle and NULL \
selection object",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -403,7 +431,7 @@ selection object",
tet_saEvtInitialize(&gl_evtHandle);
tet_saEvtSelectionObjectGet(&gl_evtHandle, &gl_selObject);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtFinalize(&gl_evtHandle);
break;
}
@@ -440,6 +468,7 @@ void tet_saEvtDispatchCases(int iOption)
saEvtDispatch((SaEvtHandleT)(long)NULL, SA_DISPATCH_ONE);
result("saEvtDispatch() with NULL event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 2:
@@ -448,12 +477,14 @@ void tet_saEvtDispatchCases(int iOption)
gl_rc = saEvtDispatch(gl_evtHandle, SA_DISPATCH_ONE);
result("saEvtDispatch() with uninitialized event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 3:
gl_rc = saEvtDispatch(123, SA_DISPATCH_ONE);
result("saEvtDispatch() with garbage event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 4:
@@ -463,7 +494,7 @@ void tet_saEvtDispatchCases(int iOption)
gl_rc = saEvtDispatch(gl_evtHandle, 0);
result("saEvtDispatch() with uninitialized dispatch flags",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -475,7 +506,7 @@ void tet_saEvtDispatchCases(int iOption)
result(
"saEvtDispatch() with dispatch flags set to garbage
value(24)",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -488,7 +519,7 @@ void tet_saEvtDispatchCases(int iOption)
result(
"saEvtDispatch() with dispatch flags set to DISPATCH_ALL",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -501,7 +532,7 @@ void tet_saEvtDispatchCases(int iOption)
result(
"saEvtDispatch() with dispatch flags set to DISPATCH_ALL",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -575,6 +606,7 @@ void tet_saEvtFinalizeCases(int iOption)
gl_rc = saEvtFinalize((SaEvtHandleT)(long)NULL);
result("saEvtFinalize() with NULL event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 2:
@@ -583,12 +615,14 @@ void tet_saEvtFinalizeCases(int iOption)
gl_rc = saEvtFinalize(gl_evtHandle);
result("saEvtFinalize() with uninitialized event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 3:
gl_rc = saEvtFinalize(123);
result("saEvtFinalize() with garbage value",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 4:
@@ -596,7 +630,7 @@ void tet_saEvtFinalizeCases(int iOption)
tet_saEvtInitialize(&gl_evtHandle);
tet_saEvtFinalize(&gl_evtHandle);
-
+ rc_validate(gl_rc, SA_AIS_OK);
break;
}
printf("\n-------------------- END : %d ------------------------",
@@ -629,6 +663,7 @@ void tet_saEvtChannelOpenCases(int iOption)
gl_timeout, &gl_channelHandle);
result("saEvtChannelOpen() with NULL event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 2:
@@ -639,6 +674,7 @@ void tet_saEvtChannelOpenCases(int iOption)
&gl_channelHandle);
result("saEvtChannelOpen() with uninitialized event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 3:
@@ -647,6 +683,7 @@ void tet_saEvtChannelOpenCases(int iOption)
&gl_channelHandle);
result("saEvtChannelOpen() with garbage event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 4:
@@ -664,6 +701,7 @@ void tet_saEvtChannelOpenCases(int iOption)
&gl_channelHandle);
result("saEvtChannelOpen() with NULL event callbacks",
SA_AIS_OK);
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -682,7 +720,7 @@ void tet_saEvtChannelOpenCases(int iOption)
gl_timeout, &gl_channelHandle);
result("saEvtChannelOpen() with NULL channel name",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -695,7 +733,7 @@ void tet_saEvtChannelOpenCases(int iOption)
&gl_channelHandle);
result("saEvtChannelOpen() with uninitialized channel name",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -708,7 +746,7 @@ void tet_saEvtChannelOpenCases(int iOption)
gl_timeout, &gl_channelHandle);
result("saEvtChannelOpen() with NULL channel open flags",
SA_AIS_ERR_BAD_FLAGS);
-
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_FLAGS);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -723,7 +761,7 @@ void tet_saEvtChannelOpenCases(int iOption)
result(
"saEvtChannelOpen() with uninitialized channel open flags",
SA_AIS_ERR_BAD_FLAGS);
-
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_FLAGS);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -735,7 +773,7 @@ void tet_saEvtChannelOpenCases(int iOption)
gl_timeout, &gl_channelHandle);
result("saEvtChannelOpen() with garbage channel open flags(24)",
SA_AIS_ERR_BAD_FLAGS);
-
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_FLAGS);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -750,7 +788,7 @@ void tet_saEvtChannelOpenCases(int iOption)
"saEvtChannelOpen() with SA_EVT_CHANNEL_PUBLISHER before
channel\
name(Test) is given",
SA_AIS_ERR_NOT_EXIST);
-
+ rc_validate(gl_rc, SA_AIS_ERR_NOT_EXIST);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -765,7 +803,7 @@ void tet_saEvtChannelOpenCases(int iOption)
"saEvtChannelOpen() with SA_EVT_CHANNEL_SUBSCRIBER before
channel\
name(Test) is given",
SA_AIS_ERR_NOT_EXIST);
-
+ rc_validate(gl_rc, SA_AIS_ERR_NOT_EXIST);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -778,7 +816,7 @@ void tet_saEvtChannelOpenCases(int iOption)
(SaTimeT)(long)NULL, &gl_channelHandle);
result("saEvtChannelOpen() with NULL timeout",
SA_AIS_ERR_TIMEOUT);
-
+ rc_validate(gl_rc, SA_AIS_ERR_TIMEOUT);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -791,7 +829,7 @@ void tet_saEvtChannelOpenCases(int iOption)
&gl_channelHandle);
result("saEvtChannelOpen() with negative timeout",
SA_AIS_ERR_TIMEOUT);
-
+ rc_validate(gl_rc, SA_AIS_ERR_TIMEOUT);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -803,7 +841,7 @@ void tet_saEvtChannelOpenCases(int iOption)
SA_EVT_CHANNEL_CREATE, 999999999,
&gl_channelHandle);
result("saEvtChannelOpen() with large timeout", SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -820,7 +858,7 @@ void tet_saEvtChannelOpenCases(int iOption)
SA_EVT_CHANNEL_CREATE, gl_timeout, NULL);
result("saEvtChannelOpen() with NULL channel handle",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -1121,6 +1159,7 @@ void tet_saEvtChannelOpenAsyncCases(int iOption)
SA_EVT_CHANNEL_CREATE);
result("saEvtChannelOpenAsync() with NULL event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 2:
@@ -1132,6 +1171,7 @@ void tet_saEvtChannelOpenAsyncCases(int iOption)
result(
"saEvtChannelOpenAsync() with uninitialized event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 3:
@@ -1140,6 +1180,7 @@ void tet_saEvtChannelOpenAsyncCases(int iOption)
SA_EVT_CHANNEL_CREATE);
result("saEvtChannelOpenAsync() with garbage event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 4:
@@ -1154,7 +1195,7 @@ void tet_saEvtChannelOpenAsyncCases(int iOption)
SA_EVT_CHANNEL_CREATE);
result("saEvtChannelOpenAsync() with NULL event callbacks",
SA_AIS_ERR_INIT);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INIT);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -1171,7 +1212,7 @@ void tet_saEvtChannelOpenAsyncCases(int iOption)
result(
"saEvtChannelOpenAsync() with NULL channel open callback",
SA_AIS_ERR_INIT);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INIT);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -1190,7 +1231,7 @@ void tet_saEvtChannelOpenAsyncCases(int iOption)
SA_AIS_OK);
thread_creation(&gl_evtHandle);
DISPATCH_SLEEP();
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtChannelClose(&gl_channelHandle);
gl_channelName = asyncchannelName;
@@ -1210,7 +1251,7 @@ void tet_saEvtChannelOpenAsyncCases(int iOption)
"saEvtChannelOpenAsync() with SA_EVT_CHANNEL_PUBLISHER on
async\
channel name(Temp)",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
thread_creation(&gl_evtHandle);
DISPATCH_SLEEP();
@@ -1230,7 +1271,7 @@ void tet_saEvtChannelOpenAsyncCases(int iOption)
SA_AIS_OK);
thread_creation(&gl_evtHandle);
DISPATCH_SLEEP();
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -1245,7 +1286,7 @@ void tet_saEvtChannelOpenAsyncCases(int iOption)
SA_AIS_OK);
thread_creation(&gl_evtHandle);
DISPATCH_SLEEP();
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtChannelClose(&gl_channelHandle);
gl_channelName = asyncchannelName;
@@ -1265,7 +1306,7 @@ void tet_saEvtChannelOpenAsyncCases(int iOption)
SA_AIS_OK);
thread_creation(&gl_evtHandle);
DISPATCH_SLEEP();
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtChannelClose(&gl_channelHandle);
gl_channelName = asyncchannelName;
@@ -1285,7 +1326,7 @@ void tet_saEvtChannelOpenAsyncCases(int iOption)
SA_AIS_OK);
thread_creation(&gl_evtHandle);
DISPATCH_SLEEP();
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtChannelClose(&gl_channelHandle);
gl_channelName = asyncchannelName;
@@ -1305,7 +1346,7 @@ void tet_saEvtChannelOpenAsyncCases(int iOption)
SA_AIS_OK);
thread_creation(&gl_evtHandle);
DISPATCH_SLEEP();
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtChannelClose(&gl_channelHandle);
gl_channelName = asyncchannelName;
@@ -1322,7 +1363,7 @@ void tet_saEvtChannelOpenAsyncCases(int iOption)
SA_EVT_CHANNEL_CREATE);
result("saEvtChannelOpenAsync() with NULL channel name",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -1336,7 +1377,7 @@ void tet_saEvtChannelOpenAsyncCases(int iOption)
result(
"saEvtChannelOpenAsync() with uninitialized channel name",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -1349,7 +1390,7 @@ void tet_saEvtChannelOpenAsyncCases(int iOption)
(SaEvtChannelOpenFlagsT)(long)NULL);
result("saEvtChannelOpenAsync() with NULL channel open flags",
SA_AIS_ERR_BAD_FLAGS);
-
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_FLAGS);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -1364,7 +1405,7 @@ void tet_saEvtChannelOpenAsyncCases(int iOption)
result(
"saEvtChannelOpenAsync() with uninitialized channel open
flags",
SA_AIS_ERR_BAD_FLAGS);
-
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_FLAGS);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -1377,7 +1418,7 @@ void tet_saEvtChannelOpenAsyncCases(int iOption)
result(
"saEvtChannelOpenAsync() with garbage channel open
flags(24)",
SA_AIS_ERR_BAD_FLAGS);
-
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_FLAGS);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -1474,6 +1515,7 @@ void tet_saEvtChannelCloseCases(int iOption)
gl_rc = saEvtChannelClose((SaEvtChannelHandleT)(long)NULL);
result("saEvtChannelClose() with NULL channel handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 2:
@@ -1482,12 +1524,14 @@ void tet_saEvtChannelCloseCases(int iOption)
gl_rc = saEvtChannelClose(gl_channelHandle);
result("saEvtChannelClose() with uninitialized channel handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 3:
gl_rc = saEvtChannelClose(123);
result("saEvtChannelClose() with garbage channel handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 4:
@@ -1540,6 +1584,7 @@ void tet_saEvtChannelUnlinkCases(int iOption)
&gl_channelName);
result("saEvtChannelUnlink() with NULL event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 2:
@@ -1548,12 +1593,14 @@ void tet_saEvtChannelUnlinkCases(int iOption)
gl_rc = saEvtChannelUnlink(gl_evtHandle, &gl_channelName);
result("saEvtChannelUnlink() with uninitialized event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 3:
gl_rc = saEvtChannelUnlink(123, &gl_channelName);
result("saEvtChannelUnlink() with garbage event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 4:
@@ -1565,7 +1612,7 @@ void tet_saEvtChannelUnlinkCases(int iOption)
gl_rc = saEvtChannelUnlink(gl_evtHandle, NULL);
result("saEvtChannelUnlink() with NULL channel name",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -1581,7 +1628,7 @@ void tet_saEvtChannelUnlinkCases(int iOption)
gl_rc = saEvtChannelUnlink(gl_evtHandle, &emptyName);
result("saEvtChannelUnlink() with uninitialized channel name",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -1597,7 +1644,7 @@ void tet_saEvtChannelUnlinkCases(int iOption)
gl_rc = saEvtChannelUnlink(gl_evtHandle, &tempName);
result("saEvtChannelUnlink() with channel name no event",
SA_AIS_ERR_NOT_EXIST);
-
+ rc_validate(gl_rc, SA_AIS_ERR_NOT_EXIST);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -1631,7 +1678,7 @@ void tet_saEvtChannelUnlinkCases(int iOption)
result(
"saEvtChannelUnlink() with channel name (News) duplicate
check",
SA_AIS_ERR_NOT_EXIST);
-
+ rc_validate(gl_rc, SA_AIS_ERR_NOT_EXIST);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -1688,6 +1735,7 @@ void tet_saEvtEventAllocateCases(int iOption)
&gl_eventHandle);
result("saEvtEventAllocate() with NULL channel handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 2:
@@ -1696,12 +1744,14 @@ void tet_saEvtEventAllocateCases(int iOption)
gl_rc = saEvtEventAllocate(gl_channelHandle, &gl_eventHandle);
result("saEvtEventAllocate() with uninitialized channel handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 3:
gl_rc = saEvtEventAllocate(123, &gl_eventHandle);
result("saEvtEventAllocate() with garbage channel handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 4:
@@ -1715,7 +1765,7 @@ void tet_saEvtEventAllocateCases(int iOption)
gl_rc = saEvtEventAllocate(gl_channelHandle, NULL);
result("saEvtEventAllocate() with NULL event handle",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -1735,7 +1785,7 @@ void tet_saEvtEventAllocateCases(int iOption)
result(
"saEvtEventAllocate() with channel open sync for
subscriber",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -1754,7 +1804,7 @@ void tet_saEvtEventAllocateCases(int iOption)
gl_rc = saEvtEventAllocate(gl_channelHandle, &gl_eventHandle);
result("saEvtEventAllocate() with channel opened with create",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -1820,6 +1870,7 @@ void tet_saEvtEventFreeCases(int iOption)
gl_rc = saEvtEventFree((SaEvtEventHandleT)(long)NULL);
result("saEvtEventFree() with NULL event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 2:
@@ -1828,12 +1879,14 @@ void tet_saEvtEventFreeCases(int iOption)
gl_rc = saEvtEventFree(gl_eventHandle);
result("saEvtEventFree() with uninitialized event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 3:
gl_rc = saEvtEventFree(123);
result("saEvtEventFree() with garbage event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 4:
@@ -1852,7 +1905,7 @@ void tet_saEvtEventFreeCases(int iOption)
gl_rc = saEvtEventFree(gl_eventHandle);
result("saEvtEventFree() with channel closed", SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtChannelClose(&localChannelHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -1897,7 +1950,7 @@ void tet_saEvtEventFreeCases(int iOption)
gl_rc = saEvtEventFree(gl_eventHandle);
result("saEvtEventFree() with channel closed",
SA_AIS_ERR_BAD_HANDLE);
-
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
tet_saEvtChannelUnlink(&gl_evtHandle);
tet_saEvtFinalize(&gl_evtHandle);
@@ -1951,6 +2004,7 @@ void tet_saEvtEventAttributesGetCases(int iOption)
&gl_publishTime, &gl_evtId);
result("saEvtEventAttributesGet() with NULL event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -1966,6 +2020,7 @@ void tet_saEvtEventAttributesGetCases(int iOption)
result(
"saEvtEventAttributesGet() with uninitialized event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -1977,6 +2032,7 @@ void tet_saEvtEventAttributesGetCases(int iOption)
&gl_publisherName, &gl_publishTime, &gl_evtId);
result("saEvtEventAttributesGet() with garbage event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -1995,7 +2051,7 @@ void tet_saEvtEventAttributesGetCases(int iOption)
&gl_publisherName, &gl_publishTime, &gl_evtId);
result("saEvtEventAttributesGet() with NULL pattern array",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2022,7 +2078,7 @@ void tet_saEvtEventAttributesGetCases(int iOption)
&gl_evtId);
result("saEvtEventAttributesGet() with empty pattern array",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2047,7 +2103,7 @@ void tet_saEvtEventAttributesGetCases(int iOption)
&gl_publisherName, &gl_publishTime, &gl_evtId);
result("saEvtEventAttributesGet() with NULL priority",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2075,7 +2131,7 @@ void tet_saEvtEventAttributesGetCases(int iOption)
&gl_evtId);
result("saEvtEventAttributesGet() with uninitialized priority",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2101,7 +2157,7 @@ void tet_saEvtEventAttributesGetCases(int iOption)
&gl_publisherName, &gl_publishTime, &gl_evtId);
result("saEvtEventAttributesGet() with NULL retention time",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2130,7 +2186,7 @@ void tet_saEvtEventAttributesGetCases(int iOption)
result(
"saEvtEventAttributesGet() with uninitialized retention
time",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2156,7 +2212,7 @@ void tet_saEvtEventAttributesGetCases(int iOption)
&gl_retentionTime, NULL, &gl_publishTime, &gl_evtId);
result("saEvtEventAttributesGet() with NULL publisher name",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2182,7 +2238,7 @@ void tet_saEvtEventAttributesGetCases(int iOption)
&gl_retentionTime, &gl_publisherName, NULL, &gl_evtId);
result("saEvtEventAttributesGet() with NULL publish time",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2209,7 +2265,7 @@ void tet_saEvtEventAttributesGetCases(int iOption)
NULL);
result("saEvtEventAttributesGet() with NULL event id",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2251,7 +2307,7 @@ void tet_saEvtEventAttributesGetCases(int iOption)
result(
"saEvtEventAttributesGet() with pattern size greater than
256",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2316,6 +2372,7 @@ void tet_saEvtEventAttributesGetCases(int iOption)
result(
"saEvtEventAttributesGet() with pattern size greater than
256",
SA_AIS_OK);
+ rc_validate(gl_rc, SA_AIS_OK);
temp->patterns = NULL;
gl_rc = saEvtEventPatternFree(gl_eventHandle, temp->patterns);
result("saEvtEventPatternsFree() with NULL patterns",
@@ -2361,6 +2418,7 @@ void tet_saEvtEventAttributesGetCases(int iOption)
result(
"saEvtEventAttributesGet() with pattern size greater than
256",
SA_AIS_OK);
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
gl_rc = saEvtEventPatternFree(gl_eventHandle, temp->patterns);
result(
@@ -2406,6 +2464,7 @@ void tet_saEvtEventAttributesGetCases(int iOption)
result(
"saEvtEventAttributesGet() with pattern size greater than
256",
SA_AIS_OK);
+ rc_validate(gl_rc, SA_AIS_OK);
gl_rc = saEvtEventPatternFree(gl_eventHandle, temp->patterns);
result("saEvtEventPatternsFree() Success Case", SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
@@ -2473,6 +2532,7 @@ void tet_saEvtEventAttributesSetCases(int iOption)
gl_priority, gl_retentionTime, &gl_publisherName);
result("saEvtEventAttributesSet() with NULL event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -2487,6 +2547,7 @@ void tet_saEvtEventAttributesSetCases(int iOption)
result(
"saEvtEventAttributesSet() with uninitialized event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -2498,6 +2559,7 @@ void tet_saEvtEventAttributesSetCases(int iOption)
&gl_publisherName);
result("saEvtEventAttributesSet() with garbage event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -2516,7 +2578,7 @@ void tet_saEvtEventAttributesSetCases(int iOption)
&gl_publisherName);
result("saEvtEventAttributesSet() with NULL pattern array",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2544,7 +2606,7 @@ void tet_saEvtEventAttributesSetCases(int iOption)
result(
"saEvtEventAttributesSet() with uninitialized pattern
array",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2572,7 +2634,7 @@ void tet_saEvtEventAttributesSetCases(int iOption)
&gl_publisherName);
result("saEvtEventAttributesSet() with NULL priority",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2597,7 +2659,7 @@ void tet_saEvtEventAttributesSetCases(int iOption)
&gl_publisherName);
result("saEvtEventAttributesSet() with garbage priority",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2624,7 +2686,7 @@ void tet_saEvtEventAttributesSetCases(int iOption)
(SaTimeT)(long)NULL, &gl_publisherName);
result("saEvtEventAttributesSet() with NULL retention time",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2651,7 +2713,7 @@ void tet_saEvtEventAttributesSetCases(int iOption)
256, &gl_publisherName);
result("saEvtEventAttributesSet() with garbage retention time",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2678,7 +2740,7 @@ void tet_saEvtEventAttributesSetCases(int iOption)
gl_retentionTime, NULL);
result("saEvtEventAttributesSet() with NULL publisher name",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2703,7 +2765,7 @@ void tet_saEvtEventAttributesSetCases(int iOption)
gl_retentionTime, &emptyName);
result("saEvtEventAttributesSet() with empty publisher name",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2730,7 +2792,7 @@ void tet_saEvtEventAttributesSetCases(int iOption)
"saEvtEventAttributesSet() with publisher name length
greater \
than max length",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2758,7 +2820,7 @@ than max length",
result(
"saEvtEventAttributesSet() with channel open subscriber
case",
SA_AIS_ERR_ACCESS);
-
+ rc_validate(gl_rc, SA_AIS_ERR_ACCESS);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2786,7 +2848,7 @@ than max length",
result(
"saEvtEventAttributesSet() with channel open with create",
SA_AIS_ERR_ACCESS);
-
+ rc_validate(gl_rc, SA_AIS_ERR_ACCESS);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2814,7 +2876,7 @@ than max length",
result(
"saEvtEventAttributesSet() with pattern size greater than
256",
SA_AIS_ERR_TOO_BIG);
-
+ rc_validate(gl_rc, SA_AIS_ERR_TOO_BIG);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -2844,7 +2906,7 @@ than max length",
gl_retentionTime, &gl_publisherName);
result("saEvtEventAttributesSet() with channel closed",
SA_AIS_ERR_BAD_HANDLE);
-
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
tet_saEvtChannelUnlink(&gl_evtHandle);
tet_saEvtFinalize(&gl_evtHandle);
@@ -2925,6 +2987,7 @@ void tet_saEvtEventDataGetCases(int iOption)
&gl_eventData, &gl_eventDataSize);
result("saEvtEventDataGet() with NULL event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -2937,6 +3000,7 @@ void tet_saEvtEventDataGetCases(int iOption)
&gl_eventDataSize);
result("saEvtEventDataGet() with uninitialized event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -2947,6 +3011,7 @@ void tet_saEvtEventDataGetCases(int iOption)
saEvtEventDataGet(123, &gl_eventData, &gl_eventDataSize);
result("saEvtEventDataGet() with garbage event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
tet_saEvtFinalize(&gl_evtHandle);
break;
@@ -3111,6 +3176,7 @@ void tet_saEvtEventDataGetCases(int iOption)
result(
"saEvtEventDataGet() with event data size > length than
allowed",
SA_AIS_ERR_NO_SPACE);
+ rc_validate(gl_rc, SA_AIS_ERR_NO_SPACE);
gl_eventDataSize = 20;
tet_saEvtEventRetentionTimeClear(&gl_channelHandle, &gl_evtId);
@@ -3149,7 +3215,7 @@ void tet_saEvtEventDataGetCases(int iOption)
&gl_eventDataSize);
result("saEvtEventDataGet() with channel when published",
SA_AIS_ERR_BAD_HANDLE);
-
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
tet_saEvtEventRetentionTimeClear(&gl_channelHandle, &gl_evtId);
tet_saEvtEventFree(&gl_eventHandle);
@@ -3197,6 +3263,7 @@ void tet_saEvtEventDataGetCases(int iOption)
&gl_eventDataSize);
result("saEvtEventDataGet() with no memory",
SA_AIS_ERR_NO_SPACE);
+ rc_validate(gl_rc, SA_AIS_ERR_NO_SPACE);
gl_eventDataSize = 20;
tet_saEvtEventRetentionTimeClear(&gl_channelHandle, &gl_evtId);
@@ -3375,6 +3442,7 @@ void tet_saEvtEventPublishCases(int iOption)
&gl_evtId);
result("saEvtEventPublish() with NULL event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 2:
@@ -3384,6 +3452,7 @@ void tet_saEvtEventPublishCases(int iOption)
gl_eventDataSize, &gl_evtId);
result("saEvtEventPublish() with uninitialized event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 3:
@@ -3391,6 +3460,7 @@ void tet_saEvtEventPublishCases(int iOption)
&gl_evtId);
result("saEvtEventPublish() with garbage event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 4:
@@ -3413,7 +3483,7 @@ void tet_saEvtEventPublishCases(int iOption)
gl_rc = saEvtEventPublish(gl_eventHandle, NULL,
gl_eventDataSize, &gl_evtId);
result("saEvtEventPublish() with NULL event data", SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -3444,7 +3514,7 @@ void tet_saEvtEventPublishCases(int iOption)
gl_rc = saEvtEventPublish(gl_eventHandle, &gl_eventData,
gl_eventDataSize, &gl_evtId);
result("saEvtEventPublish() with empty event data", SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -3475,7 +3545,7 @@ void tet_saEvtEventPublishCases(int iOption)
(SaSizeT)(long)NULL, &gl_evtId);
result("saEvtEventPublish() with NULL event data size",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -3507,7 +3577,7 @@ void tet_saEvtEventPublishCases(int iOption)
gl_eventDataSize, &gl_evtId);
result("saEvtEventPublish() with 0 event data size", SA_AIS_OK);
gl_eventDataSize = 20;
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -3538,7 +3608,7 @@ void tet_saEvtEventPublishCases(int iOption)
gl_eventDataSize, NULL);
result("saEvtEventPublish() with NULL event id",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -3568,7 +3638,7 @@ void tet_saEvtEventPublishCases(int iOption)
gl_eventDataSize, &gl_evtId);
result("saEvtEventPublish() with channel opened with create",
SA_AIS_ERR_ACCESS);
-
+ rc_validate(gl_rc, SA_AIS_ERR_ACCESS);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -3601,7 +3671,7 @@ array",
gl_eventDataSize, &gl_evtId);
result("saEvtEventPublish() with NULL pattern array",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -3633,6 +3703,7 @@ array",
gl_eventDataSize, &gl_evtId);
result("saEvtEventPublish() with max event data size",
SA_AIS_ERR_TOO_BIG);
+ rc_validate(gl_rc, SA_AIS_ERR_TOO_BIG);
gl_eventDataSize = 20;
tet_saEvtEventFree(&gl_eventHandle);
@@ -3695,7 +3766,7 @@ array",
result(
"saEvtEventPublish() with channel opened with subscribe
access",
SA_AIS_ERR_ACCESS);
-
+ rc_validate(gl_rc, SA_AIS_ERR_ACCESS);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -3756,6 +3827,7 @@ void tet_saEvtEventSubscribeCases(int iOption)
&gl_filterArray, gl_subscriptionId);
result("saEvtEventSubscribe() with NULL channel Handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 2:
@@ -3765,6 +3837,7 @@ void tet_saEvtEventSubscribeCases(int iOption)
gl_subscriptionId);
result("saEvtEventSubscribe() with empty channel handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 3:
@@ -3772,6 +3845,7 @@ void tet_saEvtEventSubscribeCases(int iOption)
gl_subscriptionId);
result("saEvtEventSubscribe() with garbage channel handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 4:
@@ -3791,7 +3865,7 @@ void tet_saEvtEventSubscribeCases(int iOption)
gl_subscriptionId);
result("saEvtEventSubscribe() with NULL event callbacks",
SA_AIS_ERR_INIT);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INIT);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -3811,7 +3885,7 @@ void tet_saEvtEventSubscribeCases(int iOption)
gl_subscriptionId);
result("saEvtEventSubscribe() with NULL filter Array",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -3833,7 +3907,7 @@ void tet_saEvtEventSubscribeCases(int iOption)
gl_subscriptionId);
result("saEvtEventSubscribe() with empty filter array",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -3856,7 +3930,7 @@ void tet_saEvtEventSubscribeCases(int iOption)
(SaEvtSubscriptionIdT)(long)NULL);
result("saEvtEventSubscribe() with NULL subscription id",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -3878,7 +3952,7 @@ void tet_saEvtEventSubscribeCases(int iOption)
saEvtEventSubscribe(gl_channelHandle, &gl_filterArray, 0);
result("saEvtEventSubscribe() with 0 subscriptionId",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -3900,7 +3974,7 @@ void tet_saEvtEventSubscribeCases(int iOption)
saEvtEventSubscribe(gl_channelHandle, &gl_filterArray, 1);
result("saEvtEventSubscribe() with garbage subscription id",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -3920,7 +3994,7 @@ void tet_saEvtEventSubscribeCases(int iOption)
result(
"saEvtEventSubscribe() with channel not opened for
subscriber",
SA_AIS_ERR_ACCESS);
-
+ rc_validate(gl_rc, SA_AIS_ERR_ACCESS);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -3942,7 +4016,7 @@ void tet_saEvtEventSubscribeCases(int iOption)
gl_subscriptionId);
result("saEvtEventSubscribe() with big filters number",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -3963,14 +4037,14 @@ void tet_saEvtEventSubscribeCases(int iOption)
gl_rc = saEvtEventSubscribe(gl_channelHandle, &gl_filterArray,
gl_subscriptionId);
result("saEvtEventSubscribe() invoked", SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
gl_filterArray.filtersNumber = 2;
gl_filterArray.filters = duplicate;
gl_rc = saEvtEventSubscribe(gl_channelHandle, &gl_filterArray,
gl_subscriptionId);
result("saEvtEventSubscribe() with duplicate subscription",
SA_AIS_ERR_EXIST);
-
+ rc_validate(gl_rc, SA_AIS_ERR_EXIST);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -4090,6 +4164,7 @@ void tet_saEvtEventUnsubscribeCases(int iOption)
gl_subscriptionId);
result("saEvtEventUnsubscribe() with NULL gl_channelHandle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 2:
@@ -4100,12 +4175,14 @@ void tet_saEvtEventUnsubscribeCases(int iOption)
saEvtEventUnsubscribe(gl_channelHandle, gl_subscriptionId);
result("saEvtEventUnsubscribe() with empty channel handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 3:
gl_rc = saEvtEventUnsubscribe(123, gl_subscriptionId);
result("saEvtEventUnsubscribe() with garbage channel handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 4:
@@ -4124,7 +4201,7 @@ void tet_saEvtEventUnsubscribeCases(int iOption)
(SaEvtSubscriptionIdT)(long)NULL);
result("saEvtEventUnsubscribe() with NULL subscription id",
SA_AIS_ERR_NOT_EXIST);
-
+ rc_validate(gl_rc, SA_AIS_ERR_EXIST);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -4148,7 +4225,7 @@ void tet_saEvtEventUnsubscribeCases(int iOption)
gl_rc = saEvtEventUnsubscribe(gl_channelHandle, 0);
result("saEvtEventUnsubscribe() with 0 subscription id",
SA_AIS_OK);
-
+ rc_validate(gl_rc, SA_AIS_OK);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -4171,7 +4248,7 @@ void tet_saEvtEventUnsubscribeCases(int iOption)
gl_rc = saEvtEventUnsubscribe(gl_channelHandle, 123);
result("saEvtEventUnsubscribe() with garbage subscription id",
SA_AIS_ERR_NOT_EXIST);
-
+ rc_validate(gl_rc, SA_AIS_ERR_NOT_EXIST);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -4198,7 +4275,7 @@ void tet_saEvtEventUnsubscribeCases(int iOption)
"saEvtEventUnsubscribe() with differnt channel handle for \
different subscription id",
SA_AIS_ERR_NOT_EXIST);
-
+ rc_validate(gl_rc, SA_AIS_ERR_NOT_EXIST);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -4278,6 +4355,7 @@ void tet_saEvtEventRetentionTimeClearCases(int iOption)
result(
"saEvtEventRetentionTimeClear() with NULL channel handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 2:
@@ -4289,6 +4367,7 @@ void tet_saEvtEventRetentionTimeClearCases(int iOption)
result(
"saEvtEventRetentionTimeClear() with empty channel handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 3:
@@ -4298,6 +4377,7 @@ void tet_saEvtEventRetentionTimeClearCases(int iOption)
result(
"saEvtEventRetentionTimeClear() with garbage channel
handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 4:
@@ -4313,7 +4393,7 @@ void tet_saEvtEventRetentionTimeClearCases(int iOption)
result(
"saEvtEventRetentionTimeClear() with different channel
handle",
SA_AIS_ERR_NOT_EXIST);
-
+ rc_validate(gl_rc, SA_AIS_ERR_NOT_EXIST);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -4333,7 +4413,7 @@ void tet_saEvtEventRetentionTimeClearCases(int iOption)
(SaEvtEventIdT)(long)NULL);
result("saEvtEventRetentionTimeClear() with NULL evt id",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -4352,7 +4432,7 @@ void tet_saEvtEventRetentionTimeClearCases(int iOption)
gl_rc = saEvtEventRetentionTimeClear(gl_channelHandle, 1234);
result("saEvtEventRetentionTimeClear() with garbage evt id",
SA_AIS_ERR_NOT_EXIST);
-
+ rc_validate(gl_rc, SA_AIS_ERR_NOT_EXIST);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -4394,7 +4474,7 @@ void tet_saEvtEventRetentionTimeClearCases(int iOption)
"saEvtEventRetentionTimeClear() with different event id
than\
published",
SA_AIS_ERR_NOT_EXIST);
-
+ rc_validate(gl_rc, SA_AIS_ERR_NOT_EXIST);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtEventFree(&eventTempHandle);
@@ -4435,7 +4515,7 @@ void tet_saEvtEventRetentionTimeClearCases(int iOption)
"saEvtEventRetentionTimeClear() with different event
id(1-1000)\
for channel handle",
SA_AIS_ERR_INVALID_PARAM);
-
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -4470,7 +4550,7 @@ void tet_saEvtEventRetentionTimeClearCases(int iOption)
"saEvtEventRetentionTimeClear() with 0 retention time when \
published",
SA_AIS_ERR_NOT_EXIST);
-
+ rc_validate(gl_rc, SA_AIS_ERR_NOT_EXIST);
tet_saEvtEventFree(&gl_eventHandle);
tet_saEvtChannelClose(&gl_channelHandle);
@@ -4538,7 +4618,7 @@ published",
result(
"saEvtEventRetentionTimeClear() with event free already
invoked",
SA_AIS_ERR_NOT_EXIST);
-
+ rc_validate(gl_rc, SA_AIS_ERR_NOT_EXIST);
tet_saEvtChannelClose(&gl_channelHandle);
tet_saEvtChannelUnlink(&gl_evtHandle);
@@ -4648,6 +4728,7 @@ void tet_saEvtLimitGetCases(int iOption)
gl_rc = saEvtLimitGet(gl_evtHandle, gl_limitId, NULL);
result("saEvtLimitGet() with NULL LimitValue",
SA_AIS_ERR_INVALID_PARAM);
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
break;
case 2:
@@ -4656,6 +4737,7 @@ void tet_saEvtLimitGetCases(int iOption)
&gl_limitValue);
result("saEvtLimitGet() with NULL event handle",
SA_AIS_ERR_BAD_HANDLE);
+ rc_validate(gl_rc, SA_AIS_ERR_BAD_HANDLE);
break;
case 3:
@@ -4666,6 +4748,7 @@ void tet_saEvtLimitGetCases(int iOption)
gl_rc = saEvtLimitGet(gl_evtHandle, gl_limitId, &gl_limitValue);
result("saEvtLimitGet() with biggerlimitId value",
SA_AIS_ERR_INVALID_PARAM);
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
break;
case 4:
@@ -4676,6 +4759,7 @@ void tet_saEvtLimitGetCases(int iOption)
gl_rc = saEvtLimitGet(gl_evtHandle, gl_limitId, &gl_limitValue);
result("saEvtLimitGet() with zero limitId value",
SA_AIS_ERR_INVALID_PARAM);
+ rc_validate(gl_rc, SA_AIS_ERR_INVALID_PARAM);
break;
case 5:
@@ -4686,7 +4770,8 @@ void tet_saEvtLimitGetCases(int iOption)
gl_rc = saEvtLimitGet(gl_evtHandle, gl_limitId, &gl_limitValue);
result("saEvtLimitGet() with limitId = Max Number of Channels",
SA_AIS_OK);
- tet_printf("MaxNumChannels Limit Receieved = %ld",
+ rc_validate(gl_rc, SA_AIS_OK);
+ tet_printf("MaxNumChannels Limit Receieved = %lld",
gl_limitValue.uint64Value);
break;
@@ -4698,7 +4783,8 @@ void tet_saEvtLimitGetCases(int iOption)
gl_rc = saEvtLimitGet(gl_evtHandle, gl_limitId, &gl_limitValue);
result("saEvtLimitGet() with limitId = Max Event Size",
SA_AIS_OK);
- tet_printf("MaxEventSizeLimit Receieved = %ld",
+ rc_validate(gl_rc, SA_AIS_OK);
+ tet_printf("MaxEventSizeLimit Receieved = %lld",
gl_limitValue.uint64Value);
break;
@@ -4710,7 +4796,8 @@ void tet_saEvtLimitGetCases(int iOption)
gl_rc = saEvtLimitGet(gl_evtHandle, gl_limitId, &gl_limitValue);
result("saEvtLimitGet() with limitId = Max Pattern Size",
SA_AIS_OK);
- tet_printf("MaxPatternSizeLimit Receieved = %ld",
+ rc_validate(gl_rc, SA_AIS_OK);
+ tet_printf("MaxPatternSizeLimit Receieved = %lld",
gl_limitValue.uint64Value);
break;
@@ -4722,7 +4809,8 @@ void tet_saEvtLimitGetCases(int iOption)
gl_rc = saEvtLimitGet(gl_evtHandle, gl_limitId, &gl_limitValue);
result("saEvtLimitGet() with limitId = Max Num Patterns",
SA_AIS_OK);
- tet_printf("MaxNumPatterns Limit Receieved = %ld",
+ rc_validate(gl_rc, SA_AIS_OK);
+ tet_printf("MaxNumPatterns Limit Receieved = %lld",
gl_limitValue.uint64Value);
break;
@@ -4735,7 +4823,8 @@ void tet_saEvtLimitGetCases(int iOption)
result(
"saEvtLimitGet() with limitId = Max RetentionTime Duration",
SA_AIS_OK);
- tet_printf("MaxRetentionTime Duration Limit Receieved = %ld",
+ rc_validate(gl_rc, SA_AIS_OK);
+ tet_printf("MaxRetentionTime Duration Limit Receieved = %lld",
gl_limitValue.timeValue);
break;
} /* End Switch */
@@ -4926,13 +5015,14 @@ void gl_defs()
temp = (char *)getenv("TET_CHANNEL_NAME");
if (temp) {
gl_struct.channelName.length = strlen(temp);
- strcpy(gl_struct.channelName.value, temp);
+ strcpy((char *)gl_struct.channelName.value, temp);
} else {
gl_struct.channelName.length = 12;
- strcpy(gl_struct.channelName.value, "tempChannel");
+ strcpy((char *)gl_struct.channelName.value, "tempChannel");
}
gl_channelName.length = gl_struct.channelName.length;
- strcpy(gl_channelName.value, gl_struct.channelName.value);
+ strcpy((char *)gl_channelName.value, \
+ (char *)gl_struct.channelName.value);
printf("\nChannel Name: ");
while (length < gl_channelName.length) {
printf("%c", gl_channelName.value[length]);
@@ -4942,14 +5032,15 @@ void gl_defs()
temp = (char *)getenv("TET_PUBLISHER_NAME");
if (temp) {
gl_struct.publisherName.length = strlen(temp);
- strcpy(gl_struct.publisherName.value, temp);
+ strcpy((char *)gl_struct.publisherName.value, temp);
} else {
gl_struct.publisherName.length = 9;
- strcpy(gl_struct.publisherName.value, "Anonymous");
+ strcpy((char *)gl_struct.publisherName.value, "Anonymous");
}
- memset(gl_publisherName.value, '\0', sizeof(SaNameT));
+ memset(&gl_publisherName, '\0', sizeof(SaNameT));
gl_publisherName.length = gl_struct.publisherName.length;
- strcpy(gl_publisherName.value, gl_struct.publisherName.value);
+ strcpy((char *)gl_publisherName.value, \
+ (char *)gl_struct.publisherName.value);
printf("\nPublisher Name: ");
length = 0;
while (length < gl_publisherName.length) {
diff --git a/src/evt/apitest/tet_eda.h b/src/evt/apitest/tet_eda.h
index e2f021d..6091459 100644
--- a/src/evt/apitest/tet_eda.h
+++ b/src/evt/apitest/tet_eda.h
@@ -19,16 +19,29 @@
/*******Global Declarations*******/
#include <saEvt.h>
-#include <ncs_lib.h>
-
+#include "base/ncs_main_papi.h"
+#include "base/ncs_lib.h"
#define gl_red 0
-
+#define tet_printf printf
+#define TET_PASS 0
+#define TET_FAIL 1
+#define TET_UNRESOLVED 2
+#define tet_infoline printf
#define WHILE_TRY_AGAIN(rc) \
while ((rc == SA_AIS_ERR_TRY_AGAIN) || (rc == SA_AIS_ERR_TIMEOUT))
#define RETRY_SLEEP sleep(3)
#define MAX_NUM_TRY_AGAINS 12
#define DISPATCH_SLEEP() sleep_for_dispatch()
+#if FULL_LOG
+#define m_TEST_CPSV_PRINTF printf
+#else
+#define m_TEST_CPSV_PRINTF(...)
+#endif
+
+#define TET_EDSV_NODE1 3
+
+void tet_result(int result);
int gl_act;
int gl_tNode1, gl_tNode2, gl_tNode3, gl_node_id, gl_jCount, gl_allocatedNumber,
@@ -72,7 +85,6 @@ struct gl_list {
};
NCSCONTEXT eda_thread_handle, subscription_handle;
-#define TET_EDSV_NODE1 3
/*******String Constants*******/
const char *gl_saf_error[32];
@@ -117,7 +129,7 @@ void tet_saEvtEventRetentionTimeClear(SaEvtChannelHandleT
*, SaEvtEventIdT *);
void result(char *, SaAisErrorT);
void resultSuccess(char *, SaAisErrorT);
-uint32_t tet_create_task(NCS_OS_CB);
+extern uint32_t tet_create_task(NCS_OS_CB);
void tet_run_edsv_app(void);
void gl_defs(void);
diff --git a/src/evt/apitest/tet_edsv_func.c b/src/evt/apitest/tet_edsv_func.c
index e282afc..18a17c3 100644
--- a/src/evt/apitest/tet_edsv_func.c
+++ b/src/evt/apitest/tet_edsv_func.c
@@ -1,8 +1,6 @@
#include <string.h>
-#include "tet_api.h"
-#include "tet_startup.h"
+#include <stdio.h>
#include "tet_eda.h"
-
extern int gl_sync_pointnum;
extern int fill_syncparameters(int);
extern int gl_jCount;
@@ -19,12 +17,21 @@ int gl_b03_flag = 0;
/*******Channel Open Functionality*******/
+void tet_result(int result)
+{
+ if (result == TET_PASS) {
+ m_TEST_CPSV_PRINTF("\n ##### TEST CASE SUCCEEDED #####\n\n");
+ } else if (result == TET_FAIL) {
+ m_TEST_CPSV_PRINTF("\n ##### TEST CASE FAILED #####\n\n");
+ } else if (result == TET_UNRESOLVED) {
+ m_TEST_CPSV_PRINTF("\n ##### TEST CASE UNRESOLVED #####\n\n");
+ }
+}
+
void tet_ChannelOpen_SingleEvtHandle()
/* Channel Open with same event handle single instance */
/* Subscriber(3) - Publisher */
{
- char *tempData;
- SaSizeT tempDataSize;
SaEvtChannelHandleT tempChannelHandle;
SaEvtEventFilterT duplicate[2] = {{3, {5, 5, (SaUint8T *)"Hello"}},
{3, {4, 4, (SaUint8T *)"Moto"}}};
@@ -119,7 +126,6 @@ void tet_ChannelOpen_SingleEvtHandle_SamePatterns()
/* Subscriber(3) - Publisher - Subscriber(3) - Subscribe(4) */
{
SaEvtChannelHandleT pubChannelHandle, subChannelHandle;
- char *tempData;
SaSizeT tempDataSize;
int iCmpCount = 0;
@@ -241,7 +247,6 @@ void tet_ChannelOpen_SingleEvtHandle_DifferentPatterns()
{
SaEvtEventFilterT duplicate[2] = {{3, {5, 5, (SaUint8T *)"Hello"}},
{3, {4, 4, (SaUint8T *)"Moto"}}};
- char *tempData;
SaEvtChannelHandleT pubChannelHandle, subChannelHandle;
SaSizeT tempDataSize;
@@ -363,8 +368,6 @@ void tet_ChannelOpen_MultipleEvtHandle()
/* Channel Open with multiple event handles */
/* Subscriber(I1,3) - Publisher(I2)*/
{
- char *tempData;
- SaSizeT tempDataSize;
SaEvtHandleT tempEvtHandle, temp1EvtHandle;
SaEvtChannelHandleT tempChannelHandle;
@@ -467,8 +470,6 @@ void tet_ChannelOpen_MultipleEvtHandle_SamePatterns()
/* Channel Open with multiple event handles mulitple instance same patterns*/
/* Subscriber(I1,3) - Publisher(I2) - Subscriber(I1,4) */
{
- char *tempData;
- SaSizeT tempDataSize;
int iCmpCount = 0;
@@ -594,8 +595,6 @@ void tet_ChannelOpen_MultipleEvtHandle_DifferentPatterns()
{
SaEvtEventFilterT duplicate[2] = {{3, {5, 5, (SaUint8T *)"Hello"}},
{3, {4, 4, (SaUint8T *)"Moto"}}};
- char *tempData;
- SaSizeT tempDataSize;
SaEvtHandleT tempEvtHandle, localEvtHandle;
SaEvtChannelHandleT tempChannelHandle;
@@ -784,7 +783,6 @@ void tet_ChannelClose_Simple() /* Channel Close simple
case */
printf("\n\n*************Case 8: Channel Close*************");
tet_printf(" F:8: Close an Opened Event Channel");
- char *tempData;
SaSizeT tempDataSize;
var_initialize();
@@ -1219,7 +1217,6 @@ void tet_AttributesGet_ReceivedEvent()
/* Attributes Get for a received event */
{
int iCmpCount = 0;
- char *tempData;
SaSizeT tempDataSize;
printf(
"\n\n********Case 14: Attributes Get for recevied event**********");
@@ -1310,7 +1307,6 @@ void tet_PatternFree_ReceivedEvent()
/* Patternfree for a received event */
{
int iCmpCount = 0;
- char *tempData;
SaSizeT tempDataSize;
tet_printf(" PatternsFree for a Received Event");
gl_b03_flag = 1;
@@ -1468,7 +1464,6 @@ void tet_EventSubscribe_PrefixFilter()
/* Event Subscribe with prefix filter */
{
SaEvtEventFilterT prefixFilter[1] = {{1, {3, 3, (SaUint8T *)"Hel"}}};
- char *tempData;
SaSizeT tempDataSize;
int iCmpCount = 0;
@@ -1561,7 +1556,6 @@ void tet_EventSubscribe_SuffixFilter()
{
SaEvtEventFilterT suffixFilter[1] = {{2, {3, 3, (SaUint8T *)"llo"}}};
- char *tempData;
SaSizeT tempDataSize;
int iCmpCount = 0;
@@ -1651,7 +1645,6 @@ subscribe suffix filter");
void tet_EventSubscribe_ExactFilter() /* Event Subscribe with exact filter */
{
- char *tempData;
SaSizeT tempDataSize;
int iCmpCount = 0;
@@ -1741,10 +1734,9 @@ void tet_EventSubscribe_AllPassFilter() /* Event
Subscribe with all pass \
{
SaEvtEventFilterT allPassFilter[1] = {{4, {1, 1, (SaUint8T *)"A"}}};
- char *tempData;
SaSizeT tempDataSize;
- int iCmpCount;
+ int iCmpCount = 0;
printf(
"\n\n*******Case 19: Event Subscribe with all pass
filter*********");
@@ -1828,7 +1820,6 @@ subscribe all pass filter");
void tet_EventSubscribe_LessFilters()
/* Event Subscribe with less filters than patterns */
{
- char *tempData;
SaSizeT tempDataSize;
int iCmpCount = 0;
@@ -1922,7 +1913,6 @@ void tet_EventSubscribe_LessPatterns()
SaEvtEventPatternT patternL[1] = {
{5, 5, (SaUint8T *)"Hello"},
};
- char *tempData;
SaSizeT tempDataSize;
int iCmpCount = 0;
@@ -2017,7 +2007,6 @@ void tet_EventSubscribe_LessPatterns_FilterSize()
SaEvtEventPatternT patternL[1] = {
{5, 5, (SaUint8T *)"Hello"},
};
- char *tempData;
SaSizeT tempDataSize;
int iCmpCount = 0;
@@ -2108,7 +2097,6 @@ void tet_EventSubscribe_LessFilters_DifferentOrder()
/* Event Subscribe with less filters than patterns in different order */
{
SaEvtEventFilterT filterDup[1] = {{3, {4, 4, (SaUint8T *)"Hell"}}};
- char *tempData;
SaSizeT tempDataSize;
int iCmpCount = 0;
@@ -2200,7 +2188,6 @@ filters");
void tet_EventSubscribe_PatternMatch_DifferentSubscriptions()
/* Event Subscribe with pattern match for different subscriptions*/
{
- char *tempData;
SaSizeT tempDataSize;
int iCmpCount = 0;
@@ -2303,7 +2290,6 @@ and Filters match Published Patterns");
void tet_ChannelOpenAsync_Simple() /* Channel Open Async Cases */
{
- char *tempData;
SaSizeT tempDataSize;
int iCmpCount = 0;
@@ -2393,7 +2379,6 @@ void tet_EventSubscribe_multipleFilters()
/* Event Subscribe with mutliple filters with patternsize lessthan filtersize*/
{
int iCmpCount = 0;
- char *tempData;
SaSizeT tempDataSize;
SaEvtEventPatternT multiplePattern[5] = {
@@ -2718,7 +2703,6 @@ match*************");
void tet_EventSubscribe_DiffFilterTypes()
/* Event Subscribe with different filter types */
{
- char *tempData;
SaSizeT tempDataSize;
int iCmpCount = 0;
@@ -3088,7 +3072,6 @@ void tet_Same_Subscriber_Publisher_DiffChannel()
/* Same publisher and subscriber for different channels */
{
int iCmpCount;
- char *tempData;
SaSizeT tempDataSize;
SaEvtChannelHandleT tempChannelHandle;
SaEvtEventFilterT duplicate[2] = {
@@ -3184,7 +3167,6 @@ void tet_Sync_Async_Subscriber_Publisher()
/* Sync and Async channel for subscriber and publisher */
{
int iCmpCount = 0;
- char *tempData;
SaSizeT tempDataSize;
SaEvtChannelHandleT tempChannelHandle;
@@ -3279,7 +3261,6 @@ void tet_Sync_Async_Subscriber_Publisher()
void tet_Event_Subscriber_Unsubscriber() /* Event subscribe and unsubscribe */
{
int iCmpCount = 0;
- char *tempData;
SaSizeT tempDataSize;
SaEvtEventIdT tempId;
printf(
@@ -3472,7 +3453,6 @@ void tet_MultipleHandle_Subscribers_Publisher()
/* Mulitple Handle subscribers and publisher */
{
int iCmpCount = 0;
- char *tempData;
SaSizeT tempDataSize;
SaEvtHandleT tempEvtHandle, localEvtHandle;
SaEvtChannelHandleT tempChannelHandle;
@@ -3674,7 +3654,6 @@ void tet_EventPublish_Priority() /* Event Publish with
priority */
void tet_EventPublish_EventOrder() /* Event Publish with event order */
{
int iCmpCount;
- char *tempData;
SaSizeT tempDataSize;
printf(
"\n\n*************Case 40: Event Publish with event
order*********");
@@ -3757,7 +3736,6 @@ void tet_EventPublish_EventOrder() /* Event Publish with
event order */
void tet_EventPublish_EventFree()
{
- char *tempData;
SaSizeT tempDataSize;
int iCmpCount = 0;
@@ -3844,7 +3822,6 @@ void tet_EventPublish_EventFree()
void tet_EventFree_DeliverCallback()
{
SaEvtChannelHandleT pubChannelHandle, subChannelHandle;
- char *tempData;
SaSizeT tempDataSize;
int iCmpCount = 0;
@@ -3970,7 +3947,6 @@ void tet_EventFree_DeliverCallback()
void tet_EventRetentionTimeClear_EventFree()
{
SaEvtChannelHandleT pubChannelHandle;
- char *tempData;
SaSizeT tempDataSize;
int iCmpCount = 0;
@@ -4074,9 +4050,7 @@ void tet_EventRetentionTimeClear_EventFree()
void tet_EventPublish_ChannelUnlink()
{
SaEvtChannelHandleT pubChannelHandle, dupHandle;
- char *tempData;
SaSizeT tempDataSize;
- SaEvtEventIdT tempEvtId;
int iCmpCount = 0;
@@ -4115,7 +4089,6 @@ void tet_EventPublish_ChannelUnlink()
tempData = gl_eventData;
tempDataSize = gl_eventDataSize;
tet_saEvtEventPublish(&gl_eventHandle, &gl_evtId);
- tempEvtId = gl_evtId;
gl_allocatedNumber = 2;
gl_patternLength = 5;
@@ -4210,7 +4183,6 @@ after channel unlink");
void tet_EventUnsubscribe_EventPublish()
{
SaEvtChannelHandleT pubChannelHandle;
- char *tempData;
SaSizeT tempDataSize;
int iCmpCount = 0;
diff --git a/src/evt/apitest/tet_edsv_util.c b/src/evt/apitest/tet_edsv_util.c
index db13a3e..044c5f1 100644
--- a/src/evt/apitest/tet_edsv_util.c
+++ b/src/evt/apitest/tet_edsv_util.c
@@ -16,10 +16,11 @@ process.
#
*******************************************************************************************/
-#include "tet_startup.h"
-#include "ncs_main_papi.h"
+#include <stdio.h>
#include "tet_eda.h"
-
+#include "base/ncs_main_papi.h"
+#include "base/ncs_lib.h"
+#include "osaf/apitest/utest.h"
void edsv_smoke_test(void);
void tet_run_edsv_app(void);
@@ -30,6 +31,11 @@ void (*tet_startup)() = tet_edsv_startup;
void (*tet_cleanup)() = tet_edsv_end;
extern void tet_saEvtLimitGetCases(int iOption);
+struct tet_testlist {
+ void (*testfunc)();
+ int icref;
+ int tpnum;
+};
#if (TET_PATCH == 1)
struct tet_testlist edsv_test[] = {
@@ -1259,3 +1265,192 @@ void tet_edsv_startup()
}
void tet_edsv_end() { tet_infoline(" Ending the agony.. "); }
+
+__attribute__((constructor)) static void edsv_constructor(void)
+{
+ tet_edsv_startup();
+
+ test_suite_add(1, "saevtInitialize Test Suite");
+ test_case_add(1, tet_saEvtInitializeCases_01,
+ "saEvtInitialize() with NULL event handle");
+ test_case_add(1, tet_saEvtInitializeCases_02,
+ "saEvtInitialize() with NULL pointer to callbacks");
+ test_case_add(1, tet_saEvtInitializeCases_04,
+ "Initialize() with uninitialized pointer to callbacks");
+ test_case_add(1, tet_saEvtInitializeCases_05,
+ "Initialize with NULL ChannelOpenClbk,NULLDeliverClbk");
+ test_case_add(1, tet_saEvtInitializeCases_06,
+ "saEvtInitialize() with NULL saEvtChannelOpenCallback");
+ test_case_add(1, tet_saEvtInitializeCases_07,
+ "saEvtInitialize() with NULL saEvtEventDeliverCallback");
+ test_case_add(1, tet_saEvtInitializeCases_08,
+ "saEvtInitialize() with NULL version");
+ test_case_add(1, tet_saEvtInitializeCases_09,
+ "saEvtInitialize() with uninitialized version");
+ test_case_add(1, tet_saEvtInitializeCases_10,
+ "saEvtInitialize() with error version");
+ test_case_add(1, tet_saEvtInitializeCases_11,
+ "saEvtInitialize() with minor version set to 0");
+ test_case_add(1, tet_saEvtInitializeCases_12,
+ "saEvtInitialize() with major version set to 3");
+ test_case_add(1, tet_saEvtInitializeCases_13,
+ "saEvtInitialize() with major version set to 0");
+ test_case_add(1, tet_saEvtInitializeCases_14,
+ "saEvtInitialize() invoked");
+ test_case_add(1, tet_saEvtInitializeCases_15,
+ "saEvtInitialize() invoked");
+
+ test_suite_add(2, "saEvtSelectionObjectGet Test Suite");
+ test_case_add(2, tet_saEvtSelectionObjectGetCases_01,
+ "saEvtSelectionObjectGet() with NULL event handle");
+ test_case_add(2, tet_saEvtSelectionObjectGetCases_02,
+ "SelectionObjectGet() with uninitialized event handle");
+ test_case_add(2, tet_saEvtSelectionObjectGetCases_03,
+ "saEvtSelectionObjectGet() with garbage event handle");
+ test_case_add(2, tet_saEvtSelectionObjectGetCases_04,
+ "saEvtSelectionObjectGet() with NULL event clbk hdle");
+ test_case_add(2, tet_saEvtSelectionObjectGetCases_05,
+ "SelectionObjectGet() with NULL EvtChannelOpenCbk");
+ test_case_add(2, tet_saEvtSelectionObjectGetCases_06,
+ "SelectionObjectGet() with NULL DeliverCallback hdle");
+ test_case_add(2, tet_saEvtSelectionObjectGetCases_07,
+ "saEvtSelectionObjectGet() with NULL selection object");
+ test_case_add(2, tet_saEvtSelectionObjectGetCases_08,
+ "SelectionObjectGet()with NULL hdl,NULL selection obj");
+ test_case_add(2, tet_saEvtSelectionObjectGetCases_09,
+ "saEvtSelectionObjectGet() invoked");
+
+ test_suite_add(3, "saEvtDispatch Test Suite");
+ test_case_add(3, tet_saEvtDispatchCases_01,
+ "saEvtDispatch() with NULL event handle");
+ test_case_add(3, tet_saEvtDispatchCases_02,
+ "saEvtDispatch() with uninitialized event handle");
+ test_case_add(3, tet_saEvtDispatchCases_03,
+ "saEvtDispatch() with garbage event handle");
+ test_case_add(3, tet_saEvtDispatchCases_04,
+ "saEvtDispatch() with uninitialized dispatch flag");
+ test_case_add(3, tet_saEvtDispatchCases_05,
+ "Dispatch with dispatch flags set to garbagevalue(24)");
+ test_case_add(3, tet_saEvtDispatchCases_06,
+ "Dispatch() with dispatch flags set to DISPATCH_ALL");
+ test_case_add(3, tet_saEvtDispatchCases_07,
+ "Dispatch() with dispatch flags set to DISPATCH_ALL");
+
+ test_suite_add(4, "saEvtFinalize Test Suite");
+ test_case_add(4, tet_saEvtFinalizeCases_01,
+ "saEvtFinalize() with NULL event handle");
+ test_case_add(4, tet_saEvtFinalizeCases_02,
+ "saEvtFinalize() with uninitialized event handle");
+ test_case_add(4, tet_saEvtFinalizeCases_03,
+ "saEvtFinalize() with garbage values");
+ test_case_add(4, tet_saEvtFinalizeCases_04,
+ "saEvtFinalize() invoked");
+
+ test_suite_add(5, "saEvtChannelOpene Test Suite");
+ test_case_add(5, tet_saEvtChannelOpenCases_15,
+ "saEvtChannelOpen() with NULL channel handle");
+
+ test_suite_add(6, "saEvtChannelOpenAsync Test Suite");
+
+ test_suite_add(7, "saEvtChannelClose Test Suite");
+ test_case_add(7, tet_saEvtChannelCloseCases_01,
+ "saEvtChannelClose() with NULL channel handle");
+ test_case_add(7, tet_saEvtChannelCloseCases_02,
+ "saEvtChannelClose() with uninitialized channel ");
+ test_case_add(7, tet_saEvtChannelCloseCases_03,
+ "saEvtChannelClose() with garbage channel handle");
+
+ test_suite_add(8, "saEvtChannelUnlink Test Suite");
+ test_case_add(8, tet_saEvtChannelUnlinkCases_05,
+ "saEvtChannelUnlink() with uninitialized channel name");
+
+ test_suite_add(9, "saEvtEventAllocate Test Suite");
+ test_case_add(9, tet_saEvtEventAllocateCases_01,
+ "saEvtEventAllocate() with NULL channel handle");
+ test_case_add(9, tet_saEvtEventAllocateCases_02,
+ "EventAllocate() with uninitialized channel handle");
+ test_case_add(9, tet_saEvtEventAllocateCases_03,
+ "saEvtEventAllocate() with garbage channel handle");
+ test_case_add(9, tet_saEvtEventAllocateCases_04,
+ "saEvtEventAllocate() with NULL event handle");
+
+ test_suite_add(10, "saEvtEventFree Test Suite");
+ test_case_add(10, tet_saEvtEventFreeCases_01,
+ "saEvtEventFree() with NULL event handle");
+ test_case_add(10, tet_saEvtEventFreeCases_02,
+ "saEvtEventFree() with uninitialized event handle");
+ test_case_add(10, tet_saEvtEventFreeCases_03,
+ "saEvtEventFree() with garbage event handle");
+ test_case_add(10, tet_saEvtEventFreeCases_06,
+ "saEvtEventFree() with channel closed");
+
+ test_suite_add(11, "saEvtEventAttributesSet Test Suite");
+ test_case_add(11, tet_saEvtEventAttributesSetCases_11,
+ "saEvtEventAttributesSet() with empty publisher name");
+
+ test_suite_add(12, "saEvtEventAttributesGet Test Suite");
+ test_case_add(12, tet_saEvtEventAttributesGetCases_01,
+ "saEvtEventAttributesGet() with NULL event handle");
+ test_case_add(12, tet_saEvtEventAttributesGetCases_02,
+ "EventAttributesGet() with uninitialized event handle");
+ test_case_add(12, tet_saEvtEventAttributesGetCases_03,
+ "tAttributesGet() with garbage event handle");
+ test_case_add(12, tet_saEvtEventAttributesGetCases_04,
+ "AttributesGet() with NULL pattern array");
+
+ test_suite_add(13, "saEvtEventDataGet Test Suite");
+ test_case_add(13, tet_saEvtEventDataGetCases_01,
+ "saEvtEventDataGet() with NULL event handle");
+ test_case_add(13, tet_saEvtEventDataGetCases_02,
+ "saEvtEventDataGet() with uninitialized event handle");
+ test_case_add(13, tet_saEvtEventDataGetCases_03,
+ "tEventDataGet() with garbage event handle");
+ test_case_add(13, tet_saEvtEventDataGetCases_08,
+ "EventDataGet() with channel when published");
+
+ test_suite_add(14, "saEvtEventPublish Test Suite");
+ test_case_add(14, tet_saEvtEventPublishCases_01,
+ "tEventPublish() with NULL event handle");
+ test_case_add(14, tet_saEvtEventPublishCases_02,
+ "EventPublish() with uninitialized event handle");
+ test_case_add(14, tet_saEvtEventPublishCases_03,
+ "EventPublish() with garbage event handle");
+ test_case_add(14, tet_saEvtEventPublishCases_08,
+ "EventPublish() with NULL event id");
+
+ test_suite_add(15, "saEvtEventSubscribe Test Suite");
+ test_case_add(15, tet_saEvtEventSubscribeCases_01,
+ "EventSubscribe() with NULL channel Handle");
+ test_case_add(15, tet_saEvtEventSubscribeCases_02,
+ "EventSubscribe() with empty channel handle");
+ test_case_add(15, tet_saEvtEventSubscribeCases_03,
+ "EventSubscribe() with garbage channel handle");
+ test_case_add(15, tet_saEvtEventSubscribeCases_05,
+ "EventSubscribe() with NULL filter Array");
+
+ test_suite_add(16, "saEvtEventUnsubscribe Test Suite");
+ test_case_add(16, tet_saEvtEventUnsubscribeCases_01,
+ "EventUnsubscribe() with NULL gl_channelHandle");
+ test_case_add(16, tet_saEvtEventUnsubscribeCases_02,
+ "EventUnsubscribe() with empty channel handle");
+ test_case_add(16, tet_saEvtEventUnsubscribeCases_03,
+ "EventUnsubscribe() with garbage channel handle");
+
+ test_suite_add(17, "saEvtEventRetentionTimeClear Test Suite");
+ test_case_add(17, tet_saEvtEventRetentionTimeClearCases_01,
+ "EventRetentionTimeClear() with NULL channel handle");
+ test_case_add(17, tet_saEvtEventRetentionTimeClearCases_02,
+ "RetentionTimeClear() with empty channel handle");
+ test_case_add(17, tet_saEvtEventRetentionTimeClearCases_03,
+ "EventUnsubscribe() with garbage channel handle");
+ test_case_add(17, tet_saEvtEventRetentionTimeClearCases_05,
+ "EventRetentionTimeClear() with NULL evt id");
+
+ test_suite_add(18, "api test Test Suite");
+ test_suite_add(19, "fun test Test Suite");
+ test_suite_add(20, "saEvtLimitGet Test Suite");
+ test_case_add(20, tet_saEvtLimitGetCases_01,
+ "EvtLimitGet() with NULL LimitValue");
+ test_case_add(20, tet_saEvtLimitGetCases_02,
+ "EvtLimitGet() with NULL event handle");
+}
diff --git a/src/evt/apitest/tet_edsv_wrappers.c
b/src/evt/apitest/tet_edsv_wrappers.c
index 39adb74..90dd8ea 100644
--- a/src/evt/apitest/tet_edsv_wrappers.c
+++ b/src/evt/apitest/tet_edsv_wrappers.c
@@ -1,8 +1,7 @@
#include <string.h>
-#include "tet_api.h"
-#include "tet_startup.h"
+#include <stdio.h>
#include "tet_eda.h"
-
+void tet_saEvtFinalize(SaEvtHandleT *);
extern int gl_sync_pointnum;
extern int fill_syncparameters(int);
extern int gl_jCount;
@@ -16,6 +15,54 @@ extern int gl_major_version;
extern int gl_minor_version;
extern int gl_b03_flag;
+
+
+#ifndef NCS_STACKSIZE_MEDIUM
+#define NCS_STACKSIZE_MEDIUM 32000
+#endif
+
+#define m_NCS_TASK_CREATE(entry, arg, name, prio, policy, stack_size, \
+ p_t_handle) \
+ ncs_task_create(entry, arg, name, prio, policy, stack_size, p_t_handle)
+
+uint32_t ncs_task_create(NCS_OS_CB entry_pt, void *arg, const char *name,
+ unsigned int priority, int policy,
+ unsigned int stack_size_in_bytes, void **task_handle)
+{
+ NCS_OS_TASK task;
+ memset(&task, 0, sizeof(task));
+ uint32_t rc;
+
+ task.info.create.i_entry_point = entry_pt;
+ task.info.create.i_name = name;
+ task.info.create.i_priority = priority;
+ task.info.create.i_policy = policy;
+ task.info.create.i_stack_nbytes = stack_size_in_bytes;
+ task.info.create.i_ep_arg = arg;
+
+ rc = m_NCS_OS_TASK(&task, NCS_OS_TASK_CREATE);
+
+ if (NCSCC_RC_SUCCESS == rc)
+ *task_handle = task.info.create.o_handle;
+
+ return rc;
+}
+
+#define m_NCS_TASK_START(t_handle) ncs_task_start(t_handle)
+
+uint32_t ncs_task_start(void *task_handle)
+{
+ NCS_OS_TASK task;
+ memset(&task, 0, sizeof(task));
+
+ if (task_handle == NULL)
+ return NCSCC_RC_SUCCESS;
+
+ task.info.start.i_handle = task_handle;
+
+ return m_NCS_OS_TASK(&task, NCS_OS_TASK_START);
+}
+
/****************************************************************/
/***************** EDSV CALLBACK FUNCTIONS **********************/
/****************************************************************/
@@ -118,6 +165,7 @@ void tet_saEvtInitialize(SaEvtHandleT *ptrEvtHandle)
gl_evtHandle = *ptrEvtHandle;
printf("\nEvent Handle (when initialized): %llu", *ptrEvtHandle);
+
}
void tet_saEvtSelectionObjectGet(SaEvtHandleT *ptrEvtHandle,
SaSelectionObjectT *ptrSelectionObject)
@@ -607,6 +655,7 @@ void result(char *gl_saf_msg, SaAisErrorT ref)
gl_error = gl_rc;
}
printf("%s\n", gl_saf_error[gl_rc]);
+
}
void resultSuccess(char *gl_saf_msg, SaAisErrorT rc)
@@ -678,7 +727,8 @@ void thread_creation(SaEvtHandleT *ptrEvtHandle)
if (gl_tCount < 2) {
gl_rc =
m_NCS_TASK_CREATE((NCS_OS_CB)eda_selection_thread, NULL,
- "edsv_test", 8, 8000, &eda_thread_handle);
+ "edsv_test", 20, 8, 8000,
+ &eda_thread_handle);
if (gl_rc != NCSCC_RC_SUCCESS) {
printf("\nthread cannot be created");
return;
@@ -694,8 +744,8 @@ void thread_creation(SaEvtHandleT *ptrEvtHandle)
uint32_t tet_create_task(NCS_OS_CB task_startup)
{
char taskname[] = "My Task";
- if (m_NCS_TASK_CREATE(task_startup, NULL, taskname, NCS_TASK_PRIORITY_6,
- NCS_STACKSIZE_MEDIUM,
+ if (m_NCS_TASK_CREATE(task_startup, NULL, taskname, 20,
+ 8, NCS_STACKSIZE_MEDIUM,
&gl_t_handle) == NCSCC_RC_SUCCESS)
return NCSCC_RC_SUCCESS;
else
--
2.7.4
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
