commit 906405f5c9746cab7f58bd7bd51af02575f58b79
author Vinh Tran <vinhdaitran@google.com> Fri Aug 11 17:34:12 2023 -0400
committer Vinh Tran <vinhdaitran@google.com> Fri Aug 11 21:41:13 2023 +0000
tree 5e848e4aa901ec8978cbb039f89db3c515019265
parent 36fcf63c4e9e71f1c4c2570b996fedf343ba2dbd

Add rust_test with rust_aconfig_library in test mode

Using test mode in aconfig  allows us to override the flag for unit
testing

Test: atest aconfig.test_mode.test.rust
Change-Id: I890fb20fd8cf83e6033defc7093430e3a77e4de4

tools/aconfig/Android.bp

diff --git a/tools/aconfig/Android.bp b/tools/aconfig/Android.bp
index a3f63a9..296091d 100644
--- a/tools/aconfig/Android.bp
+++ b/tools/aconfig/Android.bp
@@ -160,11 +160,28 @@
 }
 
 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_prod_mode_test.rs

diff --git a/tools/aconfig/tests/aconfig_test.rs b/tools/aconfig/tests/aconfig_prod_mode_test.rs
similarity index 100%
rename from tools/aconfig/tests/aconfig_test.rs
rename to tools/aconfig/tests/aconfig_prod_mode_test.rs

tools/aconfig/tests/aconfig_test_mode_test.rs

diff --git a/tools/aconfig/tests/aconfig_test_mode_test.rs b/tools/aconfig/tests/aconfig_test_mode_test.rs
new file mode 100644
index 0000000..7d40a44
--- /dev/null
+++ b/tools/aconfig/tests/aconfig_test_mode_test.rs
@@ -0,0 +1,23 @@
+#[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());
+}