From 2eef839c8e61512d0a031100db9da477fe2a54c6 Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Fri, 3 Jun 2016 16:10:02 +0900 Subject: [PATCH] Reconstruct the directory structure of minikin tests. To add perftests and reuse some utility classes, reconstruct test directory structure. - Move unit tests from minikin/tests to minikin/tests/unittests - Extract utilitiy classes to minikin/tests/utils which will be used by perftests eventually. Change-Id: I5026b177934e72ae67d362ee888302037da2f808 --- engine/src/flutter/tests/{ => unittest}/Android.mk | 13 +++++++------ .../{ => unittest}/FontCollectionItemizeTest.cpp | 0 .../tests/{ => unittest}/FontCollectionTest.cpp | 0 .../flutter/tests/{ => unittest}/FontFamilyTest.cpp | 0 .../{ => unittest}/FontLanguageListCacheTest.cpp | 0 .../tests/{ => unittest}/GraphemeBreakTests.cpp | 0 .../tests/{ => unittest}/HbFontCacheTest.cpp | 0 .../src/flutter/tests/{ => unittest}/ICUTestBase.h | 0 .../tests/{ => unittest}/LayoutUtilsTest.cpp | 0 .../tests/{ => unittest}/MinikinInternalTest.cpp | 0 .../tests/{ => unittest}/WordBreakerTests.cpp | 0 .../src/flutter/tests/{ => unittest}/how_to_run.txt | 2 +- .../src/flutter/tests/{ => util}/FontTestUtils.cpp | 0 engine/src/flutter/tests/{ => util}/FontTestUtils.h | 0 .../flutter/tests/{ => util}/MinikinFontForTest.cpp | 0 .../flutter/tests/{ => util}/MinikinFontForTest.h | 0 .../src/flutter/tests/{ => util}/UnicodeUtils.cpp | 0 engine/src/flutter/tests/{ => util}/UnicodeUtils.h | 0 18 files changed, 8 insertions(+), 7 deletions(-) rename engine/src/flutter/tests/{ => unittest}/Android.mk (92%) rename engine/src/flutter/tests/{ => unittest}/FontCollectionItemizeTest.cpp (100%) rename engine/src/flutter/tests/{ => unittest}/FontCollectionTest.cpp (100%) rename engine/src/flutter/tests/{ => unittest}/FontFamilyTest.cpp (100%) rename engine/src/flutter/tests/{ => unittest}/FontLanguageListCacheTest.cpp (100%) rename engine/src/flutter/tests/{ => unittest}/GraphemeBreakTests.cpp (100%) rename engine/src/flutter/tests/{ => unittest}/HbFontCacheTest.cpp (100%) rename engine/src/flutter/tests/{ => unittest}/ICUTestBase.h (100%) rename engine/src/flutter/tests/{ => unittest}/LayoutUtilsTest.cpp (100%) rename engine/src/flutter/tests/{ => unittest}/MinikinInternalTest.cpp (100%) rename engine/src/flutter/tests/{ => unittest}/WordBreakerTests.cpp (100%) rename engine/src/flutter/tests/{ => unittest}/how_to_run.txt (83%) rename engine/src/flutter/tests/{ => util}/FontTestUtils.cpp (100%) rename engine/src/flutter/tests/{ => util}/FontTestUtils.h (100%) rename engine/src/flutter/tests/{ => util}/MinikinFontForTest.cpp (100%) rename engine/src/flutter/tests/{ => util}/MinikinFontForTest.h (100%) rename engine/src/flutter/tests/{ => util}/UnicodeUtils.cpp (100%) rename engine/src/flutter/tests/{ => util}/UnicodeUtils.h (100%) diff --git a/engine/src/flutter/tests/Android.mk b/engine/src/flutter/tests/unittest/Android.mk similarity index 92% rename from engine/src/flutter/tests/Android.mk rename to engine/src/flutter/tests/unittest/Android.mk index b33631eb28e..885127199dc 100644 --- a/engine/src/flutter/tests/Android.mk +++ b/engine/src/flutter/tests/unittest/Android.mk @@ -45,9 +45,9 @@ LOCAL_MODULE := minikin_tests LOCAL_MODULE_TAGS := tests GEN := $(addprefix $(minikin_tests_root_for_test_zip)/, $(font_src_files)) -$(GEN): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN): PRIVATE_PATH := $(LOCAL_PATH)/../ $(GEN): PRIVATE_CUSTOM_TOOL = cp $< $@ -$(GEN): $(minikin_tests_root_for_test_zip)/data/% : $(LOCAL_PATH)/data/% +$(GEN): $(minikin_tests_root_for_test_zip)/data/% : $(LOCAL_PATH)/../data/% $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) @@ -70,21 +70,22 @@ LOCAL_STATIC_LIBRARIES += \ libxml2 LOCAL_SRC_FILES += \ + ../util/FontTestUtils.cpp \ + ../util/MinikinFontForTest.cpp \ + ../util/UnicodeUtils.cpp \ FontCollectionTest.cpp \ FontCollectionItemizeTest.cpp \ FontFamilyTest.cpp \ FontLanguageListCacheTest.cpp \ - FontTestUtils.cpp \ HbFontCacheTest.cpp \ - MinikinFontForTest.cpp \ MinikinInternalTest.cpp \ GraphemeBreakTests.cpp \ LayoutUtilsTest.cpp \ - UnicodeUtils.cpp \ WordBreakerTests.cpp LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../libs/minikin/ \ + $(LOCAL_PATH)/../../libs/minikin/ \ + $(LOCAL_PATH)/../util \ external/harfbuzz_ng/src \ external/libxml2/include \ external/skia/src/core diff --git a/engine/src/flutter/tests/FontCollectionItemizeTest.cpp b/engine/src/flutter/tests/unittest/FontCollectionItemizeTest.cpp similarity index 100% rename from engine/src/flutter/tests/FontCollectionItemizeTest.cpp rename to engine/src/flutter/tests/unittest/FontCollectionItemizeTest.cpp diff --git a/engine/src/flutter/tests/FontCollectionTest.cpp b/engine/src/flutter/tests/unittest/FontCollectionTest.cpp similarity index 100% rename from engine/src/flutter/tests/FontCollectionTest.cpp rename to engine/src/flutter/tests/unittest/FontCollectionTest.cpp diff --git a/engine/src/flutter/tests/FontFamilyTest.cpp b/engine/src/flutter/tests/unittest/FontFamilyTest.cpp similarity index 100% rename from engine/src/flutter/tests/FontFamilyTest.cpp rename to engine/src/flutter/tests/unittest/FontFamilyTest.cpp diff --git a/engine/src/flutter/tests/FontLanguageListCacheTest.cpp b/engine/src/flutter/tests/unittest/FontLanguageListCacheTest.cpp similarity index 100% rename from engine/src/flutter/tests/FontLanguageListCacheTest.cpp rename to engine/src/flutter/tests/unittest/FontLanguageListCacheTest.cpp diff --git a/engine/src/flutter/tests/GraphemeBreakTests.cpp b/engine/src/flutter/tests/unittest/GraphemeBreakTests.cpp similarity index 100% rename from engine/src/flutter/tests/GraphemeBreakTests.cpp rename to engine/src/flutter/tests/unittest/GraphemeBreakTests.cpp diff --git a/engine/src/flutter/tests/HbFontCacheTest.cpp b/engine/src/flutter/tests/unittest/HbFontCacheTest.cpp similarity index 100% rename from engine/src/flutter/tests/HbFontCacheTest.cpp rename to engine/src/flutter/tests/unittest/HbFontCacheTest.cpp diff --git a/engine/src/flutter/tests/ICUTestBase.h b/engine/src/flutter/tests/unittest/ICUTestBase.h similarity index 100% rename from engine/src/flutter/tests/ICUTestBase.h rename to engine/src/flutter/tests/unittest/ICUTestBase.h diff --git a/engine/src/flutter/tests/LayoutUtilsTest.cpp b/engine/src/flutter/tests/unittest/LayoutUtilsTest.cpp similarity index 100% rename from engine/src/flutter/tests/LayoutUtilsTest.cpp rename to engine/src/flutter/tests/unittest/LayoutUtilsTest.cpp diff --git a/engine/src/flutter/tests/MinikinInternalTest.cpp b/engine/src/flutter/tests/unittest/MinikinInternalTest.cpp similarity index 100% rename from engine/src/flutter/tests/MinikinInternalTest.cpp rename to engine/src/flutter/tests/unittest/MinikinInternalTest.cpp diff --git a/engine/src/flutter/tests/WordBreakerTests.cpp b/engine/src/flutter/tests/unittest/WordBreakerTests.cpp similarity index 100% rename from engine/src/flutter/tests/WordBreakerTests.cpp rename to engine/src/flutter/tests/unittest/WordBreakerTests.cpp diff --git a/engine/src/flutter/tests/how_to_run.txt b/engine/src/flutter/tests/unittest/how_to_run.txt similarity index 83% rename from engine/src/flutter/tests/how_to_run.txt rename to engine/src/flutter/tests/unittest/how_to_run.txt index bee367bd179..c90c6640bdf 100644 --- a/engine/src/flutter/tests/how_to_run.txt +++ b/engine/src/flutter/tests/unittest/how_to_run.txt @@ -1,4 +1,4 @@ -mmm -j8 frameworks/minikin/tests && +mmm -j8 frameworks/minikin/tests/unittests && adb push $OUT/data/nativetest/minikin_tests/minikin_tests \ /data/nativetest/minikin_tests/minikin_tests && adb push frameworks/minikin/tests/data /data/nativetest/minikin_tests/ && diff --git a/engine/src/flutter/tests/FontTestUtils.cpp b/engine/src/flutter/tests/util/FontTestUtils.cpp similarity index 100% rename from engine/src/flutter/tests/FontTestUtils.cpp rename to engine/src/flutter/tests/util/FontTestUtils.cpp diff --git a/engine/src/flutter/tests/FontTestUtils.h b/engine/src/flutter/tests/util/FontTestUtils.h similarity index 100% rename from engine/src/flutter/tests/FontTestUtils.h rename to engine/src/flutter/tests/util/FontTestUtils.h diff --git a/engine/src/flutter/tests/MinikinFontForTest.cpp b/engine/src/flutter/tests/util/MinikinFontForTest.cpp similarity index 100% rename from engine/src/flutter/tests/MinikinFontForTest.cpp rename to engine/src/flutter/tests/util/MinikinFontForTest.cpp diff --git a/engine/src/flutter/tests/MinikinFontForTest.h b/engine/src/flutter/tests/util/MinikinFontForTest.h similarity index 100% rename from engine/src/flutter/tests/MinikinFontForTest.h rename to engine/src/flutter/tests/util/MinikinFontForTest.h diff --git a/engine/src/flutter/tests/UnicodeUtils.cpp b/engine/src/flutter/tests/util/UnicodeUtils.cpp similarity index 100% rename from engine/src/flutter/tests/UnicodeUtils.cpp rename to engine/src/flutter/tests/util/UnicodeUtils.cpp diff --git a/engine/src/flutter/tests/UnicodeUtils.h b/engine/src/flutter/tests/util/UnicodeUtils.h similarity index 100% rename from engine/src/flutter/tests/UnicodeUtils.h rename to engine/src/flutter/tests/util/UnicodeUtils.h