- logger in utils

- allocator in utils
- tests.c -> testcases/testcases.c

31 files changed, 51 insertions, 44 deletions

diff --git a/Source/charon/testcases/event_queue_test.c b/Source/charon/testcases/event_queue_test.c
index 05ff372e2..35638cd77 100644
--- a/Source/charon/testcases/event_queue_test.c
+++ b/Source/charon/testcases/event_queue_test.c
@@ -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"
 
 /**
diff --git a/Source/charon/testcases/event_queue_test.h b/Source/charon/testcases/event_queue_test.h
index 87367f120..4ac099b43 100644
--- a/Source/charon/testcases/event_queue_test.h
+++ b/Source/charon/testcases/event_queue_test.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
diff --git a/Source/charon/testcases/generator_test.c b/Source/charon/testcases/generator_test.c
index 98903c9d0..cabe55181 100644
--- a/Source/charon/testcases/generator_test.c
+++ b/Source/charon/testcases/generator_test.c
@@ -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[];
diff --git a/Source/charon/testcases/generator_test.h b/Source/charon/testcases/generator_test.h
index 38f01296d..43d3575d3 100644
--- a/Source/charon/testcases/generator_test.h
+++ b/Source/charon/testcases/generator_test.h
@@ -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
diff --git a/Source/charon/testcases/ike_sa_id_test.c b/Source/charon/testcases/ike_sa_id_test.c
index 997d4e997..55832265e 100644
--- a/Source/charon/testcases/ike_sa_id_test.c
+++ b/Source/charon/testcases/ike_sa_id_test.c
@@ -21,7 +21,7 @@
  */
  
 #include "ike_sa_id_test.h"
-#include "../tester.h"
+
 #include "../ike_sa_id.h"
 
 /* 
diff --git a/Source/charon/testcases/ike_sa_id_test.h b/Source/charon/testcases/ike_sa_id_test.h
index 3f2820cbf..157fab038 100644
--- a/Source/charon/testcases/ike_sa_id_test.h
+++ b/Source/charon/testcases/ike_sa_id_test.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
diff --git a/Source/charon/testcases/ike_sa_manager_test.c b/Source/charon/testcases/ike_sa_manager_test.c
index a2c4873c3..f2f8c97f0 100644
--- a/Source/charon/testcases/ike_sa_manager_test.c
+++ b/Source/charon/testcases/ike_sa_manager_test.c
@@ -25,8 +25,8 @@
 #include <unistd.h>
 
 #include "ike_sa_manager_test.h"
+
 #include "../types.h"
-#include "../tester.h"
 #include "../ike_sa_manager.h"
 
 
diff --git a/Source/charon/testcases/ike_sa_manager_test.h b/Source/charon/testcases/ike_sa_manager_test.h
index c449445cc..416bb81f3 100644
--- a/Source/charon/testcases/ike_sa_manager_test.h
+++ b/Source/charon/testcases/ike_sa_manager_test.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
diff --git a/Source/charon/testcases/ike_sa_test.c b/Source/charon/testcases/ike_sa_test.c
index 894eafac9..e052fd632 100644
--- a/Source/charon/testcases/ike_sa_test.c
+++ b/Source/charon/testcases/ike_sa_test.c
@@ -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"
diff --git a/Source/charon/testcases/ike_sa_test.h b/Source/charon/testcases/ike_sa_test.h
index 4d5dff614..f6e708f8a 100644
--- a/Source/charon/testcases/ike_sa_test.h
+++ b/Source/charon/testcases/ike_sa_test.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
diff --git a/Source/charon/testcases/job_queue_test.c b/Source/charon/testcases/job_queue_test.c
index 5e6010f56..52f7169ce 100644
--- a/Source/charon/testcases/job_queue_test.c
+++ b/Source/charon/testcases/job_queue_test.c
@@ -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"
 
 
diff --git a/Source/charon/testcases/job_queue_test.h b/Source/charon/testcases/job_queue_test.h
index c6af6c26b..42c9253ce 100644
--- a/Source/charon/testcases/job_queue_test.h
+++ b/Source/charon/testcases/job_queue_test.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
diff --git a/Source/charon/testcases/linked_list_test.c b/Source/charon/testcases/linked_list_test.c
index cf393fb78..4ab43af9b 100644
--- a/Source/charon/testcases/linked_list_test.c
+++ b/Source/charon/testcases/linked_list_test.c
@@ -21,8 +21,9 @@
  */
 
 #include <string.h>
+
+#include "linked_list_test.h"
  
-#include "../tester.h"
 #include "../utils/linked_list.h"
  
  /*
diff --git a/Source/charon/testcases/linked_list_test.h b/Source/charon/testcases/linked_list_test.h
index 59aecdc55..3d977d7f1 100644
--- a/Source/charon/testcases/linked_list_test.h
+++ b/Source/charon/testcases/linked_list_test.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
diff --git a/Source/charon/testcases/packet_test.c b/Source/charon/testcases/packet_test.c
index f2cb22887..4646648e6 100644
--- a/Source/charon/testcases/packet_test.c
+++ b/Source/charon/testcases/packet_test.c
@@ -21,9 +21,11 @@
  */
 
 #include <string.h>
