j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Sysparam getting bool without memory allocation. Bool tests.

Browse source
This commit is contained in:
sheinz 2016-11-28 12:16:38 +02:00
parent 2f611dfbc0
commit 2105d5a5cd
2 changed files with 133 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

42
core/sysparam.c
View file

@ -809,32 +809,48 @@ sysparam_status_t sysparam_get_int8(const char *key, int8_t *result) {
} }
sysparam_status_t sysparam_get_bool(const char *key, bool *result) { sysparam_status_t sysparam_get_bool(const char *key, bool *result) {
char *buffer; const size_t buf_size = 8;
char buf[buf_size + 1]; // extra byte for zero termination
size_t data_len = 0;
bool binary = false;
sysparam_status_t status; sysparam_status_t status;
status = sysparam_get_string(key, &buffer); status = sysparam_get_data_static(key, (uint8_t*)buf,
buf_size, &data_len, &binary);
if (status != SYSPARAM_OK) return status; if (status != SYSPARAM_OK) return status;
do { do {
if (!strcasecmp(buffer, "y") || if (binary) {
!strcasecmp(buffer, "yes") || if (data_len == 1) { // int8 value
!strcasecmp(buffer, "t") || *result = (int8_t)(*buf) ? true : false;
!strcasecmp(buffer, "true") || } else if (data_len == 4) { // int32 value
!strcmp(buffer, "1")) { *result = (int32_t)(*buf) ? true : false;
} else {
status = SYSPARAM_PARSEFAILED;
}
break;
}
buf[data_len] = 0;
if (!strcasecmp(buf, "y") ||
!strcasecmp(buf, "yes") ||
!strcasecmp(buf, "t") ||
!strcasecmp(buf, "true") ||
!strcmp(buf, "1")) {
*result = true; *result = true;
break; break;
} }
if (!strcasecmp(buffer, "n") || if (!strcasecmp(buf, "n") ||
!strcasecmp(buffer, "no") || !strcasecmp(buf, "no") ||
!strcasecmp(buffer, "f") || !strcasecmp(buf, "f") ||
!strcasecmp(buffer, "false") || !strcasecmp(buf, "false") ||
!strcmp(buffer, "0")) { !strcmp(buf, "0")) {
*result = false; *result = false;
break; break;
} }
status = SYSPARAM_PARSEFAILED; status = SYSPARAM_PARSEFAILED;
} while (0); } while (0);
free(buffer);
return status; return status;
} }

125
tests/cases/07_sysparam.c
View file

