Test and generalize font configuration parser

tests/FontConfigParser.cpp

Index: tests/FontConfigParser.cpp
diff --git a/tests/FontConfigParser.cpp b/tests/FontConfigParser.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..df2a7cdadcd662ab7181e091f24701d11967464b
--- /dev/null
+++ b/tests/FontConfigParser.cpp
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkFontConfigParser_android.h"
+#include "Test.h"
+
+void ValidateLoadedFonts(SkTDArray<FontFamily*> fontFamilies,
+                         skiatest::Reporter* reporter) {
+SkDebugf(" .. validating:");

[djsollen, 2014/08/04 18:13:36]

remove

[tomhudson, 2014/08/04 21:03:57]

Done.

+    REPORTER_ASSERT(reporter, fontFamilies[0]->fNames.count() == 5);
+    REPORTER_ASSERT(reporter, !strcmp(fontFamilies[0]->fNames[0].c_str(), "sans-serif"));
+    REPORTER_ASSERT(reporter,
+                    !strcmp(fontFamilies[0]->fFontFiles[0].fFileName.c_str(),
+                            "Roboto-Regular.ttf"));
+    REPORTER_ASSERT(reporter, !fontFamilies[0]->fIsFallbackFont);
+
+}
+
+void DumpLoadedFonts(SkTDArray<FontFamily*> fontFamilies) {

[djsollen, 2014/08/04 18:13:35]

if you want to keep this function around put it behind a debugging define and
default the define to 0 at the top of the file.

[tomhudson, 2014/08/04 21:03:57]

Done.

Reused SK_DEBUG_FONTS instead of creating a custom define?

+SkDebugf(" .. dumping:");
+    for (int i = 0; i < fontFamilies.count(); ++i) {
+        SkDebugf("Family %d:\n", i);
+        for (int j = 0; j < fontFamilies[i]->fNames.count(); ++j) {
+            SkDebugf("  name %s\n", fontFamilies[i]->fNames[j].c_str());
+        }
+    }
+}
+
+DEF_TEST(FontConfigParserAndroid, reporter) {
+
+    SkTDArray<FontFamily*> preV17FontFamilies;
+    SkFontConfigParser::GetTestFontFamilies(preV17FontFamilies,
+        "/data/local/tmp/resources/android_fonts/pre_v17/system_fonts.xml",

[djsollen, 2014/08/04 18:13:36]

I think there is some kind of GetResourceDir function so we don't hardcode
/data/local/tmp.

[tomhudson, 2014/08/04 21:03:57]

Done, after much argumentation.

It is now necessary to pass  --resourcePath /data/local/tmp/resources/  to the
test runner.

+        "/data/local/tmp/resources/android_fonts/pre_v17/fallback_fonts.xml");
+
+    REPORTER_ASSERT(reporter, preV17FontFamilies.count() == 14);
+
+    DumpLoadedFonts(preV17FontFamilies);
+    ValidateLoadedFonts(preV17FontFamilies, reporter);
+
+    SkTDArray<FontFamily*> v17FontFamilies;
+    SkFontConfigParser::GetTestFontFamilies(v17FontFamilies,
+        "/data/local/tmp/resources/android_fonts/v17/system_fonts.xml",
+        "/data/local/tmp/resources/android_fonts/v17/fallback_fonts.xml");
+
+
+    REPORTER_ASSERT(reporter, v17FontFamilies.count() == 41);
+
+    DumpLoadedFonts(v17FontFamilies);
+    ValidateLoadedFonts(v17FontFamilies, reporter);
+
+    SkTDArray<FontFamily*> v22FontFamilies;
+    SkFontConfigParser::GetTestFontFamilies(v22FontFamilies,
+        "/data/local/tmp/resources/android_fonts/v22/fonts.xml",
+        NULL);
+
+    //REPORTER_ASSERT(reporter, v22FontFamilies.count() > 0);
+    if (v22FontFamilies.count() > 0) {
+        REPORTER_ASSERT(reporter, v22FontFamilies[0]->fNames.count() > 0);
+    }
+
+    //ValidateLoadedFonts(v22FontFamilies, reporter);
+}
+