From aeddb30f87ea957e7e780705c099e849c6d7e27d Mon Sep 17 00:00:00 2001
From: Michiharu Ariza <ariza@adobe.com>
Date: Mon, 18 Mar 2019 18:11:00 -0700
Subject: [PATCH] replaced tt var api test with a composite glyph

for better coverage
---
 .../SourceSansVariable-Roman-nohvar-41,C1.ttf | Bin 0 -> 4696 bytes
 .../fonts/SourceSansVariable-Roman.abc.ttf    | Bin 3168 -> 0 bytes
 test/api/test-ot-metrics-tt-var.c             |  36 +++++++++---------
 3 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 test/api/fonts/SourceSansVariable-Roman-nohvar-41,C1.ttf
 delete mode 100644 test/api/fonts/SourceSansVariable-Roman.abc.ttf

diff --git a/test/api/fonts/SourceSansVariable-Roman-nohvar-41,C1.ttf b/test/api/fonts/SourceSansVariable-Roman-nohvar-41,C1.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..dc237e7904d6137cb9343c7e1418782ac8b241da
GIT binary patch
literal 4696
zcmbVPduUu)8UN0`lX>MelUK8A%-%loShtxbY4gsOnV6K8%_iAQHdR?_Ze}K#Y39Xb
z+9Zo;LJKRkE=3oNMd}}2q#{ajSCq0YS<%oxmQo+k{!v6kWRXy1(Xz;H;_o~6OeTq0
z8$03N^S#ga_?>eJ2_h<`Mbat#;&@>6xrYs1kbI1%cQ|;Y^-Dcj8<FS)KM@=Yj1{|o
z|5xzK;NLgTo0)~$#4m`nF!=gV!c2=v?I++bgO5)^|JwST6Z}W)KOJ9~`pu*Fe@vu*
z0sJ4Pq4#{_trv-GY49u2h#9VY>u<NfcY<$^Lg0R_;5Jb~Gx$T%M0Vc3L?htGz<c7U
zkV&`b66_CycPGsGG}Q<Vdd|m4nu*AFh7bM-{6(Uox6`TF?8a}Ym8gv48^pB}IZ30M
z*=#1o%zSh@i$zFXk$hKKoS*zCMCz!xigfW0x=jTTUDCLk7pzsBp;l1~X`!y`HeJ)u
zJ@j_VFVNpN3^qXTX%9E-P~I0_r1E_>5r5R)z+%9IGvLgKDzKt@(&nb4S>YmzWzD#7
zLhpgJlLl#mvh;OYmewTP$cyCjZ>$`FM3LYQfk%FpOcN#Iip7h6Dj5k6*TTGpt}5R$
z?H!BPjZImFj*c?VtE^AOV_TWMCLEv;Og&6FR%nG~<f^kzm7Uu6%|qX+pKAK~v3LCB
zmvR}2yHz7&SgRX+KiQ}es~xLAUg+M&26(w{tZW42J`hk5zoad%Tzx=2oXLCY(WJcx
zdV&7h$<4jZ^-b19!i7%CK8iwtsN6wOEK2a^zLg3O!gII0q6`%37UiPC>WHWWGA1DP
zV4ga;aKg%{lIW;+zqf9GL&HHw$I*_C{rmKCU3m2gadUl942F-}{C->enf2eDnZJ5f
zOfGA0d=fWqo;`c*l^Zu;;1(sHe4tgYe~7G+nOH~cV)7zt`O)%&dVPJvLA%|dceL%V
zbg$K{9k^6kS7s}#tGs+d)Nv?rxi|6r^NHT|>{?9?x+i1kLt4G;g#(CYtcr~X+A2l$
zA)bZa(6O(o<b0L3>Y1;Gl6*LQuh3bx<EP-6ul?-a!k0^X|3$j~0UO-==%sSCes;Zg
z{ZG!cegnK+PJ$KEPrl#9Ecu7iLeEe)W<0XUm_G(yUt0@@{dC3o>ypOC{>H|q@A&DW
zv$OqSdri$GjVxX8oIH7Vb@gs{_wie|j!)9n$*UJhdN;wld~NmBu@!Pv)zlnn>HbPZ
zMN<>`mlnmNM@vOFufMsx{O0wWbj{(owj>@|UOeeVtrk`nL^nvzqm=U~x$7Cbpg%a!
z{g)-teaJ8K*YB_Y9oNP(>g#o;Wi2q>{MocLO=wPX^Fy@pKw8-73b2_Z#}0d&#C(_b
zQzd6ST3urFI>2$qkO@6YpHZ}Ji%kLUvwkJFQ#GAev=<0`-J)@4*y-Dfb|a_nD!P!K
zrt69>g8eTQT@0-LO3@|x97HMYqkBs3L5ChH+KYW3DY}eoI3qG=QBD;&8x~zb1;Roa
z;dE4r=TMQb;WndH;a9YvM$N8hjY>41qIDY8dKHa(VAH06!rJRfZl`ALLq$7iML(cu
z;7R|pqFq#N!_6)CEu>akE`G6Y*d~;`gpN5D740Rr<84JhMYWE1EgA)NIvyxmP_?r{
z(Hd1a4=Y-yDyOOo=c>v%uH*$&=8P-aPPNXjD%z3X3wL{w^Lt9}0)0c#Zp2slh(bE%
zyshL#<aU0n=wkYuOZ5<Q*z6%@=W{hH8xMJ0XB6$FW>-?tW#n{SQ*=2sx_+SO3Ua&d
zD7q5y?*~)oGNFhOG?TN&xS5HWlkv!CWcpm(%(VELTbq0MBiCbDu~E*ZX*88Elh6+L
z4U9)Jv$0gtupFYPY$%mH&z!HNxvM8(&O}n#smOf9X!W)E+S}T?+CMFx40<{e!xcU-
zpUs$qOy!NGx+$;ORlTcFl@yF5Vw0(OcxT9*yl)pB%lhJGXlAFA6w(jLz`1Rv7CZ(u
zZE~HU0u-hcO;QAOkQQhbU-t+luo`p<H%JKD45j7Ul)5l9jT8l)g}j@N;BQX;`N-Ui
z=98WY=$@s+@R*|*?4zJY5q}m>2De89_6D6m^dz(f4Ix4TQp2c5HYqv>s}Mzur|>P<
z!oxBM%cRV598?C;O;izwFUOyTXI#o#;Mpvz??J8o)JMbAvn^IG(#|+dh?GJ$ypQEO
z4DSINNBj(Sj>)VIbTz+26tb+WJc;UZI-l%(7ou>q8Thl+6xMk>JR2Xi;c3Uajk>UI
zt#vQ?ZM8R$8Bfo|lSQUH6P_q{X$G<sc7D>i$IuIo8kKp!434L2O)&_{LWs3{68j#(
zZW+0!<-;^1>Kr^dw-|h9QTdaga0I*YlnqSPhxbVpb??Z`0`F;LFot@pp5>9q9i2js
zbFyzdCCeg?6^KOsjA2GE*TNm<+H#!<;_M89AC~dCXZgs3+amDU*bPyPDq~A#+xN|7
zV*+I+;xX1O^lv?BjDQp9?MqmBGTm6WcV`y0@D$R}@*Eh|ajZPGX-sbz{)0O*$yf4e
zJqjZV-y<A(68*^`gikqVf;Y~004V1>CWzB*;AAlmPTm%$L5*Re!}Ky%gHA&`ioXDE
zh%x8}r0*~!27Mk@L%;xgoRT!h<;)r7L-a+gFF?aK-0cXm%A=9bU>cb+4jH!=USl{f
zX>@||8J6`2K`{#c{|Otwkrg%PJ1bEULi8y-Aw=c*CFQMU;vJEBGBPvBgL|2~ZSp6J
zeK<?5g=cHsMy#L4ZhW(55RuR8G-L~q@m<PjW!&a&0nX@g$oD-FX7YFE*1IWpm*ur1
zviE!!W+cTYDj>Veh&GY!jO-0(%#|f!IRj}>_G}ipS*P$-86gF^b?3!k%~<C?1@JHi
zxg*vM#VFiOIt_oe<H=ZY8CBe4?zYuSo*92%EX<sO&Xn2^P|Db{_8kDOtV{+sW&gVq
zO+fX3`|RC&@0Q!YkX$k2XcFCx1MQE?a;JUY9{qB5eb~hW>SrFiQ{EE)9rADE4!)JU
G{Qd)<{URO!

literal 0
HcmV?d00001

diff --git a/test/api/fonts/SourceSansVariable-Roman.abc.ttf b/test/api/fonts/SourceSansVariable-Roman.abc.ttf
deleted file mode 100644
index f2b141b48f41fdc00f46ccd83cd4d2d0b38c0909..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3168
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
Ha|rT(*t!EV

diff --git a/test/api/test-ot-metrics-tt-var.c b/test/api/test-ot-metrics-tt-var.c
index 13152509d..334f3cd93 100644
--- a/test/api/test-ot-metrics-tt-var.c
+++ b/test/api/test-ot-metrics-tt-var.c
@@ -32,7 +32,7 @@
 static void
 test_extents_tt_var (void)
 {
-  hb_face_t *face = hb_test_open_font_file ("fonts/SourceSansVariable-Roman.abc.ttf");
+  hb_face_t *face = hb_test_open_font_file ("fonts/SourceSansVariable-Roman-nohvar-41,C1.ttf");
   g_assert (face);
   hb_font_t *font = hb_font_create (face);
   hb_face_destroy (face);
@@ -40,23 +40,23 @@ test_extents_tt_var (void)
   hb_ot_font_set_funcs (font);
 
   hb_glyph_extents_t  extents;
-  hb_bool_t result = hb_font_get_glyph_extents (font, 1, &extents);
+  hb_bool_t result = hb_font_get_glyph_extents (font, 2, &extents);
   g_assert (result);
 
-  g_assert_cmpint (extents.x_bearing, ==, 60);
-  g_assert_cmpint (extents.y_bearing, ==, 490);
-  g_assert_cmpint (extents.width, ==, 344);
-  g_assert_cmpint (extents.height, ==, -502);
+  g_assert_cmpint (extents.x_bearing, ==, 10);
+  g_assert_cmpint (extents.y_bearing, ==, 846);
+  g_assert_cmpint (extents.width, ==, 500);
+  g_assert_cmpint (extents.height, ==, -846);
 
   float coords[1] = { 500.0f };
   hb_font_set_var_coords_design (font, coords, 1);
-  result = hb_font_get_glyph_extents (font, 1, &extents);
+  result = hb_font_get_glyph_extents (font, 2, &extents);
   g_assert (result);
 
-  g_assert_cmpint (extents.x_bearing, ==, 49);
-  g_assert_cmpint (extents.y_bearing, ==, 501);
-  g_assert_cmpint (extents.width, ==, 393);
-  g_assert_cmpint (extents.height, ==, -513);
+  g_assert_cmpint (extents.x_bearing, ==, 0);
+  g_assert_cmpint (extents.y_bearing, ==, 875);
+  g_assert_cmpint (extents.width, ==, 551);
+  g_assert_cmpint (extents.height, ==, -875);
 
   hb_font_destroy (font);
 }
@@ -64,7 +64,7 @@ test_extents_tt_var (void)
 static void
 test_advance_tt_var (void)
 {
-  hb_face_t *face = hb_test_open_font_file ("fonts/SourceSansVariable-Roman.abc.ttf");
+  hb_face_t *face = hb_test_open_font_file ("fonts/SourceSansVariable-Roman-nohvar-41,C1.ttf");
   g_assert (face);
   hb_font_t *font = hb_font_create (face);
   hb_face_destroy (face);
@@ -72,24 +72,24 @@ test_advance_tt_var (void)
   hb_ot_font_set_funcs (font);
 
   hb_position_t x, y;
-  hb_font_get_glyph_advance_for_direction(font, 1, HB_DIRECTION_LTR, &x, &y);
+  hb_font_get_glyph_advance_for_direction(font, 2, HB_DIRECTION_LTR, &x, &y);
 
-  g_assert_cmpint (x, ==, 486);
+  g_assert_cmpint (x, ==, 520);
   g_assert_cmpint (y, ==, 0);
 
-  hb_font_get_glyph_advance_for_direction(font, 1, HB_DIRECTION_TTB, &x, &y);
+  hb_font_get_glyph_advance_for_direction(font, 2, HB_DIRECTION_TTB, &x, &y);
 
   g_assert_cmpint (x, ==, 0);
   g_assert_cmpint (y, ==, -1000);
 
   float coords[1] = { 500.0f };
   hb_font_set_var_coords_design (font, coords, 1);
-  hb_font_get_glyph_advance_for_direction(font, 1, HB_DIRECTION_LTR, &x, &y);
+  hb_font_get_glyph_advance_for_direction(font, 2, HB_DIRECTION_LTR, &x, &y);
 
-  g_assert_cmpint (x, ==, 510);
+  g_assert_cmpint (x, ==, 551);
   g_assert_cmpint (y, ==, 0);
 
-  hb_font_get_glyph_advance_for_direction(font, 1, HB_DIRECTION_TTB, &x, &y);
+  hb_font_get_glyph_advance_for_direction(font, 2, HB_DIRECTION_TTB, &x, &y);
 
   g_assert_cmpint (x, ==, 0);
   g_assert_cmpint (y, ==, -1000);