- logger in utils

- allocator in utils - tests.c -> testcases/testcases.c
2005-11-11 13:52:11 +00:00
parent b85d20d117
commit 8887824292
64 changed files with 113 additions and 96 deletions
@@ -23,9 +23,9 @@
 #include <stdlib.h>
 #include <pthread.h>

-#include "../allocator.h"
 #include "event_queue_test.h"
-#include "../tester.h"
+
+#include "../utils/allocator.h"
 #include "../queues/event_queue.h"

 /**
@@ -23,7 +23,7 @@
 #ifndef EVENT_QUEUE_TEST_H_
 #define EVENT_QUEUE_TEST_H_

-#include "../tester.h"
+#include "../utils/tester.h"

 /**
 * @brief Test function used to test the event_queue functionality
@@ -22,14 +22,14 @@
 
 #include <string.h>

-#include "../globals.h"
-#include "../allocator.h"
-#include "../logger_manager.h"
 #include "generator_test.h"
-#include "../tester.h"
-#include "../logger.h"
-#include "../encodings.h"
+
+#include "../globals.h"
 #include "../generator.h"
+#include "../utils/allocator.h"
+#include "../utils/logger_manager.h"
+#include "../utils/logger.h"
+#include "../encodings/encodings.h"
 #include "../encodings/ike_header.h"

 extern payload_info_t *payload_infos[];
@@ -23,7 +23,7 @@
 #ifndef GENERATOR_TEST_H_
 #define GENERATOR_TEST_H_

-#include "../tester.h"
+#include "../utils/tester.h"

 /**
 * @brief Test function used to test the generator with unsupported payload
@@ -21,7 +21,7 @@
 */
 
 #include "ike_sa_id_test.h"
-#include "../tester.h"
+
 #include "../ike_sa_id.h"

 /* 
@@ -23,7 +23,7 @@
 #ifndef IKE_SA_ID_TEST_H_
 #define IKE_SA_ID_TEST_H_

-#include "../tester.h"
+#include "../utils/tester.h"

 /**
 * @brief Test function used to test the ike_sa_id functionality
@@ -25,8 +25,8 @@
 #include <unistd.h>

 #include "ike_sa_manager_test.h"
+
 #include "../types.h"
-#include "../tester.h"
 #include "../ike_sa_manager.h"


@@ -23,7 +23,7 @@
 #ifndef IKE_SA_MANAGER_TEST_H_
 #define IKE_SA_MANAGER_TEST_H_

-#include "../tester.h"
+#include "../utils/tester.h"

 /**
 * @brief Test function used to test the ike_sa_manager_t functionality
@@ -21,8 +21,8 @@
 */

 #include "ike_sa_test.h"
+
 #include "../types.h"
-#include "../tester.h"
 #include "../message.h"
 #include "../configuration.h"
 #include "../ike_sa.h"
@@ -23,7 +23,7 @@
 #ifndef IKE_SA_TEST_H_
 #define IKE_SA_TEST_H_

-#include "../tester.h"
+#include "../utils/tester.h"

 /**
 * @brief Test function used to test the ike_sa_t functionality
@@ -25,9 +25,9 @@
 #include <pthread.h>
 #include <unistd.h>

-#include "../allocator.h"
 #include "job_queue_test.h"
-#include "../tester.h"
+
+#include "../utils/allocator.h"
 #include "../queues/job_queue.h"


@@ -23,7 +23,7 @@
 #ifndef JOB_QUEUE_TEST_H_
 #define JOB_QUEUE_TEST_H_

-#include "../tester.h"
+#include "../utils/tester.h"

 /**
 * @brief Test function used to test the job_queue functionality
@@ -21,8 +21,9 @@
 */

 #include <string.h>
+
+#include "linked_list_test.h"
 
-#include "../tester.h"
 #include "../utils/linked_list.h"
 
 /*
@@ -23,7 +23,7 @@
 #ifndef LINKED_LIST_TEST_H_
 #define LINKED_LIST_TEST_H_

-#include "../tester.h"
+#include "../utils/tester.h"

 /**
 * @brief Test function for the type linked_list_t
@@ -21,9 +21,11 @@
 */

 #include <string.h>
+
 #include "packet_test.h"
-#include "../allocator.h"
+
 #include "../packet.h"