@ -9,7 +9,7 @@
#include <testcase.h> #include <testcase.h>
/* #define DEBUG */ // #define DEBUG
#ifdef DEBUG #ifdef DEBUG
#include <stdio.h> #include <stdio.h>
@ -20,6 +20,7 @@
DEFINE_SOLO_TESTCASE(07_sysparam_basic_test); DEFINE_SOLO_TESTCASE(07_sysparam_basic_test);
DEFINE_SOLO_TESTCASE(07_sysparam_load_test); DEFINE_SOLO_TESTCASE(07_sysparam_load_test);
DEFINE_SOLO_TESTCASE(07_sysparam_bool_test);
#define TEST_ITERATIONS 10 #define TEST_ITERATIONS 10
#define KEY_BUF_SIZE 32 #define KEY_BUF_SIZE 32
@ -54,13 +55,13 @@ static inline void init_sysparam()
uint32_t base_addr, num_sectors; uint32_t base_addr, num_sectors;
status = sysparam_get_info(&base_addr, &num_sectors); status = sysparam_get_info(&base_addr, &num_sectors);
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
status = sysparam_create_area(base_addr, num_sectors, /*force=*/true); status = sysparam_create_area(base_addr, num_sectors, /*force=*/true);
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
status = sysparam_init(base_addr, 0); status = sysparam_init(base_addr, 0);
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
debug("sysparam initialized at addr=%x, sectors=%d\n", debug("sysparam initialized at addr=%x, sectors=%d\n",
base_addr, num_sectors); base_addr, num_sectors);
@ -186,7 +187,7 @@ static void write_test_values(test_data_t *data)
break; break;
} }
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
test_data_next(data); test_data_next(data);
} }
@ -208,23 +209,23 @@ static void verify_test_values(test_data_t *data)
case VALUE_STRING: case VALUE_STRING:
test_data_get_string(data, expected_str_buf); test_data_get_string(data, expected_str_buf);
status = sysparam_get_string(key_buf, &actual_str); status = sysparam_get_string(key_buf, &actual_str);
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
TEST_ASSERT_EQUAL_STRING(expected_str_buf, actual_str); TEST_ASSERT_EQUAL_STRING(expected_str_buf, actual_str);
free(actual_str); free(actual_str);
break; break;
case VALUE_INT32: case VALUE_INT32:
status = sysparam_get_int32(key_buf, &actual_int32); status = sysparam_get_int32(key_buf, &actual_int32);
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
TEST_ASSERT_EQUAL_INT(test_data_get_int32(data), actual_int32); TEST_ASSERT_EQUAL_INT(test_data_get_int32(data), actual_int32);
break; break;
case VALUE_INT8: case VALUE_INT8:
status = sysparam_get_int8(key_buf, &actual_int8); status = sysparam_get_int8(key_buf, &actual_int8);
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
TEST_ASSERT_EQUAL_INT(test_data_get_int8(data), actual_int8); TEST_ASSERT_EQUAL_INT(test_data_get_int8(data), actual_int8);
break; break;
case VALUE_BOOL: case VALUE_BOOL:
status = sysparam_get_bool(key_buf, &actual_bool); status = sysparam_get_bool(key_buf, &actual_bool);
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
TEST_ASSERT_TRUE(test_data_get_bool(data) == actual_bool); TEST_ASSERT_TRUE(test_data_get_bool(data) == actual_bool);
break; break;
case VALUE_ENUM_END: case VALUE_ENUM_END:
@ -244,7 +245,7 @@ static void clear_test_values(test_data_t *data)
for (int i = 0; i < NUMBER_OF_TEST_DATA; ++i) { for (int i = 0; i < NUMBER_OF_TEST_DATA; ++i) {
test_data_get_key(data, key_buf); test_data_get_key(data, key_buf);
status = sysparam_set_data(key_buf, NULL, 0, false); status = sysparam_set_data(key_buf, NULL, 0, false);
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
test_data_next(data); test_data_next(data);
} }
@ -283,43 +284,125 @@ static void a_07_sysparam_load_test(void)
static void a_07_sysparam_basic_test(void) static void a_07_sysparam_basic_test(void)
{ {
sysparam_status_t status; sysparam_status_t status;
init_sysparam();
int32_t int32_val = 0; int32_t int32_val = 0;
int8_t int8_val = 0; int8_t int8_val = 0;
char *str; char *str;
bool bool_val; bool bool_val;
init_sysparam();
status = sysparam_set_int32("int_1", -123); status = sysparam_set_int32("int_1", -123);
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
status = sysparam_get_int32("int_1", &int32_val); status = sysparam_get_int32("int_1", &int32_val);
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
TEST_ASSERT_EQUAL_INT(-123, int32_val); TEST_ASSERT_EQUAL_INT(-123, int32_val);
status = sysparam_set_int8("int_2", -34); status = sysparam_set_int8("int_2", -34);
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
status = sysparam_get_int8("int_2", &int8_val); status = sysparam_get_int8("int_2", &int8_val);
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
TEST_ASSERT_EQUAL_INT(-34, int8_val); TEST_ASSERT_EQUAL_INT(-34, int8_val);
status = sysparam_set_string("str_1", "test string"); status = sysparam_set_string("str_1", "test string");
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
status = sysparam_get_string("str_1", &str); status = sysparam_get_string("str_1", &str);
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
TEST_ASSERT_EQUAL_STRING("test string", str); TEST_ASSERT_EQUAL_STRING("test string", str);
free(str); free(str);
status = sysparam_set_bool("bool_true", true); status = sysparam_set_bool("bool_true", true);
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
status = sysparam_get_bool("bool_true", &bool_val); status = sysparam_get_bool("bool_true", &bool_val);
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
TEST_ASSERT_TRUE(bool_val); TEST_ASSERT_TRUE(bool_val);
status = sysparam_set_bool("bool_false", false); status = sysparam_set_bool("bool_false", false);
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
status = sysparam_get_bool("bool_false", &bool_val); status = sysparam_get_bool("bool_false", &bool_val);
TEST_ASSERT_EQUAL_INT(status, SYSPARAM_OK); TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
TEST_ASSERT_FALSE(bool_val); TEST_ASSERT_FALSE(bool_val);
TEST_PASS(); TEST_PASS();
} }
typedef struct {
const char *key;
const char *str;
bool value;
} bool_test_data_t;
const static bool_test_data_t bool_data[] = {
{"str_true", "true", true},
{"str_True", "True", true},
{"str_TRUE", "TRUE", true},
{"str_t", "t", true},
{"str_T", "T", true},
{"str_y", "y", true},
{"str_Y", "Y", true},
{"str_yes", "yes", true},
{"str_Yes", "Yes", true},
{"str_YES", "YES", true},
{"str_1", "1", true},
{"str_false", "false", false},
{"str_False", "False", false},
{"str_FALSE", "FALSE", false},
{"str_f", "f", false},
{"str_F", "F", false},
{"str_n", "n", false},
{"str_N", "N", false},
{"str_no", "no", false},
{"str_No", "No", false},
{"str_NO", "NO", false},
{"str_0", "0", false},
};
static void a_07_sysparam_bool_test(void)
{
sysparam_status_t status;
bool value;
init_sysparam();
for (int i = 0; i < sizeof(bool_data) / sizeof(bool_data[0]); ++i) {
status = sysparam_set_string(bool_data[i].key, bool_data[i].str);
TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
}
status = sysparam_set_int8("int8_0", 0);
TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
status = sysparam_set_int8("int8_1", 1);
TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
status = sysparam_set_int32("int32_0", 0);
TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
status = sysparam_set_int32("int32_1", 1);
TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
for (int i = 0; i < sizeof(bool_data) / sizeof(bool_data[0]); ++i) {
debug("Getting bool key=%s\n", bool_data[i].key);
status = sysparam_get_bool(bool_data[i].key, &value);
TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
TEST_ASSERT_TRUE(bool_data[i].value == value);
}
status = sysparam_get_bool("int8_0", &value);
TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
TEST_ASSERT_FALSE(value);
status = sysparam_get_bool("int8_1", &value);
TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
TEST_ASSERT_TRUE(value);
status = sysparam_get_bool("int32_0", &value);
TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
TEST_ASSERT_FALSE(value);
status = sysparam_get_bool("int32_1", &value);
TEST_ASSERT_EQUAL_INT(SYSPARAM_OK, status);
TEST_ASSERT_TRUE(value);
TEST_PASS();
}