Merge "Add Slider template for Slices" into pi-dev

tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.core;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.support.v7.preference.SeekBarPreference;
+
+import com.android.settings.slices.SliceData;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class SliderPreferenceControllerTest {
+
+    FakeSlider mSliderController;
+
+    Context mContext;
+    SeekBarPreference mPreference;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mPreference = new SeekBarPreference(mContext);
+        mSliderController = new FakeSlider(mContext, "key");
+    }
+
+    @Test
+    public void onPreferenceChange_updatesPosition() {
+        final int newValue = 28;
+
+        mSliderController.onPreferenceChange(mPreference, newValue);
+
+        assertThat(mSliderController.getSliderPosition()).isEqualTo(newValue);
+    }
+
+    @Test
+    public void updateState_setsPreferenceToCurrentValue() {
+        final int newValue = 28;
+        mSliderController.setSliderPosition(newValue);
+
+        mSliderController.updateState(mPreference);
+
+        assertThat(mPreference.getValue()).isEqualTo(newValue);
+    }
+
+    @Test
+    public void testSliceType_returnsSliceType() {
+        assertThat(mSliderController.getSliceType()).isEqualTo(
+                SliceData.SliceType.SLIDER);
+    }
+
+    private class FakeSlider extends SliderPreferenceController {
+
+        private final int MAX_STEPS = 2112;
+        private int mPosition;
+
+        public FakeSlider(Context context, String key) {
+            super(context, key);
+        }
+
+        @Override
+        public int getSliderPosition() {
+            return mPosition;
+        }
+
+        @Override
+        public boolean setSliderPosition(int position) {
+            mPosition = position;
+            return true;
+        }
+
+        @Override
+        public int getMaxSteps() {
+            return MAX_STEPS;
+        }
+
+        @Override
+        public int getAvailabilityStatus() {
+            return AVAILABLE;
+        }
+    }
+}

tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java

@@ -18,7 +18,6 @@
 package com.android.settings.slices;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -28,7 +27,9 @@ import android.database.sqlite.SQLiteDatabase;
 import com.android.settings.search.FakeIndexProvider;
 import com.android.settings.search.SearchFeatureProvider;
 import com.android.settings.search.SearchFeatureProviderImpl;
+import com.android.settings.testutils.DatabaseTestUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.FakeSliderController;
 import com.android.settings.testutils.FakeToggleController;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
@@ -38,6 +39,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
 
+import androidx.slice.core.SliceHints;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 public class SliceBroadcastReceiverTest {
 
@@ -46,7 +49,7 @@ public class SliceBroadcastReceiverTest {
     private final String fakeScreenTitle = "screen_title";
     private final int fakeIcon = 1234;
     private final String fakeFragmentClassName = FakeIndexProvider.class.getName();
-    private final String fakeControllerName = FakeToggleController.class.getName();
+    private final Class fakeControllerName = FakeToggleController.class;
 
     private Context mContext;
     private SQLiteDatabase mDb;
@@ -68,7 +71,7 @@ public class SliceBroadcastReceiverTest {
 
     @After
     public void cleanUp() {
-        mFakeFeatureFactory.searchFeatureProvider = mock(SearchFeatureProvider.class);
+        DatabaseTestUtils.clearDb(mContext);
     }
 
     @Test
@@ -90,20 +93,74 @@ public class SliceBroadcastReceiverTest {
         assertThat(fakeToggleController.isChecked()).isFalse();
     }
 
+    @Test
+    public void testOnReceive_sliderChanged() {
+        String key = "key";
+        final int position = FakeSliderController.MAX_STEPS - 1;
+        final int oldPosition = FakeSliderController.MAX_STEPS;
+        mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
+        insertSpecialCase(FakeSliderController.class, key);
+
+        // Set slider setting
+        FakeSliderController fakeSliderController = new FakeSliderController(mContext, key);
+        fakeSliderController.setSliderPosition(oldPosition);
+        // Build action
+        Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED);
+        intent.putExtra(SliceHints.EXTRA_RANGE_VALUE, position);
+        intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key);
+
+        assertThat(fakeSliderController.getSliderPosition()).isEqualTo(oldPosition);
+
+        // Update the setting.
+        mReceiver.onReceive(mContext, intent);
+
+        assertThat(fakeSliderController.getSliderPosition()).isEqualTo(position);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testOnReceive_invalidController_throwsException() {
+        String key = "key";
+        final int position = 0;
+        mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
+        insertSpecialCase(FakeToggleController.class, key);
+
+        // Build action
+        Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED);
+        intent.putExtra(SliceHints.EXTRA_RANGE_VALUE, position);
+        intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key);
+
+        // Trigger the exception.
+        mReceiver.onReceive(mContext, intent);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void sliderOnReceive_noKey_throwsException() {
+        // Build action
+        Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED);
+        intent.putExtra(SliceHints.EXTRA_RANGE_VALUE, 0);
+
+        // Trigger the exception.
+        mReceiver.onReceive(mContext, intent);
+    }
+
     @Test(expected =  IllegalStateException.class)
