PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only show Condtionals when the feature flag is on."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-12-16 10:36:49 +00:00
committed by Android (Google) Code Review
parent d955ebcd61 9bda9af186
commit d04ad97133
2 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java
View File

@@ -39,7 +39,9 @@ import android.net.Uri;
import android.os.Bundle;
import android.provider.Settings;
import android.util.ArrayMap;
import android.util.FeatureFlagUtils;
import com.android.settings.core.FeatureFlags;
import com.android.settings.homepage.contextualcards.conditional.ConditionContextualCardController;
import com.android.settings.homepage.contextualcards.conditional.ConditionFooterContextualCard;
import com.android.settings.homepage.contextualcards.conditional.ConditionHeaderContextualCard;
@@ -83,6 +85,7 @@ public class ContextualCardManagerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.CONDITIONAL_CARDS, true);
mManager = new ContextualCardManager(mContext, mLifecycle, null /* bundle */);
}
@@ -124,6 +127,27 @@ public class ContextualCardManagerTest {
assertThat(actual).containsExactlyElementsIn(expected);
}
@Test
public void getSettingsCards_conditionalsEnabled_shouldContainLegacyAndConditionals() {
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.CONDITIONAL_CARDS, true);
final int[] expected = {ContextualCard.CardType.CONDITIONAL,
ContextualCard.CardType.LEGACY_SUGGESTION};
final int[] actual = mManager.getSettingsCards();
assertThat(actual).isEqualTo(expected);
}
@Test
public void getSettingsCards_conditionalsDisabled_shouldContainLegacy() {
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.CONDITIONAL_CARDS, false);
final int[] expected = {ContextualCard.CardType.LEGACY_SUGGESTION};
final int[] actual = mManager.getSettingsCards();
assertThat(actual).isEqualTo(expected);
}
@Test
public void setupController_notLifecycleObserverInstance_shouldNotAttachToLifecycle() {
// 3 invocations in constructor(ContextualCardManager, Conditional and LegacySuggestion)