[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r10672 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r10672 - gnunet/src/util |
Date: |
Fri, 19 Mar 2010 15:28:12 +0100 |
Author: wachs
Date: 2010-03-19 15:28:12 +0100 (Fri, 19 Mar 2010)
New Revision: 10672
Modified:
gnunet/src/util/test_container_heap.c
Log:
Modified: gnunet/src/util/test_container_heap.c
===================================================================
--- gnunet/src/util/test_container_heap.c 2010-03-19 14:24:26 UTC (rev
10671)
+++ gnunet/src/util/test_container_heap.c 2010-03-19 14:28:12 UTC (rev
10672)
@@ -37,7 +37,6 @@
return GNUNET_OK;
}
-
static int
check ()
{
@@ -48,10 +47,37 @@
struct GNUNET_CONTAINER_HeapNode *n4;
struct GNUNET_CONTAINER_HeapNode *n5;
struct GNUNET_CONTAINER_HeapNode *n6;
+ struct GNUNET_CONTAINER_HeapNode *n7;
+ struct GNUNET_CONTAINER_HeapNode *n8;
myHeap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
+
+ // GNUNET_CONTAINER_heap_remove_root heap empty, taking if-branch
+ n1 = GNUNET_CONTAINER_heap_remove_root (myHeap);
+ GNUNET_assert (NULL == n1);
+
+ // GNUNET_CONTAINER_heap_peek heap empty, taking if-branch
+ n1 = GNUNET_CONTAINER_heap_peek (myHeap);
+ GNUNET_assert (NULL == n1);
+
+ // GNUNET_CONTAINER_heap_walk_get_next: heap empty, taking if-branch
+ n1 = GNUNET_CONTAINER_heap_walk_get_next (myHeap);
+ GNUNET_assert (NULL == n1);
+
n1 = GNUNET_CONTAINER_heap_insert (myHeap, "11", 11);
GNUNET_assert (NULL != n1);
+
+
+ // GNUNET_CONTAINER_heap_peek not empty, taking if-branch
+ n2 = NULL;
+ n2 = GNUNET_CONTAINER_heap_peek (myHeap);
+ GNUNET_assert (NULL != n2);
+
+ // GNUNET_CONTAINER_heap_walk_get_next: 1 element
+ n1 = NULL;
+ n1 = GNUNET_CONTAINER_heap_walk_get_next(myHeap);
+ GNUNET_assert (NULL != n1);
+
GNUNET_CONTAINER_heap_iterate (myHeap, &iterator_callback, NULL);
GNUNET_assert (1 == GNUNET_CONTAINER_heap_get_size (myHeap));
n2 = GNUNET_CONTAINER_heap_insert (myHeap, "78", 78);
@@ -60,12 +86,12 @@
GNUNET_CONTAINER_heap_remove_node (myHeap, n2)));
GNUNET_assert (1 == GNUNET_CONTAINER_heap_get_size (myHeap));
GNUNET_CONTAINER_heap_iterate (myHeap, &iterator_callback, NULL);
-
+
n3 = GNUNET_CONTAINER_heap_insert (myHeap, "15", 5);
GNUNET_CONTAINER_heap_update_cost (myHeap, n3, 15);
GNUNET_assert (2 == GNUNET_CONTAINER_heap_get_size (myHeap));
GNUNET_CONTAINER_heap_iterate (myHeap, &iterator_callback, NULL);
-
+
n4 = GNUNET_CONTAINER_heap_insert (myHeap, "50", 50);
GNUNET_CONTAINER_heap_update_cost (myHeap, n4, 50);
GNUNET_assert (3 == GNUNET_CONTAINER_heap_get_size (myHeap));
@@ -84,7 +110,150 @@
GNUNET_assert (0 == strcmp ("30/200",
GNUNET_CONTAINER_heap_remove_root (myHeap))); /*
n6 */
GNUNET_assert (0 == GNUNET_CONTAINER_heap_get_size (myHeap));
+
GNUNET_CONTAINER_heap_destroy (myHeap);
+
+ // My additions to a complete testcase
+ // Testing a GNUNET_CONTAINER_HEAP_ORDER_MIN
+ // Testing remove_node
+
+ myHeap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
+
+ n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
+ GNUNET_CONTAINER_heap_update_cost (myHeap, n1, 15);
+
+ GNUNET_assert (0 == strcmp ("10", GNUNET_CONTAINER_heap_remove_node
(myHeap,n1)));
+
+ n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
+ n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10);
+
+ GNUNET_CONTAINER_heap_walk_get_next (myHeap);
+ GNUNET_assert (0 == strcmp ("20", GNUNET_CONTAINER_heap_remove_node
(myHeap,n2)));
+ GNUNET_assert (0 == strcmp ("10", GNUNET_CONTAINER_heap_remove_node
(myHeap,n1)));
+
+ n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
+ n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10);
+ n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 10);
+
+ GNUNET_CONTAINER_heap_remove_node (myHeap,n2);
+ GNUNET_CONTAINER_heap_remove_node (myHeap,n1);
+ GNUNET_assert (0 == strcmp ("30", GNUNET_CONTAINER_heap_remove_root
(myHeap)));
+
+ n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
+ n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10);
+ n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 10);
+
+ GNUNET_CONTAINER_heap_remove_node (myHeap,n2);
+ GNUNET_CONTAINER_heap_remove_node (myHeap,n1);
+ GNUNET_assert (0 == strcmp ("30", GNUNET_CONTAINER_heap_remove_node
(myHeap,n3)));
+
+ n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
+ n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 20);
+ n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 30);
+
+ GNUNET_assert (0 == strcmp ("20", GNUNET_CONTAINER_heap_remove_node
(myHeap,n2)));
+ GNUNET_assert (0 == strcmp ("10", GNUNET_CONTAINER_heap_remove_root
(myHeap)));
+ GNUNET_assert (0 == strcmp ("30", GNUNET_CONTAINER_heap_remove_root
(myHeap)));
+
+ n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
+ n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 20);
+ n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 30);
+ n4 = GNUNET_CONTAINER_heap_insert (myHeap, "40", 40);
+ n5 = GNUNET_CONTAINER_heap_insert (myHeap, "50", 50);
+ n6 = GNUNET_CONTAINER_heap_insert (myHeap, "60", 60);
+
+ // Inserting nodes deeper in the tree with lower costs
+ n7 = GNUNET_CONTAINER_heap_insert (myHeap, "70", 10);
+ n8 = GNUNET_CONTAINER_heap_insert (myHeap, "80", 10);
+
+ GNUNET_assert (0 == strcmp ("30", GNUNET_CONTAINER_heap_remove_node
(myHeap,n3)));
+
+ // Cleaning up...
+ GNUNET_assert (0 == strcmp ("60", GNUNET_CONTAINER_heap_remove_node
(myHeap,n6)));
+ GNUNET_assert (0 == strcmp ("50", GNUNET_CONTAINER_heap_remove_node
(myHeap,n5)));
+
+ // Testing heap_walk_get_next
+ GNUNET_CONTAINER_heap_walk_get_next (myHeap);
+ GNUNET_CONTAINER_heap_walk_get_next (myHeap);
+ GNUNET_CONTAINER_heap_walk_get_next (myHeap);;
+ GNUNET_CONTAINER_heap_walk_get_next (myHeap);
+ GNUNET_CONTAINER_heap_walk_get_next (myHeap);
+
+ GNUNET_assert (0 == strcmp ("10", GNUNET_CONTAINER_heap_remove_node
(myHeap,n1)));
+ GNUNET_assert (0 == strcmp ("20", GNUNET_CONTAINER_heap_remove_node
(myHeap,n2)));
+ GNUNET_assert (0 == strcmp ("40", GNUNET_CONTAINER_heap_remove_node
(myHeap,n4)));
+ GNUNET_assert (0 == strcmp ("70", GNUNET_CONTAINER_heap_remove_node
(myHeap,n7)));
+ GNUNET_assert (0 == strcmp ("80", GNUNET_CONTAINER_heap_remove_node
(myHeap,n8)));
+
+ // End Testing remove_node
+
+ // Testing a GNUNET_CONTAINER_HEAP_ORDER_MAX
+ GNUNET_CONTAINER_heap_destroy (myHeap);
+
+ myHeap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MAX);
+
+ n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
+ GNUNET_CONTAINER_heap_update_cost (myHeap, n1, 15);
+
+ GNUNET_assert (0 == strcmp ("10", GNUNET_CONTAINER_heap_remove_node
(myHeap,n1)));
+
+ n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
+ n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10);
+
+ GNUNET_CONTAINER_heap_walk_get_next (myHeap);
+ GNUNET_assert (0 == strcmp ("20", GNUNET_CONTAINER_heap_remove_node
(myHeap,n2)));
+ GNUNET_assert (0 == strcmp ("10", GNUNET_CONTAINER_heap_remove_node
(myHeap,n1)));
+
+ n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
+ n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10);
+ n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 10);
+
+ GNUNET_CONTAINER_heap_remove_node (myHeap,n2);
+ GNUNET_CONTAINER_heap_remove_node (myHeap,n1);
+ GNUNET_assert (0 == strcmp ("30", GNUNET_CONTAINER_heap_remove_root
(myHeap)));
+
+ n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
+ n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 10);
+ n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 10);
+
+ GNUNET_CONTAINER_heap_remove_node (myHeap,n2);
+ GNUNET_CONTAINER_heap_remove_node (myHeap,n1);
+ GNUNET_assert (0 == strcmp ("30", GNUNET_CONTAINER_heap_remove_node
(myHeap,n3)));
+
+ n1 = GNUNET_CONTAINER_heap_insert (myHeap, "10", 10);
+ n2 = GNUNET_CONTAINER_heap_insert (myHeap, "20", 20);
+ n3 = GNUNET_CONTAINER_heap_insert (myHeap, "30", 30);
+ n4 = GNUNET_CONTAINER_heap_insert (myHeap, "40", 40);
+ n5 = GNUNET_CONTAINER_heap_insert (myHeap, "50", 50);
+ n6 = GNUNET_CONTAINER_heap_insert (myHeap, "60", 60);
+
+ // Inserting nodes deeper in the tree with lower costs
+ n7 = GNUNET_CONTAINER_heap_insert (myHeap, "70", 10);
+ n8 = GNUNET_CONTAINER_heap_insert (myHeap, "80", 10);
+
+ GNUNET_assert (0 == strcmp ("30", GNUNET_CONTAINER_heap_remove_node
(myHeap,n3)));
+
+ // Cleaning up...
+ GNUNET_assert (0 == strcmp ("60", GNUNET_CONTAINER_heap_remove_node
(myHeap,n6)));
+ GNUNET_assert (0 == strcmp ("50", GNUNET_CONTAINER_heap_remove_node
(myHeap,n5)));
+
+ // Testing heap_walk_get_next
+ GNUNET_CONTAINER_heap_walk_get_next (myHeap);
+ GNUNET_CONTAINER_heap_walk_get_next (myHeap);
+ GNUNET_CONTAINER_heap_walk_get_next (myHeap);;
+ GNUNET_CONTAINER_heap_walk_get_next (myHeap);
+ GNUNET_CONTAINER_heap_walk_get_next (myHeap);
+
+ GNUNET_assert (0 == strcmp ("10", GNUNET_CONTAINER_heap_remove_node
(myHeap,n1)));
+ GNUNET_assert (0 == strcmp ("20", GNUNET_CONTAINER_heap_remove_node
(myHeap,n2)));
+ GNUNET_assert (0 == strcmp ("40", GNUNET_CONTAINER_heap_remove_node
(myHeap,n4)));
+ GNUNET_assert (0 == strcmp ("70", GNUNET_CONTAINER_heap_remove_node
(myHeap,n7)));
+ GNUNET_assert (0 == strcmp ("80", GNUNET_CONTAINER_heap_remove_node
(myHeap,n8)));
+
+ // End Testing remove_node
+
+ GNUNET_CONTAINER_heap_destroy (myHeap);
+
return 0;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r10672 - gnunet/src/util,
gnunet <=