From 351471f928022fb22a1b19f9e5e647a7901152fd Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Mon, 12 Dec 2016 14:08:13 -0800 Subject: [PATCH] libandroidfw: Make tests less flaky Changing any of the test APKs could change resource IDs. The resource IDs are all made public and assigned an ID to avoid this issue. Test: make libandroidfw_tests Change-Id: Idd17c25f4ac86a0ad5b2b8da6f968e5d9b2346c1 --- libs/androidfw/tests/Split_test.cpp | 9 +++++---- libs/androidfw/tests/data/basic/basic.apk | Bin 2959 -> 2959 bytes .../tests/data/basic/basic_de_fr.apk | Bin 1516 -> 1516 bytes .../tests/data/basic/basic_hdpi-v4.apk | Bin 1298 -> 1298 bytes .../tests/data/basic/basic_xhdpi-v4.apk | Bin 1304 -> 1304 bytes .../tests/data/basic/basic_xxhdpi-v4.apk | Bin 1302 -> 1302 bytes libs/androidfw/tests/data/basic/build | 2 +- .../tests/data/basic/res/values/values.xml | 16 ++++++++++++++++ libs/androidfw/tests/data/feature/build | 4 +++- libs/androidfw/tests/data/feature/feature.apk | Bin 1294 -> 1373 bytes .../tests/data/feature/res/values/values.xml | 5 +++++ 11 files changed, 30 insertions(+), 6 deletions(-) diff --git a/libs/androidfw/tests/Split_test.cpp b/libs/androidfw/tests/Split_test.cpp index 1f207e2e63732..2c242dbd3e283 100644 --- a/libs/androidfw/tests/Split_test.cpp +++ b/libs/androidfw/tests/Split_test.cpp @@ -165,7 +165,7 @@ TEST_F(SplitTest, TypeEntrySpecFlagsAreUpdated) { &specFlags, NULL); EXPECT_GE(block, 0); - EXPECT_EQ(static_cast(0), specFlags); + EXPECT_EQ(static_cast(ResTable_typeSpec::SPEC_PUBLIC), specFlags); ASSERT_EQ(NO_ERROR, table.add(basic_de_fr_contents_.data(), basic_de_fr_contents_.size())); @@ -173,9 +173,10 @@ TEST_F(SplitTest, TypeEntrySpecFlagsAreUpdated) { uint32_t frSpecFlags = 0; block = table.getResource(R::string::test1, &val, MAY_NOT_BE_BAG, 0, &frSpecFlags, NULL); - EXPECT_GE(block, 0); + ASSERT_GE(block, 0); - EXPECT_EQ(ResTable_config::CONFIG_LOCALE, frSpecFlags); + EXPECT_EQ(static_cast(ResTable_config::CONFIG_LOCALE | ResTable_typeSpec::SPEC_PUBLIC), + frSpecFlags); } TEST_F(SplitTest, SelectBestDensity) { @@ -222,7 +223,7 @@ TEST_F(SplitTest, TestNewResourceIsAccessible) { table.add(feature_contents_.data(), feature_contents_.size())); block = table.getResource(R::string::test3, &val, MAY_NOT_BE_BAG); - EXPECT_GE(block, 0); + ASSERT_GE(block, 0); EXPECT_EQ(Res_value::TYPE_STRING, val.dataType); } diff --git a/libs/androidfw/tests/data/basic/basic.apk b/libs/androidfw/tests/data/basic/basic.apk index 2d71f5b5cb4c148c8592538e10bb1eccccc89251..2c9771b18934d4a3e33a8a14f6177444419a0028 100644 GIT binary patch delta 227 zcmeAd?-$?T$i#9%{_g+Hu1ph|SsfS{7#t?wW({LzW?+~cz$VTtz`#7&k4=ZsVRAKF z5F^v%b8PWIQjcAM6RZ}jKAb(unu!6ZgMovAftd+RGcmA0`5`~SX49q|_2asZd&R7HW3#9iU3Vu067Cl3!H$^ll?f7fp%^JlVY3-P*+-WhA}cup2VpRBzJLwT=<+b Sh>>x#6_+q0*h`ZGx$OYOS0SYU diff --git a/libs/androidfw/tests/data/basic/basic_de_fr.apk b/libs/androidfw/tests/data/basic/basic_de_fr.apk index 69a2f304db83fe783bf67498e1e944fae6a984c4..04814440e0f89a2d70844bc21efb13825db69089 100644 GIT binary patch delta 186 zcmaFE{f2vkJ0r`cAHS$V_%*u@eMoU|`^Yr~=YVlP9pGBZ-3KL82V23Wg3qHrP}NAcGZ%A(|m3!d$=x T6oF*Yj delta 183 zcmaFE{f2vkJ0puy%&C~o-i%9`j2J+GiAjJ#1VjTdBS-)UKw>gLni+~&fHVj*OrFIe zKiQGRP7uUlVBml#0nw8uu%si2f=mO6a48dX`{SrV)Rv-qM0R#>p3^SJv$bp$Vxt=8uZ2#mdEOr3R!w{7K delta 144 zcmbQlHHm9OAR|lVve&7bLm54pOc_9ciAjJ#1VjTdBS-)UKw>gLni+~gVlXiIGIJCo p!(=@c1w*h9NUa2r#R|kAGhhH_E*nq)X71#AmO!xmldrJY0RVCL4_5#H diff --git a/libs/androidfw/tests/data/basic/basic_xhdpi-v4.apk b/libs/androidfw/tests/data/basic/basic_xhdpi-v4.apk index 6d4353c8d83026d4a01b757506ee321044768291..d1dfb143f91b6cab88f49c56d466971ca2a49856 100644 GIT binary patch delta 130 zcmbQiHG^wIFeA$z-yiIo!x?>Icyb|&Fr&ldR+d1pjgxP&*Z}}^6cSJX delta 130 zcmbQiHG^wIFeA&(rEA?chco&znKFO?6O#ag2#5w^MvwpyfW%~gG&2-~#9(0ZP39;@ nhRG%@3bJ4!kXi{Kixr4LX28JYLKb15x>lAzu#J;%vDg6s^{Egd diff --git a/libs/androidfw/tests/data/basic/basic_xxhdpi-v4.apk b/libs/androidfw/tests/data/basic/basic_xxhdpi-v4.apk index e3bda88659fb500ee79687d7c180b8757c2bcb63..dca6f2fbc0ca952c132326b64ddffec36506bf2d 100644 GIT binary patch delta 171 zcmbQnHH~XSAR|l3gM>YsLm7RUOdS{)7#x_G1Q(Fe@iFvjl>jHu(mN9RM~$5vu?I delta 171 zcmbQnHH~XSAR|j5hv}cqp^UyvrVJp!#3aBV0-}MK5hMTvATb#r%?!mLF&LP9ojEE9 u!r_3Z04tXO3b6n&$QT#^83Ph$1!8n@kd + + + + + + test1 + + test2 + + + 200 + + @array/integerArray1 + + + 1 2 diff --git a/libs/androidfw/tests/data/feature/build b/libs/androidfw/tests/data/feature/build index 3316e41cd2928..6ed3e416fb103 100755 --- a/libs/androidfw/tests/data/feature/build +++ b/libs/androidfw/tests/data/feature/build @@ -17,4 +17,6 @@ set -e -aapt package -M AndroidManifest.xml -S res --feature-of ../basic/basic.apk -F feature.apk -f +PATH_TO_FRAMEWORK_RES=${ANDROID_BUILD_TOP}/prebuilts/sdk/current/android.jar + +aapt package -M AndroidManifest.xml -S res -I $PATH_TO_FRAMEWORK_RES --feature-of ../basic/basic.apk -F feature.apk -f diff --git a/libs/androidfw/tests/data/feature/feature.apk b/libs/androidfw/tests/data/feature/feature.apk index 1e65c2732ebf08b1170977628d6d81ea01b03fb6..04940fb9bce2466507f226ad13870b3c04f3ccd6 100644 GIT binary patch delta 413 zcmeCav#?JH3w$TE!dZ^(_nAmx&KXHmBrcD?bmX>uHkE*Bz@Cr@QDX91Zp`2vd=lOE&b7c2^Fr&vH50X1EvoB#j- delta 347 zcmcc1)yGvI;LXe;!obA9!NAZkpK;$ai|gwc7#J!T85o3tv}0aMQGRBMZ(?3%T555L zUPW$BYM-T0Qvy%x{`fmy+YcQQj&MkRSRs9cSGI+b%bWk9-U4ytQhgf6L|q(RYWOB?MO8n>blW`_Lrer8f1+&IC#Am=7pa zwAq)jfr%9?J^2!Im>`%13JjnE1`s{jl0|`$VR95p5RhEUqRWK{qRCHK%vnGtPL^jC RW4g~U*_>5@t(pa-5deY_eA@s3 diff --git a/libs/androidfw/tests/data/feature/res/values/values.xml b/libs/androidfw/tests/data/feature/res/values/values.xml index 343fd6c8389fc..59f7d93ee3893 100644 --- a/libs/androidfw/tests/data/feature/res/values/values.xml +++ b/libs/androidfw/tests/data/feature/res/values/values.xml @@ -15,8 +15,13 @@ --> + + test3 + + test4 + 200