From 283b03521d885384f17e1d34968cdaebab0205a3 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 2 Mar 2016 14:33:07 +0100
Subject: [PATCH] tester: do not reference cunit anymore, use bctoolbox instead

---
 tester/liblinphone_tester.c |  8 ++------
 tester/tester.c             | 12 ++++--------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c
index 64cff523d..ff785448a 100644
--- a/tester/liblinphone_tester.c
+++ b/tester/liblinphone_tester.c
@@ -20,9 +20,6 @@
 #include "linphonecore.h"
 #include "private.h"
 #include "liblinphone_tester.h"
-#if HAVE_CU_CURSES
-#include "CUnit/CUCurses.h"
-#endif
 
 #if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
 #pragma GCC diagnostic push
@@ -44,7 +41,6 @@ static FILE * log_file = NULL;
 
 #include <android/log.h>
 #include <jni.h>
-#include <CUnit/Util.h>
 #define CALLBACK_BUFFER_SIZE  1024
 
 static JNIEnv *current_env = NULL;
@@ -113,10 +109,10 @@ JNIEXPORT jint JNICALL Java_org_linphone_tester_Tester_run(JNIEnv *env, jobject
 	}
 	current_env = env;
 	current_obj = obj;
-	CU_set_trace_handler(cunit_android_trace_handler);
+	bc_set_trace_handler(cunit_android_trace_handler);
 	ret = main(argc, argv);
 	current_env = NULL;
-	CU_set_trace_handler(NULL);
+	bc_set_trace_handler(NULL);
 	for (i=0; i<argc; i++) {
 		free(argv[i]);
 	}
diff --git a/tester/tester.c b/tester/tester.c
index b919bf32f..966d655f5 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -20,17 +20,13 @@
 #include "linphonecore.h"
 #include "private.h"
 #include "liblinphone_tester.h"
+#include <bctoolbox/tester.h>
 
 #if __clang__ || ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
 #pragma GCC diagnostic push
 #endif
 #pragma GCC diagnostic ignored "-Wstrict-prototypes"
 
-#include "CUnit/TestRun.h"
-#include "CUnit/Automated.h"
-#if HAVE_CU_CURSES
-#include "CUnit/CUCurses.h"
-#endif
 #ifdef HAVE_GTK
 #include <gtk/gtk.h>
 #endif
@@ -270,7 +266,7 @@ bool_t transport_supported(LinphoneTransportType transport) {
 void linphone_core_manager_init(LinphoneCoreManager *mgr, const char* rc_file) {
 	char *rc_path = NULL;
 	char *hellopath = bc_tester_res("sounds/hello8000.wav");
-	mgr->number_of_cunit_error_at_creation = CU_get_number_of_failures();
+	mgr->number_of_cunit_error_at_creation =  bc_get_number_of_failures();
 	mgr->v_table.registration_state_changed=registration_state_changed;
 	mgr->v_table.auth_info_requested=auth_info_requested;
 	mgr->v_table.call_state_changed=call_state_changed;
@@ -368,7 +364,7 @@ void linphone_core_manager_start(LinphoneCoreManager *mgr, int check_for_proxies
 		mgr->identity = linphone_address_clone(linphone_proxy_config_get_identity_address(proxy));
 		linphone_address_clean(mgr->identity);
 	}
-	
+
 	if (linphone_core_get_stun_server(mgr->lc) != NULL){
 		/*before we go, ensure that the stun server is resolved, otherwise all ice related test will fail*/
 		BC_ASSERT_TRUE(wait_for_stun_resolution(mgr));
@@ -410,7 +406,7 @@ void linphone_core_manager_uninit(LinphoneCoreManager *mgr) {
 		int unterminated_calls;
 
 		if (!liblinphone_tester_keep_record_files && record_file){
-			if ((CU_get_number_of_failures()-mgr->number_of_cunit_error_at_creation)>0) {
+			if ((bc_get_number_of_failures()-mgr->number_of_cunit_error_at_creation)>0) {
 				ms_message ("Test has failed, keeping recorded file [%s]",record_file);
 			} else {
 				unlink(record_file);