StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "aconfig: fix broken test 'aconfig.test.cpp.test_mode:AconfigTest#ResetFlagValue'" into main am: d2a333f691

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2868579

Change-Id: I76473df94cd977755307387d4c61d398b424758d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-12-12 13:16:54 +00:00
committed by Automerger Merge Worker
parent f251d3ec11 d2a333f691
commit 773c57f5a4
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tools/aconfig/tests/aconfig_test_test_variant.cpp
View File

@@ -19,13 +19,20 @@
using namespace com::android::aconfig::test;
TEST(AconfigTest, TestDisabledReadOnlyFlag) {
class AconfigTest : public ::testing::Test {
protected:
void SetUp() override {
reset_flags();
}
};
TEST_F(AconfigTest, TestDisabledReadOnlyFlag) {
ASSERT_FALSE(com_android_aconfig_test_disabled_ro());
ASSERT_FALSE(provider_->disabled_ro());
ASSERT_FALSE(disabled_ro());
}
TEST(AconfigTest, TestEnabledReadOnlyFlag) {
TEST_F(AconfigTest, TestEnabledReadOnlyFlag) {
// TODO: change to assertTrue(enabledRo()) when the build supports reading tests/*.values
// (currently all flags are assigned the default READ_ONLY + DISABLED)
ASSERT_FALSE(com_android_aconfig_test_enabled_ro());
@@ -33,13 +40,13 @@ TEST(AconfigTest, TestEnabledReadOnlyFlag) {
ASSERT_FALSE(enabled_ro());
}
TEST(AconfigTest, TestDisabledReadWriteFlag) {
TEST_F(AconfigTest, TestDisabledReadWriteFlag) {
ASSERT_FALSE(com_android_aconfig_test_disabled_rw());
ASSERT_FALSE(provider_->disabled_rw());
ASSERT_FALSE(disabled_rw());
}
TEST(AconfigTest, TestEnabledReadWriteFlag) {
TEST_F(AconfigTest, TestEnabledReadWriteFlag) {
// TODO: change to assertTrue(enabledRo()) when the build supports reading tests/*.values
// (currently all flags are assigned the default READ_ONLY + DISABLED)
ASSERT_FALSE(com_android_aconfig_test_enabled_rw());
@@ -47,7 +54,7 @@ TEST(AconfigTest, TestEnabledReadWriteFlag) {
ASSERT_FALSE(enabled_rw());
}
TEST(AconfigTest, TestEnabledFixedReadOnlyFlag) {
TEST_F(AconfigTest, TestEnabledFixedReadOnlyFlag) {
// TODO: change to assertTrue(enabledFixedRo()) when the build supports reading tests/*.values
// (currently all flags are assigned the default READ_ONLY + DISABLED)
ASSERT_FALSE(com_android_aconfig_test_enabled_fixed_ro());
@@ -55,13 +62,13 @@ TEST(AconfigTest, TestEnabledFixedReadOnlyFlag) {
ASSERT_FALSE(enabled_fixed_ro());
}
TEST(AconfigTest, OverrideFlagValue) {
TEST_F(AconfigTest, OverrideFlagValue) {
ASSERT_FALSE(disabled_ro());
disabled_ro(true);
ASSERT_TRUE(disabled_ro());
}
TEST(AconfigTest, ResetFlagValue) {
TEST_F(AconfigTest, ResetFlagValue) {
ASSERT_FALSE(disabled_ro());
ASSERT_FALSE(enabled_ro());
disabled_ro(true);