highlevel: add more tests, fix old tests, fix bugs

ElektraInitiative · Nov 11, 2018 · 937139b · 937139b
1 parent d9618f7
commit 937139b
Show file tree

Hide file tree

Showing 4 changed files with 415 additions and 115 deletions.
diff --git a/src/libs/highlevel/elektra.c b/src/libs/highlevel/elektra.c
@@ -16,8 +16,9 @@
 static void defaultFatalErrorHandler (ElektraError * error)
 {
 	ELEKTRA_LOG_DEBUG ("FATAL ERROR [%d]: %s", error->code, error->description);
+	ElektraErrorCode code = error->code;
 	elektraFree (error);
-	exit (error->code);
+	exit (code);
 }
 
 /**

diff --git a/src/libs/highlevel/elektra_array_value.c b/src/libs/highlevel/elektra_array_value.c
@@ -61,7 +61,7 @@ Key * elektraFindArrayElementKey (Elektra * elektra, const char * name, size_t i
 		return NULL;
 	}
 
-	if (!elektra->enforceType && type != NULL)
+	if (elektra->enforceType && type != NULL)
 	{
 		const char * actualType = keyString (keyGetMeta (resultKey, "type"));
 		if (strcmp (actualType, type) != 0)
@@ -128,7 +128,7 @@ void elektraSetArrayElementValue (Elektra * elektra, const char * name, size_t i
 
 #define ELEKTRA_GET_ARRAY_ELEMENT_VALUE(KEY_TO_VALUE, KDB_TYPE, elektra, keyname, index, result)                                           \
 	const Key * key = elektraFindArrayElementKey (elektra, keyname, index, KDB_TYPE);                                                  \
-	if (!KEY_TO_VALUE (key, &result))                                                                                                  \
+	if (key == NULL || !KEY_TO_VALUE (key, &result))                                                                                   \
 	{                                                                                                                                  \
 		elektraFatalError (elektra, elektraErrorConversionFromString (KDB_TYPE, keyString (key), NULL));                           \
 		return 0;                                                                                                                  \

diff --git a/src/libs/highlevel/elektra_value.c b/src/libs/highlevel/elektra_value.c
@@ -41,7 +41,7 @@ Key * elektraFindKey (Elektra * elektra, const char * name, KDBType type)
 		return NULL;
 	}
 
-	if (!elektra->enforceType && type != NULL)
+	if (elektra->enforceType && type != NULL)
 	{
 		const char * actualType = keyString (keyGetMeta (resultKey, "type"));
 		if (strcmp (actualType, type) != 0)
@@ -103,7 +103,7 @@ void elektraSetValue (Elektra * elektra, const char * name, const char * value,
 
 #define ELEKTRA_GET_VALUE(KEY_TO_VALUE, KDB_TYPE, elektra, keyname, result)                                                                \
 	const Key * key = elektraFindKey (elektra, keyname, KDB_TYPE);                                                                     \
-	if (!KEY_TO_VALUE (key, &result))                                                                                                  \
+	if (key == NULL || !KEY_TO_VALUE (key, &result))                                                                                   \
 	{                                                                                                                                  \
 		elektraFatalError (elektra, elektraErrorConversionFromString (KDB_TYPE, keyString (key), NULL));                           \
 		result = 0;                                                                                                                \