Merge changes Ia52cd272,Ie8acdcb8
* changes: Refactor CaptionAppearanceFragment to improve maintainability (2/n) Refactor CaptionAppearanceFragment to improve maintainability (1/n)
This commit is contained in:
@@ -0,0 +1,114 @@
|
||||
/*
|
||||
* Copyright (C) 2022 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.accessibility;
|
||||
|
||||
import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
|
||||
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.provider.Settings;
|
||||
import android.view.accessibility.CaptioningManager;
|
||||
|
||||
import androidx.preference.ListPreference;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.shadow.api.Shadow;
|
||||
import org.robolectric.shadows.ShadowCaptioningManager;
|
||||
|
||||
/** Tests for {@link CaptionFontSizeController}. */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class CaptionFontSizeControllerTest {
|
||||
|
||||
@Rule
|
||||
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
@Mock
|
||||
private PreferenceScreen mScreen;
|
||||
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||
private CaptionFontSizeController mController;
|
||||
private ListPreference mPreference;
|
||||
private ShadowCaptioningManager mShadowCaptioningManager;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mController = new CaptionFontSizeController(mContext, "captioning_font_size");
|
||||
mPreference = new ListPreference(mContext);
|
||||
mPreference.setEntries(R.array.captioning_font_size_selector_titles);
|
||||
mPreference.setEntryValues(R.array.captioning_font_size_selector_values);
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
||||
CaptioningManager captioningManager = mContext.getSystemService(CaptioningManager.class);
|
||||
mShadowCaptioningManager = Shadow.extract(captioningManager);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_shouldReturnAvailable() {
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void displayPreference_byDefault_shouldReturnDefault() {
|
||||
mController.displayPreference(mScreen);
|
||||
|
||||
assertThat(mPreference.getEntry().toString()).isEqualTo("Medium");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void displayPreference_bySmallValue_shouldReturnSmall() {
|
||||
mShadowCaptioningManager.setFontScale(0.5f);
|
||||
|
||||
mController.displayPreference(mScreen);
|
||||
|
||||
assertThat(mPreference.getEntry().toString()).isEqualTo("Small");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChange_shouldReturnSmall() {
|
||||
mController.displayPreference(mScreen);
|
||||
|
||||
mController.onPreferenceChange(mPreference, "0.5");
|
||||
|
||||
assertThat(mPreference.getEntry().toString()).isEqualTo("Small");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChange_shouldSetCaptionEnabled() {
|
||||
mShadowCaptioningManager.setEnabled(false);
|
||||
mController.displayPreference(mScreen);
|
||||
|
||||
mController.onPreferenceChange(mPreference, "0.5");
|
||||
|
||||
final boolean isCaptionEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
|
||||
Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, OFF) == ON;
|
||||
assertThat(isCaptionEnabled).isTrue();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
/*
|
||||
* Copyright (C) 2022 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.accessibility;
|
||||
|
||||
import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
|
||||
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.provider.Settings;
|
||||
import android.view.View;
|
||||
import android.view.accessibility.CaptioningManager;
|
||||
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.internal.widget.SubtitleView;
|
||||
import com.android.settings.R;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.Spy;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
/** Tests for {@link CaptionHelper}. */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class CaptionHelperTest {
|
||||
|
||||
@Rule
|
||||
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
@Mock
|
||||
private CaptioningManager mCaptioningManager;
|
||||
@Mock
|
||||
private SubtitleView mSubtitleView;
|
||||
@Mock
|
||||
private View mPreviewWindow;
|
||||
@Spy
|
||||
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||
private CaptionHelper mCaptionHelper;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
when(mContext.getSystemService(CaptioningManager.class)).thenReturn(mCaptioningManager);
|
||||
mCaptionHelper = new CaptionHelper(mContext);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void applyCaptionProperties_verifyAction() {
|
||||
final float fontScale = 1.0f;
|
||||
when(mCaptioningManager.getFontScale()).thenReturn(fontScale);
|
||||
final int windowSize = 100;
|
||||
when(mPreviewWindow.getWidth()).thenReturn(windowSize);
|
||||
when(mPreviewWindow.getHeight()).thenReturn(windowSize);
|
||||
final float textSize = CaptionHelper.LINE_HEIGHT_RATIO * windowSize * fontScale;
|
||||
|
||||
mCaptionHelper.applyCaptionProperties(mSubtitleView, mPreviewWindow, /* styleId= */ 0);
|
||||
|
||||
verify(mSubtitleView).setTextSize(textSize);
|
||||
verify(mSubtitleView).setText(R.string.captioning_preview_characters);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void applyCaptionProperties_withoutPreviewWindow_verifyAction() {
|
||||
final float fontScale = 1.0f;
|
||||
when(mCaptioningManager.getFontScale()).thenReturn(fontScale);
|
||||
final float textSize = mContext.getResources().getDimension(
|
||||
R.dimen.caption_preview_text_size) * fontScale;
|
||||
|
||||
mCaptionHelper.applyCaptionProperties(mSubtitleView, /* PreviewWindow= */ null,
|
||||
/* styleId= */ 0);
|
||||
|
||||
verify(mSubtitleView).setTextSize(textSize);
|
||||
verify(mSubtitleView).setText(R.string.captioning_preview_characters);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void applyCaptionProperties_localeUS_verifyAction() {
|
||||
when(mCaptioningManager.getLocale()).thenReturn(Locale.US);
|
||||
final String text = mContext.getString(R.string.captioning_preview_characters);
|
||||
|
||||
mCaptionHelper.applyCaptionProperties(mSubtitleView, /* PreviewWindow= */ null,
|
||||
/* styleId= */ 0);
|
||||
|
||||
verify(mSubtitleView).setText(text);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void enableCaptioningManager_shouldSetCaptionEnabled() {
|
||||
when(mCaptioningManager.isEnabled()).thenReturn(false);
|
||||
|
||||
mCaptionHelper.setEnabled(true);
|
||||
|
||||
final boolean isCaptionEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
|
||||
Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, OFF) == ON;
|
||||
assertThat(isCaptionEnabled).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void disableCaptioningManager_shouldSetCaptionDisabled() {
|
||||
when(mCaptioningManager.isEnabled()).thenReturn(true);
|
||||
|
||||
mCaptionHelper.setEnabled(false);
|
||||
|
||||
final boolean isCaptionEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
|
||||
Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, OFF) == ON;
|
||||
assertThat(isCaptionEnabled).isFalse();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
/*
|
||||
* Copyright (C) 2022 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.accessibility;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.ContentResolver;
|
||||
import android.content.Context;
|
||||
import android.provider.Settings;
|
||||
import android.view.View;
|
||||
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settingslib.widget.LayoutPreference;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.Spy;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
/** Tests for {@link CaptionPreviewPreferenceController}. */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class CaptionPreviewPreferenceControllerTest {
|
||||
|
||||
@Rule
|
||||
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
@Mock
|
||||
private PreferenceScreen mScreen;
|
||||
@Mock
|
||||
private ContentResolver mContentResolver;
|
||||
@Spy
|
||||
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||
private CaptionPreviewPreferenceController mController;
|
||||
private LayoutPreference mLayoutPreference;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
when(mContext.getContentResolver()).thenReturn(mContentResolver);
|
||||
mController = new CaptionPreviewPreferenceController(mContext,
|
||||
"captioning_preference_switch");
|
||||
final View view = new View(mContext);
|
||||
mLayoutPreference = new LayoutPreference(mContext, view);
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mLayoutPreference);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_shouldReturnAvailable() {
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onStart_registerSpecificContentObserverForSpecificKeys() {
|
||||
mController.onStart();
|
||||
|
||||
for (String key : mController.CAPTIONING_FEATURE_KEYS) {
|
||||
verify(mContentResolver).registerContentObserver(Settings.Secure.getUriFor(key),
|
||||
/* notifyForDescendants= */ false, mController.mSettingsContentObserver);
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPause_unregisterContentObserver() {
|
||||
mController.onStop();
|
||||
|
||||
verify(mContentResolver).unregisterContentObserver(mController.mSettingsContentObserver);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,115 @@
|
||||
/*
|
||||
* Copyright (C) 2022 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.accessibility;
|
||||
|
||||
import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
|
||||
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.provider.Settings;
|
||||
import android.view.accessibility.CaptioningManager;
|
||||
|
||||
import androidx.preference.ListPreference;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.shadow.api.Shadow;
|
||||
import org.robolectric.shadows.ShadowCaptioningManager;
|
||||
|
||||
/** Tests for {@link CaptionTypefaceController}. */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class CaptionTypefaceControllerTest {
|
||||
|
||||
@Rule
|
||||
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
@Mock
|
||||
private PreferenceScreen mScreen;
|
||||
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||
private CaptionTypefaceController mController;
|
||||
private ListPreference mPreference;
|
||||
private ShadowCaptioningManager mShadowCaptioningManager;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mController = new CaptionTypefaceController(mContext, "captioning_typeface");
|
||||
mPreference = new ListPreference(mContext);
|
||||
mPreference.setEntries(R.array.captioning_typeface_selector_titles);
|
||||
mPreference.setEntryValues(R.array.captioning_typeface_selector_values);
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
||||
CaptioningManager captioningManager = mContext.getSystemService(CaptioningManager.class);
|
||||
mShadowCaptioningManager = Shadow.extract(captioningManager);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_shouldReturnAvailable() {
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void displayPreference_byDefault_shouldReturnDefault() {
|
||||
mController.displayPreference(mScreen);
|
||||
|
||||
assertThat(mPreference.getEntry().toString()).isEqualTo("Default");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void displayPreference_bySerif_shouldReturnSerif() {
|
||||
Settings.Secure.putString(mContext.getContentResolver(),
|
||||
Settings.Secure.ACCESSIBILITY_CAPTIONING_TYPEFACE, "serif");
|
||||
|
||||
mController.displayPreference(mScreen);
|
||||
|
||||
assertThat(mPreference.getEntry().toString()).isEqualTo("Serif");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChange_bySerif_shouldReturnSerif() {
|
||||
mController.displayPreference(mScreen);
|
||||
|
||||
mController.onPreferenceChange(mPreference, "serif");
|
||||
|
||||
assertThat(mPreference.getEntry().toString()).isEqualTo("Serif");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChange_shouldSetCaptionEnabled() {
|
||||
mShadowCaptioningManager.setEnabled(false);
|
||||
mController.displayPreference(mScreen);
|
||||
|
||||
mController.onPreferenceChange(mPreference, "serif");
|
||||
|
||||
final boolean isCaptionEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
|
||||
Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, OFF) == ON;
|
||||
assertThat(isCaptionEnabled).isTrue();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user