safestringlib: unittests: add test counter to strisdigit_s and strismixed_s.c

Add test counters to strisdigit_s strismixed_s.c

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>

Author: Tomas Winkler

unittests/test_strisdigit_s.c

@@ -1,6 +1,7 @@
 /*  SPDX-License-Identifier: MIT */
 /*
-*  Copyright (c) 2014 by Intel Corp
+*  Copyright (c) 2014-2022 Intel Corp
+*/
 /*------------------------------------------------------------------
  * test_strisdigit_s
  *
@@ -13,84 +14,113 @@
 #define LEN   ( 128 )
 
 
-int test_strisdigit_s()
+int test_strisdigit_s(void)
 {
     bool rc;
 
-    uint32_t len;
-    char   str[LEN];
+    rsize_t len;
+    char str[LEN];
+    unsigned int testno = 0;
+    unsigned int err = 0;
+
+
+    printf("\nTesting strisdigit_s:\n");
 
 /*--------------------------------------------------*/
 
+/* 1: Test for first parameter, char string, being sent in as NULL */
+    printf("Test #%d:\n", ++testno);
+
     len = 5;
     rc = strisdigit_s(NULL, len);
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+	err++;
     }
 
 /*--------------------------------------------------*/
 
+    printf("Test #%d:\n", ++testno);
+
     len = 0;
     rc = strisdigit_s("1234", len);
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+	err++;
     }
 
 /*--------------------------------------------------*/
 
+    printf("Test #%d:\n", ++testno);
+
     len = 99999;
     rc = strisdigit_s("1234", len);
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+	err++;
     }
 
 /*--------------------------------------------------*/
 
+    printf("Test #%d:\n", ++testno);
+
     len = 9;
     rc = strisdigit_s("", len);
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+	err++;
     }
 
 /*--------------------------------------------------*/
 
+    printf("Test #%d:\n", ++testno);
+
     strcpy(str, "123456789");
     len = 4;
 
     rc = strisdigit_s(str, len);
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+	err++;
     }
 
 /*--------------------------------------------------*/
 
+    printf("Test #%d:\n", ++testno);
+
     strcpy(str, "1");
     len = strlen(str);
 
     rc = strisdigit_s(str, len);
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+	err++;
     }
 
 /*--------------------------------------------------*/
 
+    printf("Test #%d:\n", ++testno);
+
     strcpy(str, "12");
     len = strlen(str);
 
     rc = strisdigit_s(str, len);
     if (rc != true) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+	err++;
     }
 
 /*--------------------------------------------------*/
 
+    printf("Test #%d:\n", ++testno);
+
     strcpy(str, "1abcd");
     len = strlen(str);
 
@@ -102,16 +132,32 @@ int test_strisdigit_s()
 
 /*--------------------------------------------------*/
 
+    printf("Test #%d:\n", ++testno);
+
     strcpy(str, "abcd");
     len = strlen(str);
 
     rc = strisdigit_s(str, len);
     if (rc != false) {
         printf("%s %u   Error rc=%u \n",
                      __FUNCTION__, __LINE__,  rc );
+	err++;
     }
 
 /*--------------------------------------------------*/
 
-    return (0);
+/*  Test for non terminated string */
+    printf("Test #%d:\n", ++testno);
+
+    memset(str, '6', LEN);
+    len = LEN - 3;
+
+    rc = strisdigit_s(str, len);
+    if (rc != true) {
+        printf("%s %u   Error rc=%u \n",
+                     __FUNCTION__, __LINE__,  rc );
+	err++;
+    }
+
+    return  (err == 0) ? 0 : 1;
 }

unittests/test_strismixed_s.c

@@ -14,14 +14,21 @@
 #define LEN   ( 128 )
 
 
-int test_strismixed_s()
+int test_strismixed_s(void)
 {
     bool rc;
     rsize_t len;
-    char   str[LEN];
+    char str[LEN];
+    unsigned int testno = 0;
+
+
+    printf("\nTesting strisdigit_s:\n");
 
 /*--------------------------------------------------*/
 
+/* 1: Test for first parameter, char string, being sent in as NULL */
+    printf("Test #%d:\n", ++testno);
+
     len = 5;
     rc = strismixedcase_s(NULL, len);
     if (rc != false) {
@@ -31,6 +38,8 @@ int test_strismixed_s()
 
 /*--------------------------------------------------*/
 
+    printf("Test #%d:\n", ++testno);
+
     len = 0;
     rc = strismixedcase_s("test", len);
     if (rc != false) {
@@ -40,6 +49,8 @@ int test_strismixed_s()
 
 /*--------------------------------------------------*/
 
+    printf("Test #%d:\n", ++testno);
+
     len = RSIZE_MAX_STR+1;
     rc = strismixedcase_s("test", len);
     if (rc != false) {
@@ -49,6 +60,8 @@ int test_strismixed_s()
 
 /*--------------------------------------------------*/
 
+    printf("Test #%d:\n", ++testno);
+
     len = 9;
     rc = strismixedcase_s("", len);
     if (rc != false) {
@@ -58,6 +71,8 @@ int test_strismixed_s()
 
 /*--------------------------------------------------*/
 
+    printf("Test #%d:\n", ++testno);
+
     strcpy(str, "AaBbCcDdEeFf");
     len = 5;
 
@@ -69,6 +84,8 @@ int test_strismixed_s()
 
 /*--------------------------------------------------*/
 
+    printf("Test #%d:\n", ++testno);
+
     strcpy(str, "N");
     len = strlen(str);
 
@@ -80,6 +97,8 @@ int test_strismixed_s()
 
 /*--------------------------------------------------*/
 
+    printf("Test #%d:\n", ++testno);
+
     strcpy(str, "NowISTHETimE");
     len = strlen(str);
 
@@ -91,6 +110,8 @@ int test_strismixed_s()
 
 /*--------------------------------------------------*/
 
+    printf("Test #%d:\n", ++testno);
+
     strcpy(str, "qq21ego");
     len = strlen(str);
 
@@ -102,6 +123,8 @@ int test_strismixed_s()
 
 /*--------------------------------------------------*/
 
+    printf("Test #%d:\n", ++testno);
+
     strcpy(str, "1234");
     len = strlen(str);