From ec15c74fa546d5af23d92040b2e8fce6b5271df4 Mon Sep 17 00:00:00 2001
From: isn <isn@opencascade.com>
Date: Fri, 16 Oct 2015 15:41:28 +0300
Subject: [PATCH] test_merge_faces() // circles

---
 src/HYDRO_tests/reference_data/_cs13.png      | Bin 0 -> 5643 bytes
 src/HYDRO_tests/reference_data/_cs23.png      | Bin 0 -> 5643 bytes
 src/HYDRO_tests/reference_data/cs11_c.png     | Bin 0 -> 6678 bytes
 src/HYDRO_tests/reference_data/cs12_c.png     | Bin 0 -> 5431 bytes
 src/HYDRO_tests/reference_data/cs14_c.png     | Bin 0 -> 5655 bytes
 src/HYDRO_tests/reference_data/cs21_c.png     | Bin 0 -> 6720 bytes
 src/HYDRO_tests/reference_data/cs22_c.png     | Bin 0 -> 5431 bytes
 src/HYDRO_tests/reference_data/cs24_c.png     | Bin 0 -> 5655 bytes
 src/HYDRO_tests/reference_data/ff1.brep       |  41 +++++++
 src/HYDRO_tests/reference_data/ff2.brep       |  41 +++++++
 src/HYDRO_tests/reference_data/ff3.brep       |  41 +++++++
 .../test_HYDROData_LandCoverMap.cxx           | 106 +++++++++++++++++-
 src/HYDRO_tests/test_HYDROData_LandCoverMap.h |   6 +-
 13 files changed, 228 insertions(+), 7 deletions(-)
 create mode 100644 src/HYDRO_tests/reference_data/_cs13.png
 create mode 100644 src/HYDRO_tests/reference_data/_cs23.png
 create mode 100644 src/HYDRO_tests/reference_data/cs11_c.png
 create mode 100644 src/HYDRO_tests/reference_data/cs12_c.png
 create mode 100644 src/HYDRO_tests/reference_data/cs14_c.png
 create mode 100644 src/HYDRO_tests/reference_data/cs21_c.png
 create mode 100644 src/HYDRO_tests/reference_data/cs22_c.png
 create mode 100644 src/HYDRO_tests/reference_data/cs24_c.png
 create mode 100644 src/HYDRO_tests/reference_data/ff1.brep
 create mode 100644 src/HYDRO_tests/reference_data/ff2.brep
 create mode 100644 src/HYDRO_tests/reference_data/ff3.brep

