From 5045660bba696685909776639cc8899ae785c272 Mon Sep 17 00:00:00 2001 From: Kohsuke Yatoh Date: Wed, 16 Feb 2022 16:36:25 -0800 Subject: [PATCH] Use fake NotoSerif fonts in test. Bug: 195058030 Test: atest UpdatableSystemFontTest Change-Id: I7b4a53cf401d72998411bf0e60d1d8f13746f03a --- tests/UpdatableSystemFontTest/Android.bp | 4 +- tests/UpdatableSystemFontTest/AndroidTest.xml | 10 +- .../UpdatableSystemFontTest.java | 6 +- .../testdata/Android.bp | 22 +- ...pdatableSystemFontTest_NotoColorEmoji.ttf} | Bin ...pdatableSystemFontTest_NotoColorEmoji.ttx} | 0 ...UpdatableSystemFontTest_NotoSerif-Bold.ttf | Bin 0 -> 1776 bytes ...UpdatableSystemFontTest_NotoSerif-Bold.ttx | 196 ++++++++++++++++++ ...atableSystemFontTest_NotoSerif-Regular.ttf | Bin 0 -> 1772 bytes ...atableSystemFontTest_NotoSerif-Regular.ttx | 196 ++++++++++++++++++ 10 files changed, 415 insertions(+), 19 deletions(-) rename tests/UpdatableSystemFontTest/testdata/{NotoColorEmoji.ttf => UpdatableSystemFontTest_NotoColorEmoji.ttf} (100%) rename tests/UpdatableSystemFontTest/testdata/{NotoColorEmoji.ttx => UpdatableSystemFontTest_NotoColorEmoji.ttx} (100%) create mode 100644 tests/UpdatableSystemFontTest/testdata/UpdatableSystemFontTest_NotoSerif-Bold.ttf create mode 100644 tests/UpdatableSystemFontTest/testdata/UpdatableSystemFontTest_NotoSerif-Bold.ttx create mode 100644 tests/UpdatableSystemFontTest/testdata/UpdatableSystemFontTest_NotoSerif-Regular.ttf create mode 100644 tests/UpdatableSystemFontTest/testdata/UpdatableSystemFontTest_NotoSerif-Regular.ttx diff --git a/tests/UpdatableSystemFontTest/Android.bp b/tests/UpdatableSystemFontTest/Android.bp index c59a41ee0cd3..9a9e42bfc300 100644 --- a/tests/UpdatableSystemFontTest/Android.bp +++ b/tests/UpdatableSystemFontTest/Android.bp @@ -37,8 +37,6 @@ android_test { "vts", ], data: [ - ":NotoSerif-Regular.ttf", - ":NotoSerif-Bold.ttf", ":UpdatableSystemFontTestCertDer", ":UpdatableSystemFontTest_NotoColorEmoji.ttf", ":UpdatableSystemFontTest_NotoColorEmoji.sig", @@ -48,7 +46,9 @@ android_test { ":UpdatableSystemFontTest_NotoColorEmojiVPlus1.sig", ":UpdatableSystemFontTest_NotoColorEmojiVPlus2.ttf", ":UpdatableSystemFontTest_NotoColorEmojiVPlus2.sig", + ":UpdatableSystemFontTest_NotoSerif-Regular.ttf", ":UpdatableSystemFontTest_NotoSerif-Regular.sig", + ":UpdatableSystemFontTest_NotoSerif-Bold.ttf", ":UpdatableSystemFontTest_NotoSerif-Bold.sig", ], sdk_version: "test_current", diff --git a/tests/UpdatableSystemFontTest/AndroidTest.xml b/tests/UpdatableSystemFontTest/AndroidTest.xml index 6effa7bd0a50..9e2a4b643bf6 100644 --- a/tests/UpdatableSystemFontTest/AndroidTest.xml +++ b/tests/UpdatableSystemFontTest/AndroidTest.xml @@ -28,11 +28,7 @@ diff --git a/tests/UpdatableSystemFontTest/src/com/android/updatablesystemfont/UpdatableSystemFontTest.java b/tests/UpdatableSystemFontTest/src/com/android/updatablesystemfont/UpdatableSystemFontTest.java index 87fda0d220e5..cbe13d9aa149 100644 --- a/tests/UpdatableSystemFontTest/src/com/android/updatablesystemfont/UpdatableSystemFontTest.java +++ b/tests/UpdatableSystemFontTest/src/com/android/updatablesystemfont/UpdatableSystemFontTest.java @@ -84,7 +84,7 @@ public class UpdatableSystemFontTest { private static final String NOTO_COLOR_EMOJI_POSTSCRIPT_NAME = "NotoColorEmoji"; private static final String NOTO_COLOR_EMOJI_TTF = - "/data/local/tmp/NotoColorEmoji.ttf"; + "/data/local/tmp/UpdatableSystemFontTest_NotoColorEmoji.ttf"; private static final String NOTO_COLOR_EMOJI_SIG = "/data/local/tmp/UpdatableSystemFontTest_NotoColorEmoji.sig"; // A font with revision == 0. @@ -105,13 +105,13 @@ public class UpdatableSystemFontTest { private static final String NOTO_SERIF_REGULAR_POSTSCRIPT_NAME = "NotoSerif"; private static final String NOTO_SERIF_REGULAR_TTF = - "/data/local/tmp/NotoSerif-Regular.ttf"; + "/data/local/tmp/UpdatableSystemFontTest_NotoSerif-Regular.ttf"; private static final String NOTO_SERIF_REGULAR_SIG = "/data/local/tmp/UpdatableSystemFontTest_NotoSerif-Regular.sig"; private static final String NOTO_SERIF_BOLD_POSTSCRIPT_NAME = "NotoSerif-Bold"; private static final String NOTO_SERIF_BOLD_TTF = - "/data/local/tmp/NotoSerif-Bold.ttf"; + "/data/local/tmp/UpdatableSystemFontTest_NotoSerif-Bold.ttf"; private static final String NOTO_SERIF_BOLD_SIG = "/data/local/tmp/UpdatableSystemFontTest_NotoSerif-Bold.sig"; diff --git a/tests/UpdatableSystemFontTest/testdata/Android.bp b/tests/UpdatableSystemFontTest/testdata/Android.bp index 64b698dd0db0..0bdb3a8c6b14 100644 --- a/tests/UpdatableSystemFontTest/testdata/Android.bp +++ b/tests/UpdatableSystemFontTest/testdata/Android.bp @@ -21,11 +21,19 @@ package { default_applicable_licenses: ["frameworks_base_license"], } -// An existing module name is reused to avoid merge conflicts. -// TODO: fix the font file name. filegroup { name: "UpdatableSystemFontTest_NotoColorEmoji.ttf", - srcs: ["NotoColorEmoji.ttf"], + srcs: ["UpdatableSystemFontTest_NotoColorEmoji.ttf"], +} + +filegroup { + name: "UpdatableSystemFontTest_NotoSerif-Regular.ttf", + srcs: ["UpdatableSystemFontTest_NotoSerif-Regular.ttf"], +} + +filegroup { + name: "UpdatableSystemFontTest_NotoSerif-Bold.ttf", + srcs: ["UpdatableSystemFontTest_NotoSerif-Bold.ttf"], } filegroup { @@ -43,10 +51,6 @@ filegroup { srcs: ["UpdatableSystemFontTestCert.der"], } -genrule_defaults { - name: "updatable_system_font_increment_font_revision_default", -} - genrule { name: "UpdatableSystemFontTest_NotoColorEmojiV0.ttf", srcs: [":UpdatableSystemFontTest_NotoColorEmoji.ttf"], @@ -124,13 +128,13 @@ genrule { genrule { name: "UpdatableSystemFontTest_NotoSerif-Regular.sig", defaults: ["updatable_system_font_sig_gen_default"], - srcs: [":NotoSerif-Regular.ttf"], + srcs: ["UpdatableSystemFontTest_NotoSerif-Regular.ttf"], out: ["UpdatableSystemFontTest_NotoSerif-Regular.sig"], } genrule { name: "UpdatableSystemFontTest_NotoSerif-Bold.sig", defaults: ["updatable_system_font_sig_gen_default"], - srcs: [":NotoSerif-Bold.ttf"], + srcs: ["UpdatableSystemFontTest_NotoSerif-Bold.ttf"], out: ["UpdatableSystemFontTest_NotoSerif-Bold.sig"], } diff --git a/tests/UpdatableSystemFontTest/testdata/NotoColorEmoji.ttf b/tests/UpdatableSystemFontTest/testdata/UpdatableSystemFontTest_NotoColorEmoji.ttf similarity index 100% rename from tests/UpdatableSystemFontTest/testdata/NotoColorEmoji.ttf rename to tests/UpdatableSystemFontTest/testdata/UpdatableSystemFontTest_NotoColorEmoji.ttf diff --git a/tests/UpdatableSystemFontTest/testdata/NotoColorEmoji.ttx b/tests/UpdatableSystemFontTest/testdata/UpdatableSystemFontTest_NotoColorEmoji.ttx similarity index 100% rename from tests/UpdatableSystemFontTest/testdata/NotoColorEmoji.ttx rename to tests/UpdatableSystemFontTest/testdata/UpdatableSystemFontTest_NotoColorEmoji.ttx diff --git a/tests/UpdatableSystemFontTest/testdata/UpdatableSystemFontTest_NotoSerif-Bold.ttf b/tests/UpdatableSystemFontTest/testdata/UpdatableSystemFontTest_NotoSerif-Bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..66c1bd2a09b1677688b9806c06170be341b1a78b GIT binary patch literal 1776 zcmai!J#SN27{~wD*MS5IC<7Hkkq&N$Af-+*Qd`juycCouQC#7qfvQk$9LIKRJFe~2 zNv8@i023P%e1IxzqzExEGG^$|rA$=H2cYdn_&w)dCpZe?T;2P;znuSb&Q&1kkbYMv zmoJRvDmTlIq+kT?tztcD>X`mVetmF7_}i0m3sy;S+)&N}j6Qu@E< zQoFOgp&YK8W|#H4ApP+7KjDwZzW!H1xP?Y9au1(*dUpJ%(O@(fg&b7MBo=Yu*7ldu z;SJq5G#1?RnPOY~O?gdr|0K*dY|A`>M6WKe5D)KowtNcL?Gp{(ns*NEFwx?AMNd)^E(cuGsCBbjeq?o zeh2kEQw`EX@Sv9Pfj&fv^(hVNw}el>r9VK;+ll^2_=g@R{87!M$8||dYHC$2RaI6+ z9XXAlJq^w2Gu|BB43-k~f*RCo5mSXa<%un!b1I-)#!~ct-+G^);EQA|u+uu8HE+9u zX9Mj;XpJn>&<<|_t97xcPj_rn$d<98Heai_>^m?|M^vw?CKZZ_)E_g7-*-N9n_O1e z_LXI4w$EOMjQXQ8?Efp~=H7Z%iC#voQ)?C4@O@iH)?3_772dIfYO>doR($_WDmk=P zy+~Y)MwLtrZ+GfqwQhEI)!$KePdBqf8lG)mu?6=Fom9ak#%bR77=gOsZYV~YPr9nX zcd4}GQH+?oMa6M8iC(8&^wyR2U6vu)#=3~6O9qSSM`!`hHdc$8r<+cabHADO@6IY3 za_`Cz&&|+s%5Vw`&?|HP} z_=pM5TZO!?@HPMI&`GT3V>p!PH$FRd4sFU!k4HR>7}x5~lnvRv^Rv_5J2gi4;<1=a zr*}fzRIuA*_rs>?n5E%S24|a~ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright (C) 2022 The Android Open Source Project + + + Sample Font + + + Bold + + + Sample Font + + + + NotoSerif-Bold + + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + http://www.apache.org/licenses/LICENSE-2.0 + + + + + + + + + + + + + + + + diff --git a/tests/UpdatableSystemFontTest/testdata/UpdatableSystemFontTest_NotoSerif-Regular.ttf b/tests/UpdatableSystemFontTest/testdata/UpdatableSystemFontTest_NotoSerif-Regular.ttf new file mode 100644 index 0000000000000000000000000000000000000000..707ae281d99004c46530635c6601240f086bcaf8 GIT binary patch literal 1772 zcmai!OK4MB7{~uNiCP^WC@3yQIA&Z_sOcC%L|y3E`k>NC(^^NS9dFY#i8g6WQq#`L z#Vj0Qz?~qtm%*)2#Dz;2vzUboSFS|dxDjP`*57yTjhayLUhetckMsY|xe6q0(oH4h za{0k*dAf983i{DrDOAI{w&{Q5JIMW|`Q^Evu4PXkKSkbME{3yvHtt=5f5>;ZjAGq? zJJay5`1X~nt)(pw^%(zK$bIt*g;1N}6s)kUuZBx?rFa$eA-h^wEtUuWyo~%pO1-Nu zG+V1H%HsO3*=4=XO255*{rB(Nj(<>)e1k?Wvv;3*dg#mpqrpHh0NJ2~Nj$_Q->e>y zepu1erorGZpDD6MYr<<1^kOyEdXkATP*|tF#O=f-97ZAm?b>}TfCL)mXSm{T2dn_W1KOgPwp7T3SN(Z;^-EREH z=lE^VWu_XWHo}8i%m>NSX|K%H{L7STE7(Jf*rc)ttY=PG=GjCpoi#dF@< zPUBfaJBCyuW*%!pqi9=vd9>EcoX)dawwju(R&CK&H@m~P(@~xHLM(O14B&Us=WCM7 zs@k41?8^4o$&l`;lxFY8n3?r`@R zt$KmD2#E@rYToYD#%kSs*;V&GGCkc)5NTL8eZ>acbvmhlON7&m?=b{%!`x5|H4}Gb zXt$}f;86^jfJH@dhJUBiHhSyI`Yy?kY+{{5(q zAs=zh^Hw3J)2!zID|7^_`4|pG`i;(xokN>)-Qy8WBf_=vdCG=t@BHkHcTSDbUOeXF z>2ywLlL~f|>{i$`9kVn%?Dp6MEk}u%8*mNu(afBWYS4+{+qnUTw8hT$AZF*pJX=_8 z>V~@cet&)$PHv00uA>^{ZTmMvo-a2u<9AfT8lA_^t!|<@54NY6$S5-z)`9qj+8@q8 KtB=sE@q7Z9aSzr2 literal 0 HcmV?d00001 diff --git a/tests/UpdatableSystemFontTest/testdata/UpdatableSystemFontTest_NotoSerif-Regular.ttx b/tests/UpdatableSystemFontTest/testdata/UpdatableSystemFontTest_NotoSerif-Regular.ttx new file mode 100644 index 000000000000..754eae31c7c1 --- /dev/null +++ b/tests/UpdatableSystemFontTest/testdata/UpdatableSystemFontTest_NotoSerif-Regular.ttx @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright (C) 2022 The Android Open Source Project + + + Sample Font + + + Regular + + + Sample Font + + + + NotoSerif + + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + http://www.apache.org/licenses/LICENSE-2.0 + + + + + + + + + + + + + + + +