Re-enable the last integration test.

Author: garretrieger

ift/client/fontations_client.cc

@@ -52,6 +52,19 @@ void ParseGraph(const std::string& text, graph& out) {
   }
 }
 
+void ParseFetched(const std::string& text, btree_set<std::string>& uris_out) {
+  std::stringstream ss(text);
+  std::string marker("    fetching ");
+
+  std::string line;
+  while (getline(ss, line)) {
+    if (line.substr(0, marker.size()) == marker) {
+      std::string uri(line.substr(marker.size()));
+      uris_out.insert(uri);
+    }
+  }
+}
+
 StatusOr<std::string> WriteFontToDisk(const Encoder& encoder,
                                       const FontData& base) {
   char template_str[] = "fontations_client_XXXXXX";
@@ -117,8 +130,9 @@ Status ToGraph(const Encoder& encoder, const FontData& base, graph& out) {
 
 StatusOr<FontData> ExtendWithDesignSpace(
     const Encoder& encoder, const FontData& base,
-    btree_set<uint32_t> codepoints, absl::btree_set<hb_tag_t> feature_tags,
-    flat_hash_map<hb_tag_t, AxisRange> design_space) {
+    btree_set<uint32_t> codepoints, btree_set<hb_tag_t> feature_tags,
+    flat_hash_map<hb_tag_t, AxisRange> design_space,
+    btree_set<std::string>* applied_uris) {
   auto font_path_str = WriteFontToDisk(encoder, base);
   if (!font_path_str.ok()) {
     return font_path_str.status();
@@ -174,14 +188,19 @@ StatusOr<FontData> ExtendWithDesignSpace(
     return r.status();
   }
 
+  if (applied_uris) {
+    ParseFetched(*r, *applied_uris);
+  }
+
   return FontData(make_hb_blob(hb_blob_create_from_file(output.c_str())));
 }
 
 StatusOr<FontData> Extend(const ift::encoder::Encoder& encoder,
                           const common::FontData& ift_font,
                           absl::btree_set<uint32_t> codepoints) {
   absl::flat_hash_map<hb_tag_t, common::AxisRange> design_space;
-  return ExtendWithDesignSpace(encoder, ift_font, codepoints, {}, design_space);
+  return ExtendWithDesignSpace(encoder, ift_font, codepoints, {}, design_space,
+                               nullptr);
 }
 
 }  // namespace ift::client

ift/client/fontations_client.h

@@ -27,12 +27,16 @@ absl::Status ToGraph(const ift::encoder::Encoder& encoder,
 /**
  * Runs 'ift_extend' on the IFT font created by encoder and returns the
  * resulting extended font.
+ *
+ * if non null, applied_uris will be populated with the set of uris that
+ * the client ended up fetching and applying.
  */
 absl::StatusOr<common::FontData> ExtendWithDesignSpace(
     const ift::encoder::Encoder& encoder, const common::FontData& ift_font,
     absl::btree_set<uint32_t> codepoints,
     absl::btree_set<hb_tag_t> feature_tags,
-    absl::flat_hash_map<hb_tag_t, common::AxisRange> design_space);
+    absl::flat_hash_map<hb_tag_t, common::AxisRange> design_space,
+    absl::btree_set<std::string>* applied_uris = nullptr);
 
 absl::StatusOr<common::FontData> Extend(const ift::encoder::Encoder& encoder,
                                         const common::FontData& ift_font,

ift/integration_test.cc

@@ -251,8 +251,6 @@ bool GvarDataMatches(hb_face_t* a, hb_face_t* b, uint32_t codepoint,
 
 // TODO(garretrieger): full expansion test.
 // TODO(garretrieger): test of a woff2 encoded IFT font.
-// TODO(garretrieger): add IFTB only test case.
-// TODO(garretrieger): extension specific url template.
 
 TEST_F(IntegrationTest, TableKeyedOnly) {
   Encoder encoder;
@@ -791,10 +789,9 @@ TEST_F(IntegrationTest, MixedMode_DesignSpaceAugmentation) {
       GvarDataMatches(orig_face.get(), extended_face.get(), chunk3_cp, 7));
 }
 
-/*
 TEST_F(IntegrationTest, MixedMode_DesignSpaceAugmentation_DropsUnusedPatches) {
   Encoder encoder;
-  auto sc = InitEncoderForVfIftb(encoder);
+  auto sc = InitEncoderForVfMixedMode(encoder);
   ASSERT_TRUE(sc.ok()) << sc;
 
   // target paritions: {{0, 1}, {2}, {3, 4}} + add wght axis
@@ -804,65 +801,34 @@ TEST_F(IntegrationTest, MixedMode_DesignSpaceAugmentation_DropsUnusedPatches) {
   sc.Update(encoder.AddExtensionSubsetOfIftbPatches({3, 4}));
   encoder.AddOptionalDesignSpace({{kWght, *AxisRange::Range(100, 900)}});
   encoder.AddIftbUrlTemplateOverride({{kWght, *AxisRange::Range(100, 900)}},
-                                     "vf-0x$2$1");
+                                     "vf-{id}");
 
   ASSERT_TRUE(sc.ok()) << sc;
 
   auto encoded = encoder.Encode();
   ASSERT_TRUE(encoded.ok()) << encoded.status();
+  auto encoded_face = encoded->face();
 
-  auto client = IFTClient::NewClient(std::move(*encoded));
-  ASSERT_TRUE(client.ok()) << client.status();
-
-  // Phase 1
-  client->AddDesiredCodepoints({chunk3_cp, chunk4_cp});
-  sc = client->AddDesiredDesignSpace(kWght, 100, 900);
-  ASSERT_TRUE(sc.ok()) << sc;
-  auto state = client->Process();
-  ASSERT_TRUE(state.ok()) << state.status();
-  ASSERT_EQ(*state, IFTClient::NEEDS_PATCHES);
-
-  auto patches = client->PatchesNeeded();
-  flat_hash_set<std::string> expected_patches = {"0x03", "0x04", "0x06"};
-  ASSERT_EQ(patches, expected_patches);
-  sc = AddPatches(*client, encoder);
-  ASSERT_TRUE(sc.ok()) << sc;
-
-  state = client->Process();
-  ASSERT_TRUE(state.ok()) << state.status();
-  ASSERT_EQ(*state, IFTClient::NEEDS_PATCHES);
-
-  // Phase 2
-  patches = client->PatchesNeeded();
-  expected_patches = {"0x0d"};
-  ASSERT_EQ(patches, expected_patches);
-  sc = AddPatches(*client, encoder);
-  ASSERT_TRUE(sc.ok()) << sc;
-
-  state = client->Process();
-  ASSERT_TRUE(state.ok()) << state.status();
-  ASSERT_EQ(*state, IFTClient::NEEDS_PATCHES);
+  btree_set<std::string> fetched_uris;
+  auto extended = ExtendWithDesignSpace(
+      encoder, *encoded, {chunk3_cp, chunk4_cp}, {},
+      {{kWght, *AxisRange::Range(100, 900)}}, &fetched_uris);
 
-  // Phase 3
-  patches = client->PatchesNeeded();
-  expected_patches = {"vf-0x03", "vf-0x04"};
-  ASSERT_EQ(patches, expected_patches);
-  sc = AddPatches(*client, encoder);
-  ASSERT_TRUE(sc.ok()) << sc;
+  // correspond to ids 3, 4, 6, d
+  btree_set<std::string> expected_uris{"0C", "0G",    "0O",
+                                       "1K", "vf-0C", "vf-0G"};
 
-  state = client->Process();
-  ASSERT_TRUE(state.ok()) << state.status();
-  ASSERT_EQ(*state, IFTClient::READY);
+  ASSERT_EQ(fetched_uris, expected_uris);
 
-  // Checks
+  // TODO check the patches that were used by looking at ift_extend output
+  ASSERT_TRUE(extended.ok()) << extended.status();
+  auto extended_face = extended->face();
 
-  auto face = client->GetFontData().face();
-  ASSERT_GT(FontHelper::GvarData(face.get(), chunk0_gid)->size(), 0);
-  ASSERT_GT(FontHelper::GvarData(face.get(), chunk1_gid)->size(), 0);
-  ASSERT_EQ(FontHelper::GvarData(face.get(), chunk2_gid)->size(), 0);
-  ASSERT_GT(FontHelper::GvarData(face.get(), chunk3_gid)->size(), 0);
-  ASSERT_GT(FontHelper::GvarData(face.get(), chunk4_gid)->size(), 0);
+  ASSERT_GT(FontHelper::GvarData(extended_face.get(), chunk0_gid)->size(), 0);
+  ASSERT_GT(FontHelper::GvarData(extended_face.get(), chunk1_gid)->size(), 0);
+  ASSERT_EQ(FontHelper::GvarData(extended_face.get(), chunk2_gid)->size(), 0);
+  ASSERT_GT(FontHelper::GvarData(extended_face.get(), chunk3_gid)->size(), 0);
+  ASSERT_GT(FontHelper::GvarData(extended_face.get(), chunk4_gid)->size(), 0);
 }
-*/
 
 }  // namespace ift