+#include "../utils/allocator.h"


 /*
@@ -23,7 +23,7 @@
 #ifndef PACKET_TEST_H_
 #define PACKET_TEST_H_

-#include "../tester.h"
+#include "../utils/tester.h"

 /**
 * @brief Test function used to test the packet_t functionality
@@ -21,13 +21,13 @@
 
 #include <string.h>

-#include "../allocator.h"
 #include "parser_test.h"
-#include "../tester.h"
-#include "../logger_manager.h"
-#include "../encodings.h"
+
 #include "../generator.h"
 #include "../parser.h"
+#include "../utils/allocator.h"
+#include "../utils/logger_manager.h"
+#include "../encodings/encodings.h"
 #include "../encodings/ike_header.h"

 extern payload_info_t *payload_infos[];
@@ -22,7 +22,7 @@
 #ifndef PARSER_TEST_H_
 #define PARSER_TEST_H_

-#include "../tester.h"
+#include "../utils/tester.h"


 void test_parser_with_header_payload(tester_t *tester);
@@ -23,14 +23,16 @@
 #include <string.h>
 #include <unistd.h>

-#include "../allocator.h"
-#include "sender_test.h"
+#include "receiver_test.h"
+
 #include "../globals.h"
 #include "../receiver.h"
 #include "../packet.h"
 #include "../socket.h"
 #include "../queues/send_queue.h"
 #include "../queues/job_queue.h"
+#include "../encodings/encodings.h"
+#include "../utils/allocator.h"

 /**
 * Number of packets to send by sender-thread
@@ -23,7 +23,7 @@
 #ifndef RECEIVER_TEST_H_
 #define RECEIVER_TEST_H_

-#include "../tester.h"
+#include "../utils/tester.h"

 /**
 * @brief Test function for the type receiver_t
@@ -24,6 +24,7 @@
 #include <unistd.h>

 #include "scheduler_test.h"
+
 #include "../globals.h"
 #include "../scheduler.h"
 #include "../queues/event_queue.h"
@@ -23,7 +23,7 @@
 #ifndef SCHEDULER_TEST_H_
 #define SCHEDULER_TEST_H_

-#include "../tester.h"
+#include "../utils/tester.h"

 /**
 * @brief Test function for the type scheduler_t
@@ -23,7 +23,7 @@
 #include <pthread.h>

 #include "send_queue_test.h"
-#include "../tester.h"
+
 #include "../queues/send_queue.h"


@@ -23,7 +23,7 @@
 #ifndef SEND_QUEUE_TEST_H_
 #define SEND_QUEUE_TEST_H_

-#include "../tester.h"
+#include "../utils/tester.h"

 /**
 * @brief Test function used to test the send_queue functionality
@@ -22,14 +22,15 @@

 #include <string.h>

-#include "../allocator.h"
 #include "sender_test.h"
+
 #include "../globals.h"
 #include "../sender.h"
 #include "../packet.h"
 #include "../socket.h"
 #include "../queues/send_queue.h"
 #include "../queues/job_queue.h"
+#include "../utils/allocator.h"

 /**
 * Number of packets to send by sender-thread
@@ -23,7 +23,7 @@
 #ifndef SENDER_TEST_H_
 #define SENDER_TEST_H_

-#include "../tester.h"
+#include "../utils/tester.h"

 /**
 * @brief Test function for the type sender_t
@@ -23,10 +23,10 @@
 #include <stdlib.h>
 #include <string.h>

-#include "../allocator.h"
 #include "socket_test.h"
-#include "../tester.h"
+
 #include "../socket.h"
+#include "../utils/allocator.h"

 /*
 * Description in header file
@@ -23,7 +23,7 @@
 #ifndef SOCKET_TEST_H_
 #define SOCKET_TEST_H_

-#include "../tester.h"
+#include "../utils/tester.h"

 /**
 * @brief Test function for the type socket_t
@@ -23,13 +23,13 @@
 
 #include <stdio.h>

-#include "../logger_manager.h"
-#include "../allocator.h"
-#include "../tester.h"
 #include "../queues/job_queue.h"
 #include "../queues/event_queue.h"
 #include "../queues/send_queue.h"
 #include "../socket.h"
+#include "../utils/logger_manager.h"
+#include "../utils/allocator.h"
+#include "../utils/tester.h"
 #include "linked_list_test.h"
 #include "thread_pool_test.h"
 #include "job_queue_test.h"
@@ -23,7 +23,7 @@
 #include <stdlib.h>

 #include "thread_pool_test.h"
-#include "../tester.h"
+
 #include "../thread_pool.h"

 /*
@@ -23,7 +23,7 @@
 #ifndef THREAD_POOL_TEST_H_
 #define THREAD_POOL_TEST_H_

-#include "../tester.h"
+#include "../utils/tester.h"

 /**
 * @brief Test function for the type thread_pool_t