X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ef59b7b7d312b0f791a243d08c8f4416a64c4997..0b5e43957fe16281ccee60ccccf064a0d4d0fec0:/testsuite/xbt/config_usage.c

diff --git a/testsuite/xbt/config_usage.c b/testsuite/xbt/config_usage.c
index 5fafedba7a..95a82f5750 100644
--- a/testsuite/xbt/config_usage.c
+++ b/testsuite/xbt/config_usage.c
@@ -10,48 +10,61 @@
 #include <stdio.h>
 #include "gras.h"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(test,"Logging for this test");
+XBT_LOG_NEW_CATEGORY(test,"Logging for this test");
 
 /*====[ Code ]===============================================================*/
 static xbt_cfg_t make_set(){
   xbt_cfg_t set=NULL; 
-  xbt_error_t errcode;
 
   set = xbt_cfg_new();
-  TRYFAIL(xbt_cfg_register_str(set,"speed:1_to_2_int"));
-  TRYFAIL(xbt_cfg_register_str(set,"hostname:1_to_1_string"));
-  TRYFAIL(xbt_cfg_register_str(set,"user:1_to_10_string"));
+  xbt_cfg_register_str(set,"speed:1_to_2_int");
+  xbt_cfg_register_str(set,"hostname:1_to_1_string");
+  xbt_cfg_register_str(set,"user:1_to_10_string");
 
   return set;
 } /* end_of_make_set */
  
 int main(int argc, char **argv) {
-  xbt_error_t errcode;
+  xbt_ex_t e;
   xbt_cfg_t set;
 
   char *str;
   
-  xbt_init_defaultlog(&argc,argv,"config.thresh=debug root.thresh=info");
+  xbt_init(&argc,argv);
 
   fprintf(stderr,"==== Alloc and free a config set.\n");
   set=make_set();
-  TRYFAIL(xbt_cfg_set_parse(set, "hostname:veloce user:mquinson\nuser:oaumage\tuser:alegrand"));
+  xbt_cfg_set_parse(set, "hostname:veloce user:mquinson\nuser:oaumage\tuser:alegrand");
   xbt_cfg_dump("test set","",set);
   xbt_cfg_free(&set);
   xbt_cfg_free(&set);
 
-  fprintf(stderr,
-	  "==== Validation test. (ERROR EXPECTED: not enough values of 'speed')\n");
+  fprintf(stderr, "==== Validation test with too few values of 'speed'\n");
   set=make_set();
   xbt_cfg_set_parse(set, "hostname:veloce user:mquinson\nuser:oaumage\tuser:alegrand");
-  xbt_cfg_check(set);
+  TRY {
+    xbt_cfg_check(set);
+  } CATCH(e) {
+    if (e.category != mismatch_error || 
+	strncmp(e.msg,"Config elem speed needs",strlen("Config elem speed needs")))
+      RETHROW;
+    xbt_ex_free(e);
+  }
   xbt_cfg_free(&set);
   xbt_cfg_free(&set);
 
-  fprintf(stderr,"==== Validation test (ERROR EXPECTED: too many elements)\n");
-  set=make_set();
-  xbt_cfg_set_parse(set,"hostname:toto:42");
-  xbt_cfg_set_parse(set,"speed:42 speed:24 speed:34");
+  fprintf(stderr,"==== Validation test with too much values of 'speed'\n");
+  set=make_set(); 
+    xbt_cfg_set_parse(set,"hostname:toto:42 user:alegrand");
+  TRY {
+    xbt_cfg_set_parse(set,"speed:42 speed:24 speed:34");
+  } CATCH(e) {
+    if (e.category != mismatch_error ||
+	strncmp(e.msg,"Cannot add value 34 to the config elem speed",
+		strlen("Config elem speed needs")))
+      RETHROW;
+    xbt_ex_free(e);
+  }
   xbt_cfg_check(set);
   xbt_cfg_free(&set);
   xbt_cfg_free(&set);
@@ -63,7 +76,7 @@ int main(int argc, char **argv) {
   xbt_cfg_t myset=make_set();
      
   xbt_cfg_set_parse(myset,"hostname:toto:42 speed:42");
-  xbt_cfg_get_int(myset,"speed",&ival); 
+  ival = xbt_cfg_get_int(myset,"speed"); 
   fprintf(stderr,"speed value: %d\n",ival); /* Prints: "speed value: 42" */
   xbt_cfg_free(&myset);
   }
@@ -78,7 +91,7 @@ int main(int argc, char **argv) {
   xbt_cfg_set_parse(myset, "hostname:veloce user:mquinson\nuser:oaumage\tuser:alegrand");
   xbt_cfg_set_parse(myset,"speed:42");
   xbt_cfg_check(myset); 
-  xbt_cfg_get_dynar(myset,"user",&dyn);
+  dyn = xbt_cfg_get_dynar(myset,"user");
   fprintf(stderr,"Count: %lu; Options: ",xbt_dynar_length(dyn));
   xbt_dynar_foreach(dyn,ival,str) {
     fprintf(stderr,"%s;",str); 
@@ -91,7 +104,14 @@ int main(int argc, char **argv) {
   fprintf(stderr,"==== Try to use an unregistered option. (ERROR EXPECTED: 'color' not registered)\n");
   {
   xbt_cfg_t myset=make_set();
-  TRYEXPECT(mismatch_error,xbt_cfg_set_parse(myset,"color:blue"));
+  TRY {
+    xbt_cfg_set_parse(myset,"color:blue");
+    THROW1(mismatch_error,0,"Found an option which shouldn't be there (%s)","color:blue");
+  } CATCH(e) {
+    if (e.category != not_found_error)
+      RETHROW;
+    xbt_ex_free(e);
+  }
   /* This spits an error: 'color' not registered */
   xbt_cfg_free(&myset);
   }