fill the tree before manually removing elements form it + cosmetics

[simgrid.git] / testsuite / xbt / dict_usage.c

diff --git a/testsuite/xbt/dict_usage.c b/testsuite/xbt/dict_usage.c
index c91e580..82a9149 100644 (file)
--- a/testsuite/xbt/dict_usage.c
+++ b/testsuite/xbt/dict_usage.c
@@ -96,14 +96,12 @@ static gras_error_t traverse(gras_dict_t *head) {
   return no_error;
 }
 
-void parse_log_opt(int argc, char **argv,const char *deft);
-
 int main(int argc,char **argv) {
   gras_error_t errcode;
   gras_dict_t *head=NULL;
   char *data;
 
-  parse_log_opt(argc,argv,"dict.thresh=debug");
+  gras_init_defaultlog(&argc,argv,"dict.thresh=verbose");
    
   printf("\nGeneric dictionnary: USAGE test:\n");
 
@@ -113,7 +111,9 @@ int main(int argc,char **argv) {
   TRYFAIL(fill(&head));
   printf(" Free the dictionnary\n");
   gras_dict_free(&head);
-
+  printf(" Free the dictionnary again\n");
+  gras_dict_free(&head);
+  
   TRYFAIL(fill(&head));
 
   printf(" - Change some values\n");
@@ -153,7 +153,7 @@ int main(int argc,char **argv) {
 
   printf(" Free the dictionnary (twice)\n");
   gras_dict_free(&head);
-  gras_dict_free(&head); // frees it twice to see if it triggers an error
+  gras_dict_free(&head);
 
   printf(" - Traverse the resulting dictionnary\n");
   TRYFAIL(traverse(head));
@@ -164,9 +164,13 @@ int main(int argc,char **argv) {
   TRYEXPECT(debuged_remove(head,"Does not exist"),mismatch_error);
   TRYFAIL(traverse(head));
 
+  gras_dict_free(&head);
+
+  printf(" - Remove data from the NULL dict (error message expected)\n");
   TRYCATCH(debuged_remove(head,"12345"),mismatch_error);
-  TRYFAIL(traverse(head));
 
+  printf(" - Remove each data manually (traversing the resulting dictionnary each time)\n");
+  TRYFAIL(fill(&head));
   TRYFAIL(debuged_remove(head,"12a"));    TRYFAIL(traverse(head));
   TRYFAIL(debuged_remove(head,"12b"));    TRYFAIL(traverse(head));
   TRYFAIL(debuged_remove(head,"12"));     TRYFAIL(traverse(head));
@@ -177,8 +181,9 @@ int main(int argc,char **argv) {
   TRYFAIL(debuged_remove(head,"123"));    TRYFAIL(traverse(head));
   TRYEXPECT(debuged_remove(head,"12346"),mismatch_error);  TRYFAIL(traverse(head));
   
+  printf(" - Free the dictionnary twice\n");
   gras_dict_free(&head);
   gras_dict_free(&head);
-
+  gras_exit();
   return 0;
 }