Merge "Introduce LogPersistPreferenceControllerV2"

tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java

@@ -17,6 +17,7 @@
 package com.android.settings.development;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -220,6 +221,28 @@ public class DevelopmentSettingsDashboardFragmentTest {
         verify(controller).onClearAdbKeysConfirmed();
     }
 
+    @Test
+    public void onDisableLogPersistDialogConfirmed_shouldCallControllerDialogConfirmed() {
+        final LogPersistPreferenceControllerV2 controller = mock(
+                LogPersistPreferenceControllerV2.class);
+        doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
+                LogPersistPreferenceControllerV2.class);
+        mDashboard.onDisableLogPersistDialogConfirmed();
+
+        verify(controller).onDisableLogPersistDialogConfirmed();
+    }
+
+    @Test
+    public void onDisableLogPersistDialogRejected_shouldCallControllerDialogRejected() {
+        final LogPersistPreferenceControllerV2 controller = mock(
+                LogPersistPreferenceControllerV2.class);
+        doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
+                LogPersistPreferenceControllerV2.class);
+        mDashboard.onDisableLogPersistDialogRejected();
+
+        verify(controller).onDisableLogPersistDialogRejected();
+    }
+
     @Implements(EnableDevelopmentSettingWarningDialog.class)
     public static class ShadowEnableDevelopmentSettingWarningDialog {
 

tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerV2Test.java

@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2017 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.development;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v4.content.LocalBroadcastManager;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+import com.android.settingslib.R;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {SettingsShadowSystemProperties.class})
+public class LogPersistPreferenceControllerV2Test {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private DevelopmentSettingsDashboardFragment mFragment;
+
+    private Context mContext;
+    private LogPersistPreferenceControllerV2 mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new LogPersistPreferenceControllerV2(mContext, mFragment, new Lifecycle());
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        SystemProperties.set("ro.debuggable", "1");
+        mController.displayPreference(mScreen);
+    }
+
+    @After
+    public void teardown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}

tests/robotests/src/com/android/settings/development/LogpersistPreferenceControllerTest.java

@@ -32,6 +32,10 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+/**
+ * deprecated in favor of {@link LogPersistPreferenceControllerV2}
+ */
+@Deprecated
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class LogpersistPreferenceControllerTest {