+
 #include "packet_test.h"
-#include "../allocator.h"
+
 #include "../packet.h"
+#include "../utils/allocator.h"
 
 
 /*
diff --git a/Source/charon/testcases/packet_test.h b/Source/charon/testcases/packet_test.h
index 4a4eb8ffc..f667d5381 100644
--- a/Source/charon/testcases/packet_test.h
+++ b/Source/charon/testcases/packet_test.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
diff --git a/Source/charon/testcases/parser_test.c b/Source/charon/testcases/parser_test.c
index 9ad77fc53..29a0111a4 100644
--- a/Source/charon/testcases/parser_test.c
+++ b/Source/charon/testcases/parser_test.c
@@ -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[];
diff --git a/Source/charon/testcases/parser_test.h b/Source/charon/testcases/parser_test.h
index 055fd38f6..dc952ef87 100644
--- a/Source/charon/testcases/parser_test.h
+++ b/Source/charon/testcases/parser_test.h
@@ -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);
diff --git a/Source/charon/testcases/receiver_test.c b/Source/charon/testcases/receiver_test.c
index d83581e5b..0a3a524ae 100644
--- a/Source/charon/testcases/receiver_test.c
+++ b/Source/charon/testcases/receiver_test.c
@@ -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
diff --git a/Source/charon/testcases/receiver_test.h b/Source/charon/testcases/receiver_test.h
index a4f0ea4c5..85c518b36 100644
--- a/Source/charon/testcases/receiver_test.h
+++ b/Source/charon/testcases/receiver_test.h
@@ -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
diff --git a/Source/charon/testcases/scheduler_test.c b/Source/charon/testcases/scheduler_test.c
index ba312fcc0..4186d9c62 100644
--- a/Source/charon/testcases/scheduler_test.c
+++ b/Source/charon/testcases/scheduler_test.c
@@ -24,6 +24,7 @@
 #include <unistd.h>
 
 #include "scheduler_test.h"
+
 #include "../globals.h"
 #include "../scheduler.h"
 #include "../queues/event_queue.h"
diff --git a/Source/charon/testcases/scheduler_test.h b/Source/charon/testcases/scheduler_test.h
index 6f0c1fc6d..baf7ce24d 100644
--- a/Source/charon/testcases/scheduler_test.h
+++ b/Source/charon/testcases/scheduler_test.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
diff --git a/Source/charon/testcases/send_queue_test.c b/Source/charon/testcases/send_queue_test.c
index 29aac883b..00a067204 100644
--- a/Source/charon/testcases/send_queue_test.c
+++ b/Source/charon/testcases/send_queue_test.c
@@ -23,7 +23,7 @@
 #include <pthread.h>
 
 #include "send_queue_test.h"
-#include "../tester.h"
+
 #include "../queues/send_queue.h"
 
 
diff --git a/Source/charon/testcases/send_queue_test.h b/Source/charon/testcases/send_queue_test.h
index 60b9306c0..81b6ff2dd 100644
--- a/Source/charon/testcases/send_queue_test.h
+++ b/Source/charon/testcases/send_queue_test.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
diff --git a/Source/charon/testcases/sender_test.c b/Source/charon/testcases/sender_test.c
index 67ba5573c..8617686f7 100644
--- a/Source/charon/testcases/sender_test.c
+++ b/Source/charon/testcases/sender_test.c
@@ -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
diff --git a/Source/charon/testcases/sender_test.h b/Source/charon/testcases/sender_test.h
index 5af51613e..1ee782f72 100644
--- a/Source/charon/testcases/sender_test.h
+++ b/Source/charon/testcases/sender_test.h
@@ -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
diff --git a/Source/charon/testcases/socket_test.c b/Source/charon/testcases/socket_test.c
index 127390394..2dfcf432e 100644
--- a/Source/charon/testcases/socket_test.c
+++ b/Source/charon/testcases/socket_test.c
@@ -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
diff --git a/Source/charon/testcases/socket_test.h b/Source/charon/testcases/socket_test.h
index f3ae83714..2911f104d 100644
--- a/Source/charon/testcases/socket_test.h
+++ b/Source/charon/testcases/socket_test.h
@@ -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
diff --git a/Source/charon/testcases/testcases.c b/Source/charon/testcases/testcases.c
index eb3990fda..a2e12da36 100644
--- a/Source/charon/testcases/testcases.c
+++ b/Source/charon/testcases/testcases.c
@@ -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"
diff --git a/Source/charon/testcases/thread_pool_test.c b/Source/charon/testcases/thread_pool_test.c
index d54a79e79..e0c0e24a2 100644
--- a/Source/charon/testcases/thread_pool_test.c
+++ b/Source/charon/testcases/thread_pool_test.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 
 #include "thread_pool_test.h"
-#include "../tester.h"
+
 #include "../thread_pool.h"
 
 /*
diff --git a/Source/charon/testcases/thread_pool_test.h b/Source/charon/testcases/thread_pool_test.h
index 9639fc062..a05146a8b 100644
--- a/Source/charon/testcases/thread_pool_test.h
+++ b/Source/charon/testcases/thread_pool_test.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