change null config read default

diff --git a/src/kds_s2000w_config.c b/src/kds_s2000w_config.c
index b0d741fd911cf6727ad7a42b9db5fe17af8211f6..7f1d1a1514c054994702fd0860d848ffa51fe0a0 100644 (file)
--- a/src/kds_s2000w_config.c
+++ b/src/kds_s2000w_config.c
@@ -68,9 +68,6 @@ char* kds_s2000w_config_read(const char* filename)
 
 program_config_t* kds_s2000w_config_load(const char* config_string)
 {
-       if (config_string == NULL)
-               return NULL;
-
        program_config_t* config = _kds_s2000w_config_init();
        if (config == NULL)
                return NULL;

diff --git a/tests/kds_s2000w_read_config_tests.c b/tests/kds_s2000w_read_config_tests.c
index 54de828fc4d9e5031ff0182fdd5df2cf72625225..4f6baf65a993b7fecd87737a10dc5a6ec21dcf39 100644 (file)
--- a/tests/kds_s2000w_read_config_tests.c
+++ b/tests/kds_s2000w_read_config_tests.c
@@ -30,7 +30,14 @@ void kds_s2000w_config_null_test()
 {
        program_config_t* config = kds_s2000w_config_load(NULL);
 
-       assert_null(config);
+       assert_non_null(config);
+       assert_string_equal(config->scanner_url, "");
+       assert_string_equal(config->username, "");
+       assert_int_equal(config->heartbeat, 1);
+       assert_false(config->ssl_verify);
+
+       kds_s2000w_config_free(config);
+       config = NULL;
 }
 
 void kds_s2000w_config_read_empty_config_test()