From eb60e711368a808c88bee7420b4454924a8b1cda Mon Sep 17 00:00:00 2001
From: Christian Thaeter <ct@pipapo.org>
Date: Thu, 7 Aug 2008 14:55:17 +0200
Subject: [PATCH] few more tests for the config subsystem

---
 tests/20config.tests        | 16 +++++++---------
 tests/backend/test-config.c |  9 +++++++--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/tests/20config.tests b/tests/20config.tests
index 341c7d3ba..ef3d8da7d 100644
--- a/tests/20config.tests
+++ b/tests/20config.tests
@@ -34,31 +34,29 @@ PLANNED "complex saving user file"  <<END
 END
 
 
-TEST "number get" number_get <<END
+TEST "number get, default" number_get test.number.1 '1234567890 # comment' <<END
 out: 1234567890
 END
 
 export LUMIERA_TEST_NUMBER_1=987654321
-TEST "number get, env override" number_get <<END
+TEST "number get, env override" number_get test.number.1 '1234567890 # comment' <<END
 out: 987654321
 END
 
 export LUMIERA_TEST_NUMBER_1=barf
-TEST "number get, type error" number_get_nodefault <<END
+TEST "number get, type error" number_get_nodefault test.number.1 <<END
 out: LUMIERA_ERROR_CONFIG_TYPE:value has wrong type
 END
 unset LUMIERA_TEST_NUMBER_1
 
 
-
-PLANNED "number get, syntax error" number_get <<END
+TEST "number get, syntax error" number_get no:fun:blah '1234567890 # comment' <<END
+out: LUMIERA_ERROR_CONFIG_SYNTAX_KEY:syntax error in key
 END
 
 
-PLANNED "number get, default" number_get <<END
-END
-
-PLANNED "number get, no default" number_get <<END
+TEST "number get, no default, no env" number_get_nodefault test.number.1 <<END
+out: LUMIERA_ERROR_CONFIG_NO_ENTRY:no configuration entry
 END
 
 
diff --git a/tests/backend/test-config.c b/tests/backend/test-config.c
index 0c8731c06..56168a1ca 100644
--- a/tests/backend/test-config.c
+++ b/tests/backend/test-config.c
@@ -37,11 +37,14 @@ TEST ("init")
 
 TEST ("number_get")
 {
+  REQUIRE (argv[2]);
+  REQUIRE (argv[3]);
+
   lumiera_config_init ("./");
 
   long long number = 0;
 
-  if (!lumiera_config_number_get ("test.number.1", &number, "1234567890 # comment"))
+  if (!lumiera_config_number_get (argv[2], &number, argv[3]))
     printf ("%lld\n", number);
   else
     printf ("%s\n", lumiera_error ());
@@ -52,11 +55,13 @@ TEST ("number_get")
 
 TEST ("number_get_nodefault")
 {
+  REQUIRE (argv[2]);
+
   lumiera_config_init ("./");
 
   long long number = 0;
 
-  if (!lumiera_config_number_get ("test.number.1", &number, NULL))
+  if (!lumiera_config_number_get (argv[2], &number, NULL))
     printf ("%lld\n", number);
   else
     printf ("%s\n", lumiera_error ());