diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2019-08-13 15:57:15 -0700 |
---|---|---|
committer | Hyunyoung Song <hyunyoungs@google.com> | 2019-08-15 14:02:28 -0700 |
commit | d4204437de888756d2cf8ccb8e9244960bd6d423 (patch) | |
tree | a5822a94851f4f2deadaefe64a2c56028e161eca /robolectric_tests | |
parent | 1b0445dfa4179bb04a4d01ada9561dbd3944a4b1 (diff) | |
download | packages_apps_Trebuchet-d4204437de888756d2cf8ccb8e9244960bd6d423.tar.gz packages_apps_Trebuchet-d4204437de888756d2cf8ccb8e9244960bd6d423.tar.bz2 packages_apps_Trebuchet-d4204437de888756d2cf8ccb8e9244960bd6d423.zip |
Make TogglableFlag backed by DeviceConfig for e2e testing
Bug: 138964490
TL;DR;; need this to be part of QQ1 or QD1 to verify if DeviceConfig
can be supported for launcher toggleableFlags.
Not handled in this CL:
- When flag is locally modified, that will override the flag value
How that scenario is handled should be discussed separately and is not
within scope of this CL.
Change-Id: I2e6694a40bee9202ed0b0d559e3b5607634071bf
Diffstat (limited to 'robolectric_tests')
-rw-r--r-- | robolectric_tests/src/com/android/launcher3/config/FlagOverrideRule.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/robolectric_tests/src/com/android/launcher3/config/FlagOverrideRule.java b/robolectric_tests/src/com/android/launcher3/config/FlagOverrideRule.java index 92bcc6434..a3d121676 100644 --- a/robolectric_tests/src/com/android/launcher3/config/FlagOverrideRule.java +++ b/robolectric_tests/src/com/android/launcher3/config/FlagOverrideRule.java @@ -1,6 +1,8 @@ package com.android.launcher3.config; +import com.android.launcher3.config.BaseFlags.BaseTogglableFlag; +import com.android.launcher3.uioverrides.TogglableFlag; import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; @@ -70,7 +72,7 @@ public final class FlagOverrideRule implements TestRule { }; } - private void override(BaseFlags.TogglableFlag flag, boolean newValue) { + private void override(BaseTogglableFlag flag, boolean newValue) { if (!ruleInProgress) { throw new IllegalStateException( "Rule isn't in progress. Did you remember to mark it with @Rule?"); @@ -93,7 +95,7 @@ public final class FlagOverrideRule implements TestRule { private void applyAnnotation(FlagOverride flagOverride) { boolean found = false; - for (BaseFlags.TogglableFlag flag : FeatureFlags.getTogglableFlags()) { + for (TogglableFlag flag : FeatureFlags.getTogglableFlags()) { if (flag.getKey().equals(flagOverride.key())) { override(flag, flagOverride.value()); found = true; @@ -109,7 +111,7 @@ public final class FlagOverrideRule implements TestRule { * Resets all flags to their default values. */ private void clearOverrides() { - for (BaseFlags.TogglableFlag flag : FeatureFlags.getTogglableFlags()) { + for (BaseTogglableFlag flag : FeatureFlags.getTogglableFlags()) { flag.setForTests(flag.getDefaultValue()); } } |