From 0576253a340243eb8e4feabb3481f354a82a11a1 Mon Sep 17 00:00:00 2001
From: Michiharu Ariza <ariza@adobe.com>
Date: Tue, 19 Mar 2019 12:34:03 -0700
Subject: [PATCH] add gvar & HVAR retain-gids test cases

---
 ...SourceSansVariable-Roman.ac.retaingids.ttf | Bin 0 -> 3040 bytes
 test/api/test-subset-gvar.c                   |  22 +++++++++++++++++
 test/api/test-subset-hvar.c                   |  23 ++++++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 test/api/fonts/SourceSansVariable-Roman.ac.retaingids.ttf

diff --git a/test/api/fonts/SourceSansVariable-Roman.ac.retaingids.ttf b/test/api/fonts/SourceSansVariable-Roman.ac.retaingids.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..a77d9da93a1e9df9be50cf0e68757564b059153c
GIT binary patch
literal 3040
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
B)<6IN

literal 0
HcmV?d00001

diff --git a/test/api/test-subset-gvar.c b/test/api/test-subset-gvar.c
index 84cd48394..991be8f83 100644
--- a/test/api/test-subset-gvar.c
+++ b/test/api/test-subset-gvar.c
@@ -68,6 +68,27 @@ test_subset_gvar (void)
   hb_face_destroy (face_ac);
 }
 
+static void
+test_subset_gvar_retaingids (void)
+{
+  hb_face_t *face_abc = hb_test_open_font_file ("fonts/SourceSansVariable-Roman.abc.ttf");
+  hb_face_t *face_ac = hb_test_open_font_file ("fonts/SourceSansVariable-Roman.ac.retaingids.ttf");
+
+  hb_set_t *codepoints = hb_set_create ();
+  hb_face_t *face_abc_subset;
+  hb_set_add (codepoints, 'a');
+  hb_set_add (codepoints, 'c');
+  hb_subset_input_t *input = hb_subset_test_create_input (codepoints);
+  hb_subset_input_set_retain_gids (input, true);
+  face_abc_subset = hb_subset_test_create_subset (face_abc, input);
+  hb_set_destroy (codepoints);
+
+  hb_subset_test_check (face_ac, face_abc_subset, HB_TAG ('g','v','a','r'));
+
+  hb_face_destroy (face_abc_subset);
+  hb_face_destroy (face_abc);
+  hb_face_destroy (face_ac);
+}
 
 int
 main (int argc, char **argv)
@@ -76,6 +97,7 @@ main (int argc, char **argv)
 
   hb_test_add (test_subset_gvar_noop);
   hb_test_add (test_subset_gvar);
+  hb_test_add (test_subset_gvar_retaingids);
 
   return hb_test_run ();
 }
diff --git a/test/api/test-subset-hvar.c b/test/api/test-subset-hvar.c
index 0e60cc932..0cc0a17e7 100644
--- a/test/api/test-subset-hvar.c
+++ b/test/api/test-subset-hvar.c
@@ -68,6 +68,28 @@ test_subset_HVAR (void)
   hb_face_destroy (face_ac);
 }
 
+static void
+test_subset_HVAR_retaingids (void)
+{
+  hb_face_t *face_abc = hb_test_open_font_file ("fonts/SourceSansVariable-Roman.abc.ttf");
+  hb_face_t *face_ac = hb_test_open_font_file ("fonts/SourceSansVariable-Roman.ac.retaingids.ttf");
+
+  hb_set_t *codepoints = hb_set_create ();
+  hb_face_t *face_abc_subset;
+  hb_set_add (codepoints, 'a');
+  hb_set_add (codepoints, 'c');
+  hb_subset_input_t *input = hb_subset_test_create_input (codepoints);
+  hb_subset_input_set_retain_gids (input, true);
+  face_abc_subset = hb_subset_test_create_subset (face_abc, input);
+  hb_set_destroy (codepoints);
+
+  hb_subset_test_check (face_ac, face_abc_subset, HB_TAG ('H','V','A','R'));
+
+  hb_face_destroy (face_abc_subset);
+  hb_face_destroy (face_abc);
+  hb_face_destroy (face_ac);
+}
+
 
 int
 main (int argc, char **argv)
@@ -76,6 +98,7 @@ main (int argc, char **argv)
 
   hb_test_add (test_subset_HVAR_noop);
   hb_test_add (test_subset_HVAR);
+  hb_test_add (test_subset_HVAR_retaingids);
 
   return hb_test_run ();
 }