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

Commit eb0772c4 authored by Mårten Kongstad's avatar Mårten Kongstad Committed by Android (Google) Code Review
Browse files

Merge "aconfig: adjust integration tests to correctly set flag values" into main

parents 1a768495 d669fa67

tools/aconfig/tests/AconfigTest.java

+3 −9
Original line number Diff line number Diff line
@@ -33,17 +33,13 @@ public final class AconfigTest { 
    @Test

    public void testEnabledReadOnlyFlag() {

        assertEquals("com.android.aconfig.test.disabled_rw", FLAG_DISABLED_RW);

        // TODO: change to assertTrue(enabledRo()) when the build supports reading tests/*.values

        // (currently all flags are assigned the default READ_ONLY + DISABLED)

        assertFalse(enabledRo());

        assertTrue(enabledRo());

    }



    @Test

    public void testEnabledFixedReadOnlyFlag() {

        assertEquals("com.android.aconfig.test.enabled_fixed_ro", FLAG_ENABLED_FIXED_RO);

        // TODO: change to assertTrue(enabledFixedRo()) when the build supports reading tests/*.values

        // (currently all flags are assigned the default READ_ONLY + DISABLED)

        assertFalse(enabledFixedRo());

        assertTrue(enabledFixedRo());

    }



    @Test
@@ -55,9 +51,7 @@ public final class AconfigTest { 
    @Test

    public void testEnabledReadWriteFlag() {

        assertEquals("com.android.aconfig.test.enabled_rw", FLAG_ENABLED_RW);

        // TODO: change to assertTrue(enabledRw()) when the build supports reading tests/*.values

        // (currently all flags are assigned the default READ_ONLY + DISABLED)

        assertFalse(enabledRw());

        assertTrue(enabledRw());

    }



    @Test

tools/aconfig/tests/aconfig_prod_mode_test.rs

+2 −3
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
fn test_flags() {

    assert!(!aconfig_test_rust_library::disabled_ro());

    assert!(!aconfig_test_rust_library::disabled_rw());

    // TODO: Fix template to not default both disabled and enabled to false

    assert!(!aconfig_test_rust_library::enabled_ro());

    assert!(!aconfig_test_rust_library::enabled_rw());

    assert!(aconfig_test_rust_library::enabled_ro());

    assert!(aconfig_test_rust_library::enabled_rw());

}

tools/aconfig/tests/aconfig_test.cpp

+9 −15
Original line number Diff line number Diff line
@@ -26,11 +26,9 @@ TEST(AconfigTest, TestDisabledReadOnlyFlag) { 
}



TEST(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());

  ASSERT_FALSE(provider_->enabled_ro());

  ASSERT_FALSE(enabled_ro());

  ASSERT_TRUE(com_android_aconfig_test_enabled_ro());

  ASSERT_TRUE(provider_->enabled_ro());

  ASSERT_TRUE(enabled_ro());

}



TEST(AconfigTest, TestDisabledReadWriteFlag) {
@@ -40,19 +38,15 @@ TEST(AconfigTest, TestDisabledReadWriteFlag) { 
}



TEST(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());

  ASSERT_FALSE(provider_->enabled_rw());

  ASSERT_FALSE(enabled_rw());

  ASSERT_TRUE(com_android_aconfig_test_enabled_rw());

  ASSERT_TRUE(provider_->enabled_rw());

  ASSERT_TRUE(enabled_rw());

}



TEST(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());

  ASSERT_FALSE(provider_->enabled_fixed_ro());

  ASSERT_FALSE(enabled_fixed_ro());

  ASSERT_TRUE(com_android_aconfig_test_enabled_fixed_ro());

  ASSERT_TRUE(provider_->enabled_fixed_ro());

  ASSERT_TRUE(enabled_fixed_ro());

}



int main(int argc, char** argv) {

tools/aconfig/tests/aconfig_test_mode_test.rs

+8 −9
Original line number Diff line number Diff line
@@ -3,22 +3,21 @@ 
fn test_flags() {

    assert!(!aconfig_test_rust_library::disabled_ro());

    assert!(!aconfig_test_rust_library::disabled_rw());

    // TODO: Fix template to not default both disabled and enabled to false

    assert!(!aconfig_test_rust_library::enabled_ro());

    assert!(!aconfig_test_rust_library::enabled_rw());

    assert!(aconfig_test_rust_library::enabled_ro());

    assert!(aconfig_test_rust_library::enabled_rw());



    aconfig_test_rust_library::set_disabled_ro(true);

    assert!(aconfig_test_rust_library::disabled_ro());

    aconfig_test_rust_library::set_disabled_rw(true);

    assert!(aconfig_test_rust_library::disabled_rw());

    aconfig_test_rust_library::set_enabled_ro(true);

    assert!(aconfig_test_rust_library::enabled_ro());

    aconfig_test_rust_library::set_enabled_rw(true);

    assert!(aconfig_test_rust_library::enabled_rw());

    aconfig_test_rust_library::set_enabled_ro(false);

    assert!(!aconfig_test_rust_library::enabled_ro());

    aconfig_test_rust_library::set_enabled_rw(false);

    assert!(!aconfig_test_rust_library::enabled_rw());



    aconfig_test_rust_library::reset_flags();

    assert!(!aconfig_test_rust_library::disabled_ro());

    assert!(!aconfig_test_rust_library::disabled_rw());

    assert!(!aconfig_test_rust_library::enabled_ro());

    assert!(!aconfig_test_rust_library::enabled_rw());

    assert!(aconfig_test_rust_library::enabled_ro());

    assert!(aconfig_test_rust_library::enabled_rw());

}

tools/aconfig/tests/aconfig_test_test_variant.cpp

+13 −19
Original line number Diff line number Diff line
@@ -33,11 +33,9 @@ TEST_F(AconfigTest, TestDisabledReadOnlyFlag) { 
}



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());

  ASSERT_FALSE(provider_->enabled_ro());

  ASSERT_FALSE(enabled_ro());

  ASSERT_TRUE(com_android_aconfig_test_enabled_ro());

  ASSERT_TRUE(provider_->enabled_ro());

  ASSERT_TRUE(enabled_ro());

}



TEST_F(AconfigTest, TestDisabledReadWriteFlag) {
@@ -47,19 +45,15 @@ TEST_F(AconfigTest, TestDisabledReadWriteFlag) { 
}



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());

  ASSERT_FALSE(provider_->enabled_rw());

  ASSERT_FALSE(enabled_rw());

  ASSERT_TRUE(com_android_aconfig_test_enabled_rw());

  ASSERT_TRUE(provider_->enabled_rw());

  ASSERT_TRUE(enabled_rw());

}



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());

  ASSERT_FALSE(provider_->enabled_fixed_ro());

  ASSERT_FALSE(enabled_fixed_ro());

  ASSERT_TRUE(com_android_aconfig_test_enabled_fixed_ro());

  ASSERT_TRUE(provider_->enabled_fixed_ro());

  ASSERT_TRUE(enabled_fixed_ro());

}



TEST_F(AconfigTest, OverrideFlagValue) {
@@ -70,14 +64,14 @@ TEST_F(AconfigTest, OverrideFlagValue) { 


TEST_F(AconfigTest, ResetFlagValue) {

  ASSERT_FALSE(disabled_ro());

  ASSERT_FALSE(enabled_ro());

  ASSERT_TRUE(enabled_ro());

  disabled_ro(true);

  enabled_ro(true);

  enabled_ro(false);

  ASSERT_TRUE(disabled_ro());

  ASSERT_TRUE(enabled_ro());

  ASSERT_FALSE(enabled_ro());

  reset_flags();

  ASSERT_FALSE(disabled_ro());

  ASSERT_FALSE(enabled_ro());

  ASSERT_TRUE(enabled_ro());

}



int main(int argc, char** argv) {