aboutsummaryrefslogtreecommitdiffstats
path: root/Source/charon/tests
diff options
context:
space:
mode:
Diffstat (limited to 'Source/charon/tests')
-rw-r--r--Source/charon/tests/event_queue_test.c4
-rw-r--r--Source/charon/tests/job_queue_test.c5
-rw-r--r--Source/charon/tests/linked_list_test.c44
-rw-r--r--Source/charon/tests/scheduler_test.c15
-rw-r--r--Source/charon/tests/send_queue_test.c5
5 files changed, 25 insertions, 48 deletions
diff --git a/Source/charon/tests/event_queue_test.c b/Source/charon/tests/event_queue_test.c
index 28cdf25f4..35e244347 100644
--- a/Source/charon/tests/event_queue_test.c
+++ b/Source/charon/tests/event_queue_test.c
@@ -95,7 +95,6 @@ void test_event_queue(tester_t *tester)
event_queue_test_t testinfos;
pthread_t threads[EVENT_QUEUE_INSERT_THREADS];
int i,j, number_of_total_events;
- int count;
timeval_t current_time, start_time;
testinfos.tester = tester;
@@ -120,8 +119,7 @@ void test_event_queue(tester_t *tester)
pthread_join(threads[i], NULL);
}
- tester->assert_true(tester,(event_queue->get_count(event_queue,&count) == SUCCESS), "get_count call check");
- tester->assert_true(tester,(count == number_of_total_events), "event count check");
+ tester->assert_true(tester,(event_queue->get_count(event_queue) == number_of_total_events), "event count check");
for (i = 0; i < EVENT_QUEUE_TIMES;i++)
{
diff --git a/Source/charon/tests/job_queue_test.c b/Source/charon/tests/job_queue_test.c
index b42512aa0..8ea291b7e 100644
--- a/Source/charon/tests/job_queue_test.c
+++ b/Source/charon/tests/job_queue_test.c
@@ -94,7 +94,7 @@ static void test_job_queue_receiver(job_queue_test_t * testinfo)
*/
void test_job_queue(tester_t *tester)
{
- int value, desired_value, i;
+ int desired_value, i;
int sender_count = 10;
int receiver_count = 2;
pthread_t sender_threads[sender_count];
@@ -132,8 +132,7 @@ void test_job_queue(tester_t *tester)
}
/* the job-queue has to have disered_value count entries! */
- tester->assert_true(tester,(job_queue->get_count(job_queue,&value) == SUCCESS), "get count call check");
- tester->assert_true(tester,(value == desired_value), "get count value check");
+ tester->assert_true(tester,(job_queue->get_count(job_queue) == desired_value), "get count value check");
tester->assert_true(tester,(job_queue->destroy(job_queue) == SUCCESS), "destroy call check");
}
diff --git a/Source/charon/tests/linked_list_test.c b/Source/charon/tests/linked_list_test.c
index 71ee440ce..bba2054c6 100644
--- a/Source/charon/tests/linked_list_test.c
+++ b/Source/charon/tests/linked_list_test.c
@@ -31,71 +31,57 @@
void test_linked_list(tester_t *tester)
{
void *test_value = NULL;
- int count;
linked_list_t *linked_list = linked_list_create();
- linked_list->get_count(linked_list,&count);
- tester->assert_true(tester,(count == 0), "count check");
+
+ tester->assert_true(tester,(linked_list->get_count(linked_list) == 0), "count check");
linked_list->insert_first(linked_list,"one");
- linked_list->get_count(linked_list,&count);
- tester->assert_true(tester,(count == 1), "count check");
+ tester->assert_true(tester,(linked_list->get_count(linked_list) == 1), "count check");
linked_list->insert_first(linked_list,"two");
- linked_list->get_count(linked_list,&count);
- tester->assert_true(tester,(count == 2), "count check");
+ tester->assert_true(tester,(linked_list->get_count(linked_list) == 2), "count check");
linked_list->insert_first(linked_list,"three");
- linked_list->get_count(linked_list,&count);
- tester->assert_true(tester,(count == 3), "count check");
+ tester->assert_true(tester,(linked_list->get_count(linked_list) == 3), "count check");
linked_list->insert_first(linked_list,"four");
- linked_list->get_count(linked_list,&count);
- tester->assert_true(tester,(count == 4), "count check");
+ tester->assert_true(tester,(linked_list->get_count(linked_list) == 4), "count check");
linked_list->insert_first(linked_list,"five");
- linked_list->get_count(linked_list,&count);
- tester->assert_true(tester,(count == 5), "count check");
+ tester->assert_true(tester,(linked_list->get_count(linked_list) == 5), "count check");
tester->assert_true(tester,(linked_list->get_first(linked_list,&test_value) == SUCCESS), "get_first call check");
tester->assert_true(tester,(strcmp((char *) test_value,"five") == 0), "get_first value check");
- linked_list->get_count(linked_list,&count);
- tester->assert_true(tester,(count == 5), "count check");
+ tester->assert_true(tester,(linked_list->get_count(linked_list) == 5), "count check");
tester->assert_true(tester,(linked_list->get_last(linked_list,&test_value) == SUCCESS), "get_last call check");
tester->assert_true(tester,(strcmp((char *) test_value,"one") == 0), "get_last value check");
- linked_list->get_count(linked_list,&count);
- tester->assert_true(tester,(count == 5), "count check");
+ tester->assert_true(tester,( linked_list->get_count(linked_list) == 5), "count check");
tester->assert_true(tester,(linked_list->remove_first(linked_list,&test_value) == SUCCESS), "remove_first call check");
tester->assert_true(tester,(strcmp((char *) test_value,"five") == 0), "remove_first value check");
- linked_list->get_count(linked_list,&count);
- tester->assert_true(tester,(count == 4), "count check");
+ tester->assert_true(tester,(linked_list->get_count(linked_list) == 4), "count check");
tester->assert_true(tester,(linked_list->get_first(linked_list,&test_value) == SUCCESS), "get_first call check");
tester->assert_true(tester,(strcmp((char *) test_value,"four") == 0), "get_first value check");
- linked_list->get_count(linked_list,&count);
- tester->assert_true(tester,(count == 4), "count check");
+ tester->assert_true(tester,(linked_list->get_count(linked_list) == 4), "count check");
tester->assert_true(tester,(linked_list->get_last(linked_list,&test_value) == SUCCESS), "get_last call check");
tester->assert_true(tester,(strcmp((char *) test_value,"one") == 0), "get_last value check");
- linked_list->get_count(linked_list,&count);
- tester->assert_true(tester,(count == 4), "count check");
+ tester->assert_true(tester,(linked_list->get_count(linked_list) == 4), "count check");
tester->assert_true(tester,(linked_list->remove_last(linked_list,&test_value) == SUCCESS), "remove_last call check");
tester->assert_true(tester,(strcmp((char *) test_value,"one") == 0), "remove_last value check");
- linked_list->get_count(linked_list,&count);
- tester->assert_true(tester,(count == 3), "count check");
+ tester->assert_true(tester,(linked_list->get_count(linked_list) == 3), "count check");
tester->assert_true(tester,(linked_list->get_last(linked_list,&test_value) == SUCCESS), "get_last call check");
tester->assert_true(tester,(strcmp((char *) test_value,"two") == 0), "get_last value check");
- linked_list->get_count(linked_list,&count);
- tester->assert_true(tester,(count == 3), "count check");
+ tester->assert_true(tester,(linked_list->get_count(linked_list) == 3), "count check");
tester->assert_true(tester,(linked_list->get_first(linked_list,&test_value) == SUCCESS), "get_first call check");
tester->assert_true(tester,(strcmp((char *) test_value,"four") == 0), "get_first value check");
- linked_list->get_count(linked_list,&count);
- tester->assert_true(tester,(count == 3), "count check");
+ tester->assert_true(tester,(linked_list->get_count(linked_list) == 3), "count check");
tester->assert_true(tester,(linked_list->destroy(linked_list) == SUCCESS), "destroy call check");
}
diff --git a/Source/charon/tests/scheduler_test.c b/Source/charon/tests/scheduler_test.c
index ab89fe053..a67a44603 100644
--- a/Source/charon/tests/scheduler_test.c
+++ b/Source/charon/tests/scheduler_test.c
@@ -39,8 +39,6 @@
void test_scheduler(tester_t *tester)
{
int job_count = 5;
- int job_queue_size;
- int event_queue_size;
job_t *jobs[job_count];
int current;
scheduler_t *scheduler = scheduler_create();
@@ -64,16 +62,13 @@ void test_scheduler(tester_t *tester)
for (current = 0; current < job_count; current++)
{
usleep(400 * 1000);
- global_event_queue->get_count(global_event_queue, &event_queue_size);
- global_job_queue->get_count(global_job_queue, &job_queue_size);
- tester->assert_true(tester, (job_queue_size == current ), "job-queue size before event");
- tester->assert_true(tester, (event_queue_size == job_count - current), "event-queue size before event");
+
+ tester->assert_true(tester, (global_job_queue->get_count(global_job_queue) == current ), "job-queue size before event");
+ tester->assert_true(tester, (global_event_queue->get_count(global_event_queue) == job_count - current), "event-queue size before event");
usleep(100 * 1000);
- global_event_queue->get_count(global_event_queue, &event_queue_size);
- global_job_queue->get_count(global_job_queue, &job_queue_size);
- tester->assert_true(tester, (job_queue_size == current + 1), "job-queue size after event");
- tester->assert_true(tester, (event_queue_size == job_count - current - 1), "event-queue size after event");
+ tester->assert_true(tester, (global_job_queue->get_count(global_job_queue) == current + 1), "job-queue size after event");
+ tester->assert_true(tester, (global_event_queue->get_count(global_event_queue) == job_count - current - 1), "event-queue size after event");
}
/* check job order */
diff --git a/Source/charon/tests/send_queue_test.c b/Source/charon/tests/send_queue_test.c
index 603b6b0d4..fa2bb817f 100644
--- a/Source/charon/tests/send_queue_test.c
+++ b/Source/charon/tests/send_queue_test.c
@@ -97,7 +97,7 @@ static void test_send_queue_receiver(send_queue_test_t * testinfo)
*/
void test_send_queue(tester_t *tester)
{
- int value, desired_value, i;
+ int desired_value, i;
int sender_count = 10;
int receiver_count = 2;
pthread_t sender_threads[sender_count];
@@ -137,7 +137,6 @@ void test_send_queue(tester_t *tester)
/* the send-queue has to have diserd_value count entries*/
- tester->assert_true(tester,(send_queue->get_count(send_queue,&value) == SUCCESS), "get count call check");
- tester->assert_true(tester,(value == desired_value), "count value check");
+ tester->assert_true(tester,(send_queue->get_count(send_queue) == desired_value), "count value check");
tester->assert_true(tester,(send_queue->destroy(send_queue) == SUCCESS), "destroy call check");
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-18 05:12:04 +0000