From 723ee9a1e38f00a44c494bef3bc9f27a6ac7aba1 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Thu, 11 Jan 2018 15:43:25 +0100
Subject: [PATCH] fix(main-db-tester): use resource db file

---
 tester/db/linphone.db     | Bin 4382720 -> 4382720 bytes
 tester/main-db-tester.cpp |  15 +++++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/tester/db/linphone.db b/tester/db/linphone.db
index 473c83f0a7464d3a9ca86e39b1093ffdf83d8056..5f4e2269e70aac7f503a505b8c4b731a16bb19a0 100644
GIT binary patch
delta 1456
zcmZ`&T}&KR6rMA?%<Qs1vlZIuf|SeBrL0SV<)_fv(plQIB7Z3YwQ1s>Wtr+G2+J;@
z_@GeIW1=r23D@{S<AYC{#?*9tv8{jA#?-$?eX#yi>_Zb1iAGY>RK2)Vkzg|4oqN9T
z+&kYn_s-OX=j17Y=ZiO$OOm}>lBAC$N&Zp1x6D@6Z!VX1{t(I&k*qC?QTj}~r7fS?
zgeNt%P#1B5_k{1P55N}^f!DSm*%s`~e#Cw?Z*$&)`m-b8{34&Zes}kHp71{9IqqH7
zZqALeEBrPC2RCZqO@5*p&heW&;aNT&hL_fHmf&V&>+ul$0r@li`Klg^0oCy75ESv#
zJ3zJ4Vvw!U3a9|f9|RSw7t3K9Dm}uF)7~!G+w;Cwt~(!fG1sWa<LURl=9+UYc>~@z
zyf?Lr(lz0xjgQtsT9zd1XfvFY`2)LP(NY623)XjgzzNo|<`olycFLC70N26t*2597
zFai$(8RC)2u#sUWBaaM)43!KA8BQ|t$#9)D+$xqWN|NnEfe!>O3cN4yp1`{T?+CnY
zRi1KR)f}?6C~3cFi=xM0X&#SiE4Cfaq|D*LEbyiC?n04pL(+cJZis|$G~Hz@hE-k7
zxB0=GFo(yo%FCzNydm2y`vthIm8gG8F6FZ1usI%f&O3i~2i=zYmgkb!rd(FfpBZJR
zmA>hbGF1<U<(Y!9#K4f5+cKU=r{jZ(vBbJi`uspoEZQ4mz0uZ=7+a^ZO14VzpCWKj
z$;o_nKNQ`WU)v4^cjmq@6sau%ML!&tc_a*a)w=!Sk#&T0MVzhu=vGC4>=3UFLka(~
z4t86YTA&G(V?~NS(zZhTc_0EU*8E<mlUGjo1+}$A(few0U*YM!P!XMO-=^xppnT%U
znzFO;p;UG(_tD&3`gnta|Cab$4G`e3)`J#n46(khw!?j~D#kKH+4y)S#rmT?2kwvd
zRMyotG=&78og7YXC}hluR5mp-%wG?}7DuSLRMFdmIj0?Ko!n{0s;^IGo@A=-_sh?8
zt|=h5K>Bn8)BIcmlySBj0`9fj@^3}secADWY%-G?FyrZwp;U5`FYSVor?cYn#s865
zYj<}?EZW7ox_enyUq^?iDxEP!QqqiP%%qu`Fb6kEnusS8nL*YWJJ{CO*&BPPS1inN
zadRy3$iJ;>Y+UKos+67F{y!bNue&GKcBqTB$Bwc}e!dA>`Mz@Sxz?1$N9&;QzjdzM
zHt};<>;inRtsUp47!rC2y@VQ}k8l&=U4#XMg@l_4w-D-tTM7MyMTEtKcN3NnZX+xu
zWQ1je0m5>^?Sw(X3c?+Pm4qR}dkDjXRfIbUs|jleYY8KSb%gbV4TOz^y9k>In+bOl
Y?jgLFa4+FL!WP2)ga%>s6>OdQ3j?RY_5c6?

delta 666
zcmW-eO-NKx6vyv*GroB<^WNMU#~Me|`7q6oQOB>+%<&~eRJ2JdLWr|5BB&htgch06
ze^D)z$hWjryH=97O&=~KA?Qn56%j>X1qFs6h}E6o{La1Sf8d<|<&HnQWsGYkt79o4
z{B1&r7eW}{^%<Yab;VPn^>b61u1K!yEGp!>icQjOX~gA3bS_F1ZIWw38UZ0)IUkvj
z0cS0I!C44i3O5J#1Z&MyS<>g}_J&-$Ge5TEZKTPXT^KV+9q6VhQdisP8mY^z6d*O6
zqk2;5X6iIlwvqmjnyIJjhIb`PH@(Lhdg9I0(W9L9VU^4{*06|(q6mGoM$G+|;U6{0
z7a=xgBa7s-r$x~|q<0?lig_CI?%Gb)9H}xBXZLx3TPW#03_1n%pg_Z99;-AHr}viR
z8ZSRUQSWDgEU#cW8Fh4kj*u$$(^pa_`zUCb;bmckm(`a%-7wVq9tx3Pn>nR7od^uo
zn2E#f#&nJn-aFfAP``tYe#~*p=_R;247fhHez;|DO}GKL7Th4*5Zv&bYX>;<O$gtj
z=D8mFQu9jlTJuKpR<ooU@7W)uNpeNVmC|o4OK;_=U9Oc?Ay-Sv4;c>mk~Dg8^vwBl
zri!JVUxO;0c0T>j9Z|3Yj({at-(%o%a2#9#-UQwZPJk=HNpKao8oUKu1Fi+9z-e#>
zoCVi`w}R`z4d89yMsO3j8QcQSfm^|C;C65x+yU+ccY(XXJ>c!&9pGMYA9yFYAG`}Z
Q04{(B!7h0BeI6SB2me^Vb^rhX

diff --git a/tester/main-db-tester.cpp b/tester/main-db-tester.cpp
index c8bc44881..594967d14 100644
--- a/tester/main-db-tester.cpp
+++ b/tester/main-db-tester.cpp
@@ -17,14 +17,15 @@
  */
 
 #include "address/address.h"
-#include "core/core.h"
+#include "core/core-p.h"
 #include "db/main-db.h"
 #include "event-log/events.h"
 
+// TODO: Remove me. <3
 #include "private.h"
 
 #include "liblinphone_tester.h"
-#include "tester_utils.h"
+#include "tools/tester.h"
 
 // =============================================================================
 
@@ -44,23 +45,21 @@ static const string getDatabasePath () {
 class MainDbProvider {
 public:
 	MainDbProvider () {
-		mCoreManager = linphone_core_manager_new("marie_rc");
-		mMainDb = new MainDb(mCoreManager->lc->cppPtr->getSharedFromThis());
-		mMainDb->connect(MainDb::Sqlite3, getDatabasePath());
+		mCoreManager = linphone_core_manager_create("marie_rc");
+		linphone_config_set_string(linphone_core_get_config(mCoreManager->lc), "storage", "uri", getDatabasePath().c_str());
+		linphone_core_manager_start(mCoreManager, false);
 	}
 
 	~MainDbProvider () {
-		delete mMainDb;
 		linphone_core_manager_destroy(mCoreManager);
 	}
 
 	const MainDb &getMainDb () {
-		return *mMainDb;
+		return *L_GET_PRIVATE(mCoreManager->lc->cppPtr)->mainDb;
 	}
 
 private:
 	LinphoneCoreManager *mCoreManager;
-	MainDb *mMainDb;
 };
 
 // -----------------------------------------------------------------------------