X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ff021a73f0cd26b2f27ca729783aa486393f9b3a..16ba86f08c16aca21dc67f3083a63e22f6389d02:/testsuite/xbt/dynar_int.c

diff --git a/testsuite/xbt/dynar_int.c b/testsuite/xbt/dynar_int.c
index 51e3e989f1..aa8b8fe430 100644
--- a/testsuite/xbt/dynar_int.c
+++ b/testsuite/xbt/dynar_int.c
@@ -12,19 +12,42 @@
 #include <gras.h>
 
 #define NB_ELEM 5000
+GRAS_LOG_NEW_DEFAULT_CATEGORY(test);
 
 int main(int argc,char *argv[]) {
    gras_dynar_t *d;
    gras_error_t errcode;
    int i,cpt,cursor;
    
-   //   TRYFAIL(gras_log_control_set("root.thresh=debug dynar.thresh=info"));
-   TRYFAIL(gras_log_control_set("root.thresh=info"));
-   fprintf(stderr,"==== Push %d int, set them again 3 times, traverse them, shift them\n",NB_ELEM);
+   gras_init_defaultlog(&argc,argv,"dynar.thresh=debug");
+
+   fprintf(stderr,"==== Traverse the empty dynar\n");
+   TRYFAIL(gras_dynar_new(&d,sizeof(int),NULL));
+   gras_dynar_foreach(d,cursor,i){
+     fprintf(stderr,
+	     "Damnit, there is something in the empty dynar\n");
+     abort();
+   }
+   gras_dynar_free(d);
+
+   fprintf(stderr,
+	   "==== Push %d int, set them again 3 times, traverse them, shift them\n",
+	   NB_ELEM);
    TRYFAIL(gras_dynar_new(&d,sizeof(int),NULL));
    for (cpt=0; cpt< NB_ELEM; cpt++) {
      TRYFAIL(gras_dynar_push(d,&cpt));
-     //     fprintf (stderr,"Push %d, length=%d \n",cpt, gras_dynar_length(d));
+     //fprintf (stderr,"Push %d, length=%d \n",cpt, gras_dynar_length(d));
+   }
+   for (cursor=0; cursor< NB_ELEM; cursor++) {
+     gras_dynar_get(d,cursor,&cpt);
+     gras_assert2(cursor == cpt,
+		  "The retrieved value is not the same than the injected one (%d!=%d)",
+		  cursor,cpt);
+   }
+   gras_dynar_foreach(d,cursor,cpt){
+     gras_assert2(cursor == cpt,
+     		  "The retrieved value is not the same than the injected one (%d!=%d)",
+     		  cursor,cpt);
    }
    for (cpt=0; cpt< NB_ELEM; cpt++) {
      TRYFAIL(gras_dynar_set(d,cpt,&cpt));
@@ -144,5 +167,6 @@ int main(int argc,char *argv[]) {
    }
    gras_dynar_free(d);
 
+   gras_exit();
    return 0;
 }