diff --git a/src/HYDRO_tests/reference_data/_cs13.png b/src/HYDRO_tests/reference_data/_cs13.png
new file mode 100644
index 0000000000000000000000000000000000000000..1745487f1256efc39d77a3eaa8349564f91b291b
GIT binary patch
literal 5643
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
YjW&lnet7LsbV_L0(#+QM2E#4#UkEL$<^TWy

literal 0
HcmV?d00001

diff --git a/src/HYDRO_tests/reference_data/_cs23.png b/src/HYDRO_tests/reference_data/_cs23.png
new file mode 100644
index 0000000000000000000000000000000000000000..1745487f1256efc39d77a3eaa8349564f91b291b
GIT binary patch
literal 5643
zcmeHKXH-+$wq7ZaP$a>FCZducDsU8OA}9nxXrTxJxr(SXA#wl}!9q2g-qeGFA~r(k
zDpC}cDk>lfN<c0uiU>qOrAU*az+K5Xde1xW{dr@&fA8)wlAXQtt+~GWt-0o$D}iNe
zu}D&05&*Esl4<Gy0EP+x+6FHU-=H-g%)uKrkYVYFhgTThGaf!m_%n9~0w7Z-{GiUR
zlUWYHl0r*UW5=LNLtT6Fz1|1ozD)T&tve@qntxwXLMPJ!Yh6-alw973XvriDY4{B3
z#cz|tns|Gxynccd!<R}w*A^)=eHL{;Fc&`*lT8vU)0ntHRokjlzbTsDXGYzBwUYFF
zXhq=HN6x-QlgH<e@6g^G@YUJ(-sc&kmXN8<%2-J2KiB^|1v*PpW&!i_*v*Xeskw!)
zk0q2{x=WUqu4NQ&0M1J4<R|F-m;47BOT?5<zUeT=ccAGv0-B_Q?UfJuWCpAwny9Yt
z%lD#1yKMzFh3A@+N$<xRmhjGblq7hxUDiR-Nn??3g0i$atnNEmXqG<-DOLa#$)p{P
zC&GgFYVq9sIvg}h6gK((Mg!NCv^!Er!K3Wexo&=Ww<A4h@Ou&zCsw^YRmE(ox1+b7
zxBX45-Wh)TqTE&nYpSKorX{V6;K{l^i>V8VSML|0<LzAPdREz)wl<pB#?)P4s^^Jb
zH%2v|KP9EFWu|1OniQ{dnv#hYFkJ+e>=P|wD-(G3vFFX|E~rGgp&U|3Udg1sLyC8@
zy;FS?86LD$>tayy_=MKuq@i*Iqbfg1&PsM7OcK}EwtJed6x91~*lm|+UL7m9_;aR9
zq!{^PbAC$IK#SOCW~;YF8Z>arq!_$TCJiN%y2@G0RaOi+Z)aYQJ1Vi1O9*b=lwNWr
z>1J%NF@8s4d|7QI3)OL&G^nh7F3|oQ%K+ILE%{}9g0NmmT_(WztGym#7%fSRoR2u*
z+3=4IrYt>V2*1QTO(D`yP`_lWE7lA{PGUve9#DK~{yDvM@bS78wQ|mcCEgJVk(#$I
zk+xpB`v7HA@SYWM;Uk5->soMYyXCqSbelqPsdgseeyVd*65Dor4{-2SbL5(b;61!m
z)i3DT$6%NRIdIGXg_#-CoIj6ULZFh=q9xlI3v{cpezP*=Jb$qHD$S95corAn;LCOl
zc1Xk}S2~-BS><x57CIlyjwojbft-9zN3LlIE?~zl7so)YL>!CP$q=*3;&4}&d73X#
z&I|%;uB~BlH_qa$98K7A95jSP$)m-rcpR>0&OY;2Tu~6vQKhlCa<e!eRsdTr_?;w<
zb?ppB%!(VwU7N!;KZGmv2W9JYSkz-7cppa(cC!NofQ)R*$kFnm{C_0)R^}%Z)JaKe
zI40PYQ7vY1&MXJETp%|Q$LF0viv?tJxNCAe&1G=~K|pQY8WvR-LL3=vPY#lZqc4j<
zZ*Dc>m%h<f`W&^*0Ni*&V^K-7xJG^LQkq6R<{kGEMl68KL9PWnJ+Yo(H42>6UeF`j
zCkXzmQ|YI>P^t>x;(M}6@|k(m_9iv$(k<kA47c(PTFjx<sFuCiE4DjYhNZHVbeF(2
zeI-qm#M3!G%3zNmm9*2ZUU1kLSfxJi*iy&iAoBr@NdkRpA`bA==25Yad)``ZK?MFN
z;KRLwW+i&=(s;1gEo`%2;luU`VsUk9@M%w+X%7Ige3M!|hqu;`@8Ph>sP{9_xM!k}
z)PvWcQR;bc&B?BbRq+)Vo<9I41B!0)s>5oO`{?{+_Q?xQEvz(eOnfhjm{uW0CzXsp
zkipaIr4>`3$;aw>y!EvgC)Q)Yfb{}6RA14*mO_^!Ah+7xK|rsP6Ii4X&64+B+7^Fk
zWa}10MFG%VXK_s5PoaEhL}}v@AaE<~4pSKbV}d)`DcW-w!QQJ?=OO1&0A|~a=q|Yx
z%HdckuI2>;;2<9kWc@@I8lTHe<*p<m;=g?bOs{s7DHjF8KT^1AS&N`H^quYdK?PY~
zJq#-am<?3vp=Dmc-T*wwK91qnpAUA&!MYdE{*0=7t_|GqG;FHZ_0SGTsBdEgsPhCU
zz|)>)q&M6>c1K?5&6fOrQ0D;$#XqT)@_PMMLBT-i$`Sh)sQCLbctAX9O!`#(wAv4#
z-tE0$0&+Kb16h`cXnqqvv=c%yxRzKqt7;taJ{C;maKO?*1o$ItS!6@3AO<C*llubn
zCXhwT`l(||;SL53fazX<a#OV{M4e~!qfCh?0A82E_cjd}8*h`0(CX)a7X)ru&f(nr
zj?w`@yrrq2cJ&|^)#SGV5(mI7<wjuCN+ReOqe>#0%YI@81}~wmk%f=;hl8h!kAl$&
zG(r@hKwrs^d4ajtBk9iD1>z!@(DLElf=ytr(`E!O4=oF4L|TIoiRj{*r4Tb<6DU!8
z8^Qp6qc{-&syqe{0P$%Xs%~Ex3LvU4Q7B;EgIdcM`AhD)8n^hbxCm5Tzb?cTKpdAu
zxC&mzigalJe+mHrPZI$EwEiSi+wuMIM(#S%JST<V^L3?N_Wyp2hhymnYkJ5?=6~ZQ
z!V3X^sLZ{iPW#$-x&0BKr~e(Rk>EvnrSoHIq;TdwmcHXJ)c<Dc51#y_jHB4vO)}Ed
zNHIt(5iY_HNkn+)|G^;*Xf*3fcs8A6jU$Q)9f<rpPUOSB8Ve$_A1)u#N_L1KcD#r@
zi-|`=>L;GU*t#5~Ay!NN$=c2FXcKq;MIS^YAA1P&N{9o+Mhs}!D~x-xSsHFTWbbzP
z=u_k$KSy<ptzM33?q5O2!muf}d{Hh8Yz+y5W`x%tn9JfsI}Om8J&)1Yqz}W)Q@Vs7
zYd94G0~0PRxa|cKOO8Ph+D%d<%>@@se4hIsdtg_0=o@Ga?h_Oi!5EZ?bCVQ<TSI}Y
zmFRyr;Zzx1d$>WO#ECtk4T4liSLY2O;EU#>RbZPo)TxymkSX)}O;eOmDei_(TY#o8
zqIg<^j90g-<Aghv_?Mmfj4$OS-}e?S+eTX@Jl$p&ff^|V$P5C?YuV>3Wuhq8ej?O{
zp5A^CW(#d~xFx}3a%3hACJ~r|e<Ts}E|e@=MASR!cQ@2V=0hC)*DL~+u}GBkf-m&G
zy@f&Z$tM+n>Q*fTuM4>9Fpqg%4Gm~pJ}2z4>}DoW0~S#h5)*{vx2eHBFfX3e2m{Gc
zmN=q2PM8mnTe&qj=<Y_kiN$Z%cQTb4s&!`o4*}UZGMMBP6@BUh!p{^7vl`b!Ue9XZ
zB9j%GBV{l*qtSoO%`wuH_PUVR3e%NP5>bA$QL3*#D`0<JZi~vzvd?0}d~bKP>Wl1p
zB#~?gOTihGDIG0J{3}#Pa<X+x_B+BN(d?a|fR44kOtLhJJUc5u`D6-9jG!B{Y9k7%
znILG`$V}OeVVsK3O2VJ+=z;+Xw{rK`su`I^#s(6WyZX->1}hqvNZEFt{_8MC#qOwX
zVWA`PbmN{cma{k~wL8s?pWK$p$s+#@kXqarGmnyaqN!b~&lNMnzT>Wl!Un*i_eWXv
zF_uN${q+Sk;>`esI?~+uwN^N+3PND@_A1|J-hsQrjR$H?G$wV&&+;vmi0AVbM`8nV
zf0X!gAxL!%lX~oD8z2Nlo{7X-aXDOej;I_br?<i9cQw52Yi<nn%IIP3G?9?A<khUj
zG^~!Qj&`EK0Hm02SzwILX*FU+ozc#EiE(9_BJ!y#R<l;kVb-jpX(t*^Ly*eOj}X*m
z#Nx?oWljI$1VM}cNnFj+f}nym+E?`w=HwQ0<;t)UskS5ZVV|a?tF~-oMHFn9&eIo7
z5Cr)RRr$lw&|BD4iA%JbF3@d#o}T#C&c`SQ+h|s3jMiy0N_H3uwx4{grm_k)XE=#=
zs|C8Gny2}s@?Gez>Mb~(J`JmRE0y&0k~dxwPuyYcjxKv{qLI@v#w$qK139UdEnUr*
zoWtz()lt7-@R2Ad>n2|qD{;$|aG&h_EQxJrfEB}%?V60yYHcRPCp)yWKBfpA-hWGB
zHD8N{4R1_Zw>vsqPL@kBMn^*>m!}^(D^(KBK>Mv?A{lucw`IYHlBG&x84Uam$vD{c
zQvcocZelSz%dUGn5r!78qEp6r`?dDcNO?*z*(>)X#!m8O6w!VrF1Jiv4)-%Avy<C>
znLWh{pVlxD*rIQFoHW0?I704p$O(JB>v19Y#cn=YSu$fDdZYu^iOlj`l@%Q(<yZ;g
z#b%Y1s+U)!^cI_COKT>@>e!1LqqEnlKcT8O^f6A^$Uffogy+6hU=a^CpCJXGS=JY5
ztjvoSDCWVp*=f&1fRmYvz?g0GDCQ(xF+shb=T56j8yCH<Q&#WwKm7}fmAlQkr+8`Z
zwoYf@WZ`0C&8~azp`6PV9&X(KcDQMY_bA<IE%q?v<@FqRTshV3WalENzj#`+-t_*<
zmj7~Ul5Dlov|nFwb1fKPxFjz>=$PrFx;C+1&u1q=(diek?b;e`fmwOgp(Ra)wJLJI
z32w_UikE_bv%A=hNn3)qE!WNFtB4<2E^pW&M&BiX1?fN6|3-oI3jdx5A9cIK#*4l#
zyiV8NcOZPEdg^V+y9iv(`A>IY8)a2J`{|l%_rjC~C455H_LAP{jN>B=0FJ}&(_D{x
zzRExWq+&Nbbu;iixfc)2j_f*6{+^T()SG~_y<!k-I0^e*a5l8>q;AdJmxqMz3$uFA
zs<^>;v$ll;1sc*Q-1!OKK&LxwPXX_hWjL668#+?-_Q;Dpj}BB0-B!Q%ZMbq_`aX{G
zeL(Oyg>!Be^7``%nCy4IG7CEp#C-R+gD>Ri0C0^*Ig%ZexS7FZN(~GMwM0XS<{B+2
z{kWryX=}<uG(b8`DfFWUUP|0Fxmi43E-*roVVk;s7>o^RWXwHS-z@X=!C>G`VvPq$
z*tziij%_mfe)HkDf9Ds-uyC~N-QQZl|FKW{+0WhBI?C&={!qD4bu4Ve=)uz-CSLK4
z|HDNYw8I1ZJW9wwCaEFpa#vT^K^M;4WCkrj(5Sm~;pm6v^j$4iXy4jW><nirNgH-g
zr)j#v7N)To@>zHm*FE!X?w-WlOn(N)|LTj^U0rh@=I<HJPxswBvM@KraliTks=D2J
zO!oRn+{nU6Z%dx-<=L`3-N(Nb7Px$#9_{0l-nlbXSl@lHX6A!>)pT!C_r*_>P{|X`
zNB50CG}1S49Ym_WJdh$h3hL^=5<1+TW1Tjy(%=g<NPlUBRDJFA<&ZxgQFpER-mCPx
zLBOu-!Wp%S$@DAppYs+rbogG;KQ`R-=+w%}(cb!`-|IuR0`QJI(2W^u9lhBTmoXdV
z-<5ac^{a)EqN=ecS>g9OO8h66zuK`mWMV+Qg?;lCobb4RZ(YJZS13&0Y>f<zmQ#&J
zu~P-Xc*Vh?%hPd{zq@=Ndj3s3UVV75DtJrucz8{x?v3)bVZMeL3opVHPCe__Z<^O7
z7*4+%=?ZM2aVn<2T|V}9W+Fz4WSg<&$fxqmeb682U*@Keu*qw8YQp<Y-a9;3pX3_4
zF1jeDyL{NS=zHAjgA3n>;s{f-&f^*11${;fEeizg?r$IM9u{$?du;KFRpZa}Ipg!+
zMi!oT9qXQ37aAJ6u#AE4Z^^jVe@cINdM?c+<Rd?Ps%whWcWDU#{Q9;%Q6CMCyi?j%
zc{4ETUgyDQ>>eB?Ty8$xkkHc7-*Yf411>e+A~H67fjBm?y@<0RdS<5y?nm7J-`>5Z
YjW&lnet7LsbV_L0(#+QM2E#4#UkEL$<^TWy

literal 0
HcmV?d00001

diff --git a/src/HYDRO_tests/reference_data/cs11_c.png b/src/HYDRO_tests/reference_data/cs11_c.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5223cb02a15c2f550e7de940482edd46479722e
GIT binary patch
literal 6678
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

literal 0
HcmV?d00001

diff --git a/src/HYDRO_tests/reference_data/cs12_c.png b/src/HYDRO_tests/reference_data/cs12_c.png
new file mode 100644
index 0000000000000000000000000000000000000000..8358bee8fba9f102e443c0c0d91791e75540332b
GIT binary patch
literal 5431
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

literal 0
HcmV?d00001

diff --git a/src/HYDRO_tests/reference_data/cs14_c.png b/src/HYDRO_tests/reference_data/cs14_c.png
new file mode 100644
index 0000000000000000000000000000000000000000..c993242696cada4a2987cc487e936057d708e38e
GIT binary patch
literal 5655
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
R^HZ5syqRiedBegb;vW_&+M@sf

literal 0
HcmV?d00001

diff --git a/src/HYDRO_tests/reference_data/cs21_c.png b/src/HYDRO_tests/reference_data/cs21_c.png
new file mode 100644
index 0000000000000000000000000000000000000000..58231b66f5c97b0bcd883cf9a437cee3020bf630
GIT binary patch
literal 6720
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
A9{>OV

literal 0
HcmV?d00001

diff --git a/src/HYDRO_tests/reference_data/cs22_c.png b/src/HYDRO_tests/reference_data/cs22_c.png
new file mode 100644
index 0000000000000000000000000000000000000000..8358bee8fba9f102e443c0c0d91791e75540332b
GIT binary patch
literal 5431
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

literal 0
HcmV?d00001

diff --git a/src/HYDRO_tests/reference_data/cs24_c.png b/src/HYDRO_tests/reference_data/cs24_c.png
new file mode 100644
index 0000000000000000000000000000000000000000..c993242696cada4a2987cc487e936057d708e38e
GIT binary patch
literal 5655
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
R^HZ5syqRiedBegb;vW_&+M@sf

literal 0
HcmV?d00001

diff --git a/src/HYDRO_tests/reference_data/ff1.brep b/src/HYDRO_tests/reference_data/ff1.brep
new file mode 100644
index 00000000..ab2aa273
--- /dev/null
+++ b/src/HYDRO_tests/reference_data/ff1.brep
@@ -0,0 +1,41 @@
+DBRep_DrawableShape
+
+CASCADE Topology V1, (c) Matra-Datavision
+Locations 0
+Curve2ds 0
+Curves 1
+2 0 0 0 0 0 1 1 0 -0 -0 1 0 10
+Polygon3D 0
+PolygonOnTriangulations 0
+Surfaces 1
+1 -5.4697605301576938e-016 6.8573650631575423e-016 0 0 0 1 1 0 -0 -0 1 0 
+Triangulations 0
+
+TShapes 4
+Ve
+1e-007
+10 0 0
+0 0
+
+0101101
+*
+Ed
+ 1e-007 1 1 0
+1  1 0 0 6.28318530717959
+0
+
+0101000
++4 0 -4 0 *
+Wi
+
+0101100
++3 0 *
+Fa
+0  1e-007 1 0
+
+1111000
++2 0 *
+
++1 0 
+0
+
diff --git a/src/HYDRO_tests/reference_data/ff2.brep b/src/HYDRO_tests/reference_data/ff2.brep
new file mode 100644
index 00000000..3bb40652
--- /dev/null
+++ b/src/HYDRO_tests/reference_data/ff2.brep
@@ -0,0 +1,41 @@
+DBRep_DrawableShape
+
+CASCADE Topology V1, (c) Matra-Datavision
+Locations 0
+Curve2ds 0
+Curves 1
+2 10 0 0 0 0 1 1 0 -0 -0 1 0 10
+Polygon3D 0
+PolygonOnTriangulations 0
+Surfaces 1
+1 10.000000000000002 6.8573650631575423e-016 0 0 0 1 1 0 -0 -0 1 0 
+Triangulations 0
+
+TShapes 4
+Ve
+1e-007
+20 0 0
+0 0
+
+0101101
+*
+Ed
+ 1e-007 1 1 0
+1  1 0 0 6.28318530717959
+0
+
+0101000
++4 0 -4 0 *
+Wi
+
+0101100
++3 0 *
+Fa
+0  1e-007 1 0
+
+1111000
++2 0 *
+
++1 0 
+0
+
diff --git a/src/HYDRO_tests/reference_data/ff3.brep b/src/HYDRO_tests/reference_data/ff3.brep
new file mode 100644
index 00000000..e7104dcb
--- /dev/null
+++ b/src/HYDRO_tests/reference_data/ff3.brep
@@ -0,0 +1,41 @@
+DBRep_DrawableShape
+
+CASCADE Topology V1, (c) Matra-Datavision
+Locations 0
+Curve2ds 0
+Curves 1
+2 40 0 0 0 0 1 1 0 -0 -0 1 0 10
+Polygon3D 0
+PolygonOnTriangulations 0
+Surfaces 1
+1 39.999999999999993 1.3876045329998471e-016 0 0 0 1 1 0 -0 -0 1 0 
+Triangulations 0
+
+TShapes 4
+Ve
+1e-007
+50 0 0
+0 0
+
+0101101
+*
+Ed
+ 1e-007 1 1 0
+1  1 0 0 6.28318530717959
+0
+
+0101000
++4 0 -4 0 *
+Wi
+
+0101100
++3 0 *
+Fa
+0  1e-007 1 0
+
+1111000
++2 0 *
+
++1 0 
+0
+
diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
index e1589b7b..00630ffd 100644
--- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
+++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015  EDF-R&D
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
@@ -253,7 +253,7 @@ void test_HYDROData_LandCoverMap::test_remove()
   aDoc->Close();
 }
 
-void test_HYDROData_LandCoverMap::test_merge_faces()
+void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
 {
   TopoDS_Shape pp1, pp2, pp3, pp4;
   BRep_Builder BB;
@@ -267,7 +267,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces()
   CPPUNIT_ASSERT(!pp3.IsNull());
   CPPUNIT_ASSERT(!pp4.IsNull());
 
-  //Test mergeFaces() func; USD == true
+  //Test mergeFaces() func // boxes // USD == true
   {
     TopTools_ListOfShape Faces;
     Faces.Append(pp1);
@@ -309,7 +309,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces()
   }
   //
 
-  //Test mergeFaces() func; USD == false
+  //Test mergeFaces() func // boxes // USD == false
   {
     TopTools_ListOfShape Faces;
     Faces.Append(pp1);
@@ -335,7 +335,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces()
     Faces.Append(pp4);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "cs23" );
-   CPPUNIT_ASSERT_IMAGES
+    CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
   {
@@ -350,3 +350,99 @@ void test_HYDROData_LandCoverMap::test_merge_faces()
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
 }
+
+
+void test_HYDROData_LandCoverMap::test_merge_faces_circles()
+{
+  TopoDS_Shape ff1, ff2, ff3;
+  BRep_Builder BB;
+  BRepTools::Read(ff1, (REF_DATA_PATH + "/ff1.brep").toStdString().c_str(), BB);
+  BRepTools::Read(ff2, (REF_DATA_PATH + "/ff2.brep").toStdString().c_str(), BB);
+  BRepTools::Read(ff3, (REF_DATA_PATH + "/ff3.brep").toStdString().c_str(), BB);
+
+  CPPUNIT_ASSERT(!ff1.IsNull());
+  CPPUNIT_ASSERT(!ff2.IsNull());
+  CPPUNIT_ASSERT(!ff3.IsNull());
+
+  //Test mergeFaces() func // circles // USD == true
+  {
+    TopTools_ListOfShape Faces;
+    Faces.Append(ff1);
+    Faces.Append(ff2);
+    TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs11_c" );
+    CPPUNIT_ASSERT_IMAGES
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_FACE);
+  }
+  {
+    TopTools_ListOfShape Faces;
+    Faces.Append(ff1);
+    Faces.Append(ff3);
+    TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs12_c" );
+    CPPUNIT_ASSERT_IMAGES
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+  }
+  {
+    TopTools_ListOfShape Faces;
+    Faces.Append(ff1);
+    Faces.Append(ff2);
+    Faces.Append(ff3);
+    TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "_cs13" );
+    CPPUNIT_ASSERT_IMAGES
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+  }
+  {
+    TopTools_ListOfShape Faces;
+    Faces.Append(ff1);
+    Faces.Append(ff3);
+    Faces.Append(ff2);
+    TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs14_c" );
+    CPPUNIT_ASSERT_IMAGES
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+  }
+  //
+
+  //Test mergeFaces() func // circles // USD == false
+  {
+    TopTools_ListOfShape Faces;
+    Faces.Append(ff1);
+    Faces.Append(ff2);
+    TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs21_c" );
+    CPPUNIT_ASSERT_IMAGES
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+  }
+  {
+    TopTools_ListOfShape Faces;
+    Faces.Append(ff1);
+    Faces.Append(ff3);
+    TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs22_c" );
+    CPPUNIT_ASSERT_IMAGES
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+  }
+  {
+    TopTools_ListOfShape Faces;
+    Faces.Append(ff1);
+    Faces.Append(ff2);
+    Faces.Append(ff3);
+    TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "_cs23" );
+    CPPUNIT_ASSERT_IMAGES
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+  }
+  {
+    TopTools_ListOfShape Faces;
+    Faces.Append(ff1);
+    Faces.Append(ff3);
+    Faces.Append(ff2);
+    TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs24_c" );
+    CPPUNIT_ASSERT_IMAGES
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+  }
+
+}
\ No newline at end of file
diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.h b/src/HYDRO_tests/test_HYDROData_LandCoverMap.h
index ea36880d..a891c39c 100644
--- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.h
+++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.h
@@ -30,7 +30,8 @@ class test_HYDROData_LandCoverMap : public CppUnit::TestFixture
   CPPUNIT_TEST( test_incomplete_split );
   CPPUNIT_TEST( test_merge );
   CPPUNIT_TEST( test_remove );
-  CPPUNIT_TEST( test_merge_faces );
+  CPPUNIT_TEST( test_merge_faces_boxes );
+  CPPUNIT_TEST( test_merge_faces_circles );
   CPPUNIT_TEST_SUITE_END();
 
 public:
@@ -39,7 +40,8 @@ public:
   void test_incomplete_split();
   void test_merge();
   void test_remove();
-  void test_merge_faces();
+  void test_merge_faces_boxes();
+  void test_merge_faces_circles();
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION( test_HYDROData_LandCoverMap );
-- 
2.39.2