-    public void testOnReceive_noExtra_illegalSatetException() {
+    public void toggleOnReceive_noExtra_illegalStateException() {
         Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED);
         mReceiver.onReceive(mContext, intent);
     }
 
     @Test(expected =  IllegalStateException.class)
-    public void testOnReceive_emptyKey_throwsIllegalStateException() {
+    public void toggleOnReceive_emptyKey_throwsIllegalStateException() {
         Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED);
         intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, (String) null);
         mReceiver.onReceive(mContext, intent);
     }
 
     private void insertSpecialCase(String key) {
+        insertSpecialCase(fakeControllerName, key);
+    }
+
+    private void insertSpecialCase(Class controllerClass, String key) {
         ContentValues values = new ContentValues();
         values.put(SlicesDatabaseHelper.IndexColumns.KEY, key);
         values.put(SlicesDatabaseHelper.IndexColumns.TITLE, fakeTitle);
@@ -111,8 +168,7 @@ public class SliceBroadcastReceiverTest {
         values.put(SlicesDatabaseHelper.IndexColumns.SCREENTITLE, fakeScreenTitle);
         values.put(SlicesDatabaseHelper.IndexColumns.ICON_RESOURCE, fakeIcon);
         values.put(SlicesDatabaseHelper.IndexColumns.FRAGMENT, fakeFragmentClassName);
-        values.put(SlicesDatabaseHelper.IndexColumns.CONTROLLER, fakeControllerName);
-
+        values.put(SlicesDatabaseHelper.IndexColumns.CONTROLLER, controllerClass.getName());
         mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
     }
 }

tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java

@@ -28,6 +28,7 @@ import android.util.Pair;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.testutils.FakeSliderController;
 import com.android.settings.testutils.FakeToggleController;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
@@ -68,6 +69,14 @@ public class SliceBuilderUtilsTest {
         assertThat(slice).isNotNull(); // TODO improve test for Slice content
     }
 
+    @Test
+    public void testSliderSlice_returnsSeekBarSlice() {
+        final Slice slice = SliceBuilderUtils.buildSlice(mContext, getDummyData(
+                FakeSliderController.class));
+
+        assertThat(slice).isNotNull();
+    }
+
     @Test
     public void testUriBuilder_oemAuthority_intentPath_returnsValidSliceUri() {
         Uri expectedUri = new Uri.Builder()

tests/robotests/src/com/android/settings/testutils/FakeSliderController.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package com.android.settings.testutils;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.SliderPreferenceController;
+
+public class FakeSliderController extends SliderPreferenceController {
+
+    private final String settingKey = "fake_slider_key";
+
+    public static final int MAX_STEPS = 9;
+
+    public FakeSliderController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getSliderPosition() {
+        return Settings.System.getInt(mContext.getContentResolver(), settingKey, 0);
+    }
+
+    @Override
+    public boolean setSliderPosition(int position) {
+        return Settings.System.putInt(mContext.getContentResolver(), settingKey, position);
+    }
+
+    @Override
+    public int getMaxSteps() {
+        return MAX_STEPS;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return BasePreferenceController.AVAILABLE;
+    }
+}