Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ada37d19 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "aconfig: fix broken test... 

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

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



Change-Id: I84caef7945c6233a52013ce89c23fd3513b91ef2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c6105c42 773c57f5

tools/aconfig/tests/aconfig_test_test_variant.cpp

+14 −7
Original line number Diff line number Diff line
@@ -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);