Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev am: e28599049e

am: 88ce094235

Change-Id: Iefc8c7173e6d375d1045a3b148ba5c0f11c426e2
This commit is contained in:
Fan Zhang
2017-06-23 17:47:36 +00:00
committed by android-build-merger
4 changed files with 44 additions and 2 deletions

View File

@@ -22,9 +22,10 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ResolveInfo;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
@@ -69,6 +70,16 @@ public class NewDeviceIntroSuggestionActivityTest {
.thenReturn(getSharedPreferences());
}
@Test
public void isSuggestionComplete_notSupported_shouldReturnTrue() {
when(mMockContext.getResources()
.getBoolean(R.bool.config_new_device_intro_suggestion_supported))
.thenReturn(false);
assertThat(isSuggestionComplete(mContext))
.isTrue();
}
@Test
public void isSuggestionComplete_suggestionExpired_shouldReturnTrue() {
final long currentTime = System.currentTimeMillis();