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

Commit 73b4f2d4 authored by Vinh Tran's avatar Vinh Tran Committed by Gerrit Code Review
Browse files

Merge changes from topic "rust_aconfig-test-mode" into main 

* changes:
  Add rust_test with rust_aconfig_library in test mode
  Fix rust aconfig test
parents f3ef7363 906405f5

tools/aconfig/Android.bp

+19 −2
Original line number Diff line number Diff line
@@ -160,11 +160,28 @@ rust_aconfig_library { 
}



rust_test {

    name: "aconfig.test.rust",

    name: "aconfig.prod_mode.test.rust",

    srcs: [

        "tests/aconfig_test.rs"

        "tests/aconfig_prod_mode_test.rs"

    ],

    rustlibs: [

        "libaconfig_test_rust_library",

    ],

}



rust_aconfig_library {

    name: "libaconfig_test_rust_library_with_test_mode",

    crate_name: "aconfig_test_rust_library",

    aconfig_declarations: "aconfig.test.flags",

    test: true,

}



rust_test {

    name: "aconfig.test_mode.test.rust",

    srcs: [

        "tests/aconfig_test_mode_test.rs"

    ],

    rustlibs: [

        "libaconfig_test_rust_library_with_test_mode",

    ],

}
 
 No newline at end of file

tools/aconfig/tests/aconfig_test.rs→tools/aconfig/tests/aconfig_prod_mode_test.rs

+8 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
fn test_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());

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

}

tools/aconfig/tests/aconfig_test_mode_test.rs

0 → 100644
+23 −0
Original line number Diff line number Diff line 
#[test]

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



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

}