7 files changed, 7 insertions, 8 deletions

diff --git a/Source/charon/testcases/event_queue_test.c b/Source/charon/testcases/event_queue_test.c
index 6982f4110..e34ac6067 100644
--- a/Source/charon/testcases/event_queue_test.c
+++ b/Source/charon/testcases/event_queue_test.c
@@ -133,8 +133,7 @@ void test_event_queue(tester_t *tester)
 			job = event_queue->get(event_queue);
 			gettimeofday(&current_time,NULL);
 			tester->assert_true(tester,((current_time.tv_sec - start_time.tv_sec) == i), "value of entry check");
-			tester->assert_true(tester,(job->destroy(job) == SUCCESS), "job destroy call check");
-
+			job->destroy(job);
 		}
 	}
 
diff --git a/Source/charon/testcases/job_queue_test.c b/Source/charon/testcases/job_queue_test.c
index a8d266a37..25fb830e0 100644
--- a/Source/charon/testcases/job_queue_test.c
+++ b/Source/charon/testcases/job_queue_test.c
@@ -80,7 +80,7 @@ static void test_job_queue_receiver(job_queue_test_t * testinfo)
 		job_t *job;
 		job = testinfo->job_queue->get(testinfo->job_queue);
 		testinfo->tester->assert_true(testinfo->tester,(job->get_type(job) == INITIATE_IKE_SA), "job type check");
-		testinfo->tester->assert_true(testinfo->tester,(job->destroy(job) == SUCCESS), "job destroy call check");
+		job->destroy(job);
 	}
 }
 
diff --git a/Source/charon/testcases/packet_test.c b/Source/charon/testcases/packet_test.c
index e5f871681..28a90be58 100644
--- a/Source/charon/testcases/packet_test.c
+++ b/Source/charon/testcases/packet_test.c
@@ -46,7 +46,7 @@ void test_packet(tester_t *tester)
 	strcpy(packet->data.ptr,string_to_copy);
 
 	tester->assert_true(tester,(packet != NULL),"NULL pointer check");
-	tester->assert_true(tester,(packet->clone(packet,&packet2) == SUCCESS),"clone call check");
+	packet2 = packet->clone(packet);
 
 	tester->assert_false(tester,(packet->data.ptr == packet2->data.ptr),"value pointer check");
 	
diff --git a/Source/charon/testcases/receiver_test.c b/Source/charon/testcases/receiver_test.c
index 0d01617bc..af3265096 100644
--- a/Source/charon/testcases/receiver_test.c
+++ b/Source/charon/testcases/receiver_test.c
@@ -75,7 +75,7 @@ void test_receiver(tester_t *tester)
 		job = global_job_queue->get(global_job_queue);
 		tester->assert_true(tester, (job->get_type(job) == INCOMING_PACKET), "job type check");
 		
-		((incoming_packet_job_t *)(job))->get_packet((incoming_packet_job_t *)(job),&received_packet);
+		received_packet = ((incoming_packet_job_t *)(job))->get_packet((incoming_packet_job_t *)(job));
 		tester->assert_true(tester, (received_packet->data.len == (sizeof(int))), "received data length check");
 		tester->assert_true(tester, (i == *((int *)(received_packet->data.ptr))), "received data value check");
 		received_packet->destroy(received_packet);
diff --git a/Source/charon/testcases/scheduler_test.c b/Source/charon/testcases/scheduler_test.c
index eb8a860f0..e8ba827f4 100644
--- a/Source/charon/testcases/scheduler_test.c
+++ b/Source/charon/testcases/scheduler_test.c
@@ -81,7 +81,7 @@ void test_scheduler(tester_t *tester)
 		incoming_packet_job_t *current_job;
 		current_job = (incoming_packet_job_t*) jobs[current];
 		packet_t *packet;
-		current_job->get_packet(current_job,&packet);
+		packet = current_job->get_packet(current_job);
 		
 		tester->assert_true(tester, (((int)packet) == current+1), "job order");
 		jobs[current]->destroy(jobs[current]);
diff --git a/Source/charon/testcases/send_queue_test.c b/Source/charon/testcases/send_queue_test.c
index df72eef06..35f6ebfd6 100644
--- a/Source/charon/testcases/send_queue_test.c
+++ b/Source/charon/testcases/send_queue_test.c
@@ -88,7 +88,7 @@ static void test_send_queue_receiver(send_queue_test_t * testinfo)
 
 		testinfo->tester->assert_true(testinfo->tester,(	packet != NULL), "packet not NULL call check");
 
-		testinfo->tester->assert_true(testinfo->tester,(	packet->destroy(packet) == SUCCESS), "packet destroy call check");
+		packet->destroy(packet);
 	}
 }
 
diff --git a/Source/charon/testcases/socket_test.c b/Source/charon/testcases/socket_test.c
index 823d2d5cb..03117c555 100644
--- a/Source/charon/testcases/socket_test.c
+++ b/Source/charon/testcases/socket_test.c
@@ -65,6 +65,6 @@ void test_socket(tester_t *tester)
 		pkt->destroy(pkt);
    	}
 
-	tester->assert_true(tester, (skt->destroy(skt) == SUCCESS), "socket destroy call check");
+	skt->destroy(skt);
 
 }