Add more tests from the Android Minikin test bench to the common test runner. (#4020)

This will allow us to use the common font fixtures.

third_party/txt/BUILD.gn

@@ -115,6 +115,21 @@ executable("txt_unittests") {
   testonly = true
 
   sources = [
+    "tests/CmapCoverageTest.cpp",
+    "tests/EmojiTest.cpp",
+    "tests/FileUtils.cpp",
+    "tests/FileUtils.h",
+    "tests/FontTestUtils.h",
+    "tests/GraphemeBreakTests.cpp",
+    "tests/ICUTestBase.h",
+    "tests/LayoutUtilsTest.cpp",
+    "tests/MeasurementTests.cpp",
+    "tests/MinikinFontForTest.cpp",
+    "tests/MinikinFontForTest.h",
+    "tests/SparseBitSetTest.cpp",
+    "tests/UnicodeUtils.cpp",
+    "tests/UnicodeUtils.h",
+    "tests/UnicodeUtilsTest.cpp",
     "tests/font_collection_unittests.cc",
     "tests/paragraph_unittests.cc",
     "tests/render_test.cc",
@@ -122,6 +137,16 @@ executable("txt_unittests") {
     "tests/txt_run_all_unittests.cc",
     "tests/utils.cc",
     "tests/utils.h",
+
+    # These tests require static fixtures.
+    # "tests/FontCollectionItemizeTest.cpp",
+    # "tests/FontCollectionTest.cpp",
+    # "tests/FontFamilyTest.cpp",
+    # "tests/FontLanguageListCacheTest.cpp",
+    # "tests/FontTestUtils.cpp",
+    # "tests/HbFontCacheTest.cpp",
+    # "tests/HyphenatorTest.cpp",
+    # "tests/LayoutTest.cpp",
   ]
 
   deps = [

third_party/txt/tests/old/unittest/FontCollectionItemizeTest.cpp → third_party/txt/tests/FontCollectionItemizeTest.cpp

@@ -22,10 +22,10 @@
 #include "ICUTestBase.h"
 #include "MinikinFontForTest.h"
 #include "UnicodeUtils.h"
-#include "lib/txt/libs/minikin/FontLanguage.h"
-#include "lib/txt/libs/minikin/FontLanguageListCache.h"
-#include "lib/txt/libs/minikin/MinikinInternal.h"
 #include "minikin/FontFamily.h"
+#include "minikin/FontLanguage.h"
+#include "minikin/FontLanguageListCache.h"
+#include "minikin/MinikinInternal.h"
 
 namespace minikin {
 

third_party/txt/tests/old/unittest/FontCollectionTest.cpp → third_party/txt/tests/FontCollectionTest.cpp

@@ -19,7 +19,7 @@
 #include <minikin/FontCollection.h>
 #include "FontTestUtils.h"
 #include "MinikinFontForTest.h"
-#include "lib/txt/libs/minikin/MinikinInternal.h"
+#include "minikin/MinikinInternal.h"
 
 namespace minikin {
 

third_party/txt/tests/old/unittest/FontFamilyTest.cpp → third_party/txt/tests/FontFamilyTest.cpp

@@ -21,8 +21,8 @@
 
 #include "ICUTestBase.h"
 #include "MinikinFontForTest.h"
-#include "lib/txt/libs/minikin/FontLanguageListCache.h"
-#include "lib/txt/libs/minikin/MinikinInternal.h"
+#include "minikin/FontLanguageListCache.h"
+#include "minikin/MinikinInternal.h"
 
 namespace minikin {
 

third_party/txt/tests/old/unittest/FontLanguageListCacheTest.cpp → third_party/txt/tests/FontLanguageListCacheTest.cpp

@@ -19,8 +19,8 @@
 #include <minikin/FontFamily.h>
 
 #include "ICUTestBase.h"
-#include "lib/txt/libs/minikin/FontLanguageListCache.h"
-#include "lib/txt/libs/minikin/MinikinInternal.h"
+#include "minikin/FontLanguageListCache.h"
+#include "minikin/MinikinInternal.h"
 
 namespace minikin {
 

third_party/txt/tests/old/util/FontTestUtils.cpp → third_party/txt/tests/FontTestUtils.cpp

@@ -24,7 +24,7 @@
 #include <minikin/FontCollection.h>
 #include <minikin/FontFamily.h>
 #include "MinikinFontForTest.h"
-#include "lib/txt/libs/minikin/FontLanguage.h"
+#include "minikin/FontLanguage.h"
 
 namespace minikin {
 

third_party/txt/tests/old/unittest/GraphemeBreakTests.cpp → third_party/txt/tests/GraphemeBreakTests.cpp

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <UnicodeUtils.h>
 #include <gtest/gtest.h>
 #include <minikin/GraphemeBreak.h>
+#include "UnicodeUtils.h"
 
 namespace minikin {
 

third_party/txt/tests/old/unittest/HbFontCacheTest.cpp → third_party/txt/tests/HbFontCacheTest.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "lib/txt/libs/minikin/HbFontCache.h"
+#include "minikin/HbFontCache.h"
 
 #include <gtest/gtest.h>
 #include <log/log.h>
@@ -26,7 +26,7 @@
 
 #include <minikin/MinikinFont.h>
 #include "MinikinFontForTest.h"
-#include "lib/txt/libs/minikin/MinikinInternal.h"
+#include "minikin/MinikinInternal.h"
 
 namespace minikin {
 

third_party/txt/tests/old/unittest/HyphenatorTest.cpp → third_party/txt/tests/HyphenatorTest.cpp

@@ -16,8 +16,8 @@
 
 #include <gtest/gtest.h>
 
-#include <FileUtils.h>
 #include <minikin/Hyphenator.h>
+#include "FileUtils.h"
 #include "ICUTestBase.h"
 
 #ifndef NELEM

third_party/txt/tests/old/unittest/LayoutUtilsTest.cpp → third_party/txt/tests/LayoutUtilsTest.cpp

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include <UnicodeUtils.h>
 #include <gtest/gtest.h>
+#include "UnicodeUtils.h"
 
-#include "lib/txt/libs/minikin/LayoutUtils.h"
+#include "minikin/LayoutUtils.h"
 
 namespace minikin {
 

third_party/txt/tests/old/unittest/MeasurementTests.cpp → third_party/txt/tests/MeasurementTests.cpp

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <UnicodeUtils.h>
 #include <gtest/gtest.h>
 #include <minikin/Measurement.h>
+#include "UnicodeUtils.h"
 
 namespace minikin {
 

third_party/txt/tests/old/util/UnicodeUtils.h → third_party/txt/tests/UnicodeUtils.h

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include <cstdint>
+
 namespace minikin {
 
 void ParseUnicode(uint16_t* buf,