summaryrefslogtreecommitdiff
path: root/cesar/cp2/cco/bw/test
diff options
context:
space:
mode:
authorboure2008-07-01 13:51:21 +0000
committerboure2008-07-01 13:51:21 +0000
commit64c74f869cb87ea693bc2b913dd200e1bc049b0b (patch)
tree53427fd2ef43bc637fbb9d05cfda639cfa30b8c1 /cesar/cp2/cco/bw/test
parent0ee8bcd15d773a52c97eb90843d171e97b7e370e (diff)
modified priority heaps of the connection from dynamic to static
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@2507 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/cp2/cco/bw/test')
-rw-r--r--cesar/cp2/cco/bw/test/src/bw_prio_heap_test.c97
1 files changed, 21 insertions, 76 deletions
diff --git a/cesar/cp2/cco/bw/test/src/bw_prio_heap_test.c b/cesar/cp2/cco/bw/test/src/bw_prio_heap_test.c
index 70769ab3c3..76089bcc56 100644
--- a/cesar/cp2/cco/bw/test/src/bw_prio_heap_test.c
+++ b/cesar/cp2/cco/bw/test/src/bw_prio_heap_test.c
@@ -43,34 +43,19 @@ void
test_case_bw_prio_heap_init (test_t test, cp_t *cp)
{
- cp_cco_bw_prio_heap_t *heap[4];
-
test_case_begin (test, "Init prio heaps");
cp_pwl_init(cp);
cp_cco_bw_init(cp);
- heap[3] = PARENT_OF(cp_cco_bw_prio_heap_t,
- node,
- list_begin(&cp->bw.prio_heap));
- heap[2] = PARENT_OF(cp_cco_bw_prio_heap_t,
- node,
- list_next(&heap[3]->node));
- heap[1] = PARENT_OF(cp_cco_bw_prio_heap_t,
- node,
- list_next(&heap[2]->node));
- heap[0] = PARENT_OF(cp_cco_bw_prio_heap_t,
- node,
- list_next(&heap[1]->node));
-
test_begin(test,"Init prio heaps"){
- test_fail_if(heap[3]->nb_conn_allocated != 0,
+ test_fail_if(cp->bw.prio_heap[3].nb_conn_allocated != 0,
"There shouldn't be any connection allocated") ;
- test_fail_if(heap[3]->nb_conn != 0,
+ test_fail_if(cp->bw.prio_heap[3].nb_conn != 0,
"There shouldn't be any connection");
- test_fail_if(heap[3]->table_priority_level != 3,
+ test_fail_if(cp->bw.prio_heap[3].table_priority_level != 3,
"The priority is false");
- test_fail_if(heap[1]->table_priority_level != 1,
+ test_fail_if(cp->bw.prio_heap[1].table_priority_level != 1,
"The heaps aren't well linked");
}
test_end;
@@ -81,7 +66,6 @@ test_case_bw_prio_heap_init (test_t test, cp_t *cp)
*
*
*/
-
void
test_case_bw_prio_heap_uninit (test_t test, cp_t *cp)
{
@@ -91,8 +75,6 @@ test_case_bw_prio_heap_uninit (test_t test, cp_t *cp)
cp_cco_bw_uninit(cp);
test_begin(test,"Init prio heaps"){
- test_fail_if(!list_empty(&cp->bw.prio_heap),
- "The list should be empty ");
test_fail_if(!blk_check_memory(),
"Memory allocation pb");
}
@@ -103,26 +85,11 @@ void
test_case_bw_prio_heap_add_conns (test_t test, cp_t *cp)
{
- cp_cco_bw_prio_heap_t *heap[4];
u8 cid[3][4];
u8 prio[4];
int i;
int j;
-
- heap[3] = PARENT_OF(cp_cco_bw_prio_heap_t,
- node,
- list_begin(&cp->bw.prio_heap));
- heap[2] = PARENT_OF(cp_cco_bw_prio_heap_t,
- node,
- list_next(&heap[3]->node));
- heap[1] = PARENT_OF(cp_cco_bw_prio_heap_t,
- node,
- list_next(&heap[2]->node));
- heap[0] = PARENT_OF(cp_cco_bw_prio_heap_t,
- node,
- list_next(&heap[1]->node));
-
test_case_begin (test, "Add connections into prio heaps");
for(i=0;i<4;i++){
@@ -135,13 +102,21 @@ test_case_bw_prio_heap_add_conns (test_t test, cp_t *cp)
cp_cco_bw_prio_heap_add_conn(cp,cid[j][i],prio[i]);
test_begin(test,"add connection into prio heaps"){
- test_fail_if(PARENT_OF(cp_cco_bw_prio_conn_t,node,list_begin(&heap[3]->conns))->cid != 30,
+ test_fail_if(PARENT_OF(cp_cco_bw_prio_conn_t,
+ node,
+ list_begin(&cp->bw.prio_heap[3].conns))->cid != 30,
"failure add : cid prio 3 conn 0");
- test_fail_if(PARENT_OF(cp_cco_bw_prio_conn_t,node,list_next(list_begin(&heap[2]->conns)))->cid != 21,
+ test_fail_if(PARENT_OF(cp_cco_bw_prio_conn_t,
+ node,
+ list_next(list_begin(&cp->bw.prio_heap[2].conns)))->cid != 21,
"failure add :cid prio 2 conn 1");
- test_fail_if(PARENT_OF(cp_cco_bw_prio_conn_t,node,list_next(list_next(list_begin(&heap[1]->conns))))->cid != 12,
+ test_fail_if(PARENT_OF(cp_cco_bw_prio_conn_t,
+ node,
+ list_next(list_next(list_begin(&cp->bw.prio_heap[1].conns))))->cid != 12,
"failure add :cid prio 1 conn 2");
- test_fail_if(PARENT_OF(cp_cco_bw_prio_conn_t,node,list_next(list_next(list_begin(&heap[0]->conns))))->cid != 2,
+ test_fail_if(PARENT_OF(cp_cco_bw_prio_conn_t,
+ node,
+ list_next(list_next(list_begin(&cp->bw.prio_heap[0].conns))))->cid != 2,
"failure add :cid prio 0 conn 2");
}
test_end;
@@ -153,24 +128,8 @@ test_case_bw_prio_heap_del_conns (test_t test)
cp_t cp;
- cp_cco_bw_prio_heap_t *heap[4];
-
test_case_bw_prio_heap_init(test, &cp);
- heap[3] = PARENT_OF(cp_cco_bw_prio_heap_t,
- node,
- list_begin(&cp.bw.prio_heap));
- heap[2] = PARENT_OF(cp_cco_bw_prio_heap_t,
- node,
- list_next(&heap[3]->node));
- heap[1] = PARENT_OF(cp_cco_bw_prio_heap_t,
- node,
- list_next(&heap[2]->node));
- heap[0] = PARENT_OF(cp_cco_bw_prio_heap_t,
- node,
- list_next(&heap[1]->node));
-
-
test_case_bw_prio_heap_add_conns (test, &cp);
test_case_begin (test, "\nDel connections into prio heaps\n\n");
@@ -199,19 +158,19 @@ test_case_bw_prio_heap_del_conns (test_t test)
test_begin(test,"Del connection into prio heaps"){
test_fail_if(PARENT_OF(cp_cco_bw_prio_conn_t,
node,
- list_begin(&heap[3]->conns))->cid != 35,
+ list_begin(&cp.bw.prio_heap[3].conns))->cid != 35,
"failure remove all conn + add 1st");
test_fail_if(PARENT_OF(cp_cco_bw_prio_conn_t,
node,
- list_begin(&heap[2]->conns))->cid !=25,
+ list_begin(&cp.bw.prio_heap[2].conns))->cid !=25,
"failure add 1 remove all");
test_fail_if(PARENT_OF(cp_cco_bw_prio_conn_t,
node,
- list_next(list_next(list_begin(&heap[1]->conns))))->cid != 12,
+ list_next(list_next(list_begin(&cp.bw.prio_heap[1].conns))))->cid != 12,
"failure remove last add last");
test_fail_if(PARENT_OF(cp_cco_bw_prio_conn_t,
node,
- list_next(list_next(list_begin(&heap[0]->conns))))->cid != 0,
+ list_next(list_next(list_begin(&cp.bw.prio_heap[0].conns))))->cid != 0,
"failure remove first add last");
}
test_end;
@@ -224,25 +183,10 @@ test_case_bw_prio_get_most_prior_conn (test_t test)
{
cp_t cp;
- cp_cco_bw_prio_heap_t *heap[4];
-
cp_cco_bw_prio_conn_t* most_prior_conn[5];
test_case_bw_prio_heap_init(test, &cp);
- heap[3] = PARENT_OF(cp_cco_bw_prio_heap_t,
- node,
- list_begin(&cp.bw.prio_heap));
- heap[2] = PARENT_OF(cp_cco_bw_prio_heap_t,
- node,
- list_next(&heap[3]->node));
- heap[1] = PARENT_OF(cp_cco_bw_prio_heap_t,
- node,
- list_next(&heap[2]->node));
- heap[0] = PARENT_OF(cp_cco_bw_prio_heap_t,
- node,
- list_next(&heap[1]->node));
-
test_case_begin(test, "\nGet most prior conn");
most_prior_conn[0] = cp_cco_bw_prio_heap_get_most_prior_conn(&cp);
@@ -336,6 +280,7 @@ test_case_bw_prio_get_conn(test_t test)
{
cp_t cp;
cp_cco_bw_prio_conn_t *conn;
+
test_case_bw_prio_heap_init(test, &cp);
cp_cco_bw_prio_heap_add_conn(&cp,10,0);