Update test programs. All now succeed.

[trust_router.git] / common / tests / mq_test.c

diff --git a/common/tests/mq_test.c b/common/tests/mq_test.c
index b1c4be7..5c04b37 100644 (file)
--- a/common/tests/mq_test.c
+++ b/common/tests/mq_test.c
@@ -60,7 +60,7 @@ int main(void)
   mq->notify_cb_arg=mq_name;
 
   msg1=tr_mq_msg_new(NULL,"Message 1", TR_MQ_PRIO_NORMAL);
-  assert(asprintf((char **)&(msg2->p), "First message.\n")!=-1);
+  assert(asprintf((char **)&(msg1->p), "First message.\n")!=-1);
   msg1->p_free=free;
   tr_mq_add(mq, msg1);
   assert(mq->head==msg1);
@@ -76,7 +76,7 @@ int main(void)
   assert(mq->tail==msg2);
   assert(msg2->next==NULL);
 
-  msg=tr_mq_pop(mq);
+  msg=tr_mq_pop(mq, NULL);
   assert(msg==msg1);
   assert(mq->head==msg2);
   assert(mq->tail==msg2);
@@ -88,7 +88,7 @@ int main(void)
     printf("no message to pop\n");
   
   msg3=tr_mq_msg_new(NULL, "Message 3", TR_MQ_PRIO_NORMAL);
-  assert(asprintf("%s",(char **)&(msg3->p), "Third message.\n")!=-1);
+  assert(asprintf((char **)&(msg3->p), "%s", "Third message.\n")!=-1);
   msg3->p_free=free;
   tr_mq_add(mq, msg3);
   assert(mq->head==msg2);
@@ -96,7 +96,7 @@ int main(void)
   assert(msg2->next==msg3);
   assert(msg3->next==NULL);
 
-  msg=tr_mq_pop(mq);
+  msg=tr_mq_pop(mq, NULL);
   assert(msg==msg2);
   assert(mq->head==msg3);
   assert(mq->tail==msg3);
@@ -107,7 +107,7 @@ int main(void)
   } else
     printf("no message to pop\n");
   
-  msg=tr_mq_pop(mq);
+  msg=tr_mq_pop(mq, NULL);
   assert(msg==msg3);
   assert(mq->head==NULL);
   assert(mq->tail==NULL);
@@ -117,7 +117,7 @@ int main(void)
   } else
     printf("no message to pop\n");
   
-  msg=tr_mq_pop(mq);
+  msg=tr_mq_pop(mq, NULL);
   assert(msg==NULL);
   assert(mq->head==NULL);
   assert(mq->tail==NULL);
@@ -128,14 +128,14 @@ int main(void)
     printf("no message to pop\n");
 
   msg4=tr_mq_msg_new(NULL, "Message 4", TR_MQ_PRIO_NORMAL);
-  assert(asprintf("%s",(char **)&(msg4->p), "Fourth message.\n")!=-1);
+  assert(asprintf((char **)&(msg4->p), "%s", "Fourth message.\n")!=-1);
   msg4->p_free=free;
   tr_mq_add(mq, msg4);
   assert(mq->head==msg4);
   assert(mq->tail==msg4);
   assert(msg4->next==NULL);
 
-  msg=tr_mq_pop(mq);
+  msg=tr_mq_pop(mq, NULL);
   assert(msg==msg4);
   assert(mq->head==NULL);
   assert(mq->tail==NULL);
@@ -145,7 +145,7 @@ int main(void)
   } else
     printf("no message to pop\n");
   
-  msg=tr_mq_pop(mq);
+  msg=tr_mq_pop(mq, NULL);
   assert(msg==NULL);
   assert(mq->head==NULL);
   assert(mq->tail==NULL);
@@ -157,5 +157,6 @@ int main(void)
 
   tr_mq_free(mq);
 
+  printf("success\n");
   return 0;
 }