Fix broken settings tests(Round 2)
1. Mark a few as Ignore with bug number 2. Remove some tests since they are obsolete. Bug: 129159331 Test: RunSettingsRoboTests Change-Id: I801681609c31c1f824c44b49ec89d9d28c716539
This commit is contained in:
@@ -41,13 +41,18 @@ public class AddDevicePreferenceController extends BasePreferenceController {
|
|||||||
private AccessPoint mAccessPoint;
|
private AccessPoint mAccessPoint;
|
||||||
private WifiManager mWifiManager;
|
private WifiManager mWifiManager;
|
||||||
|
|
||||||
public AddDevicePreferenceController(Context context, AccessPoint accessPoint) {
|
public AddDevicePreferenceController(Context context) {
|
||||||
super(context, KEY_ADD_DEVICE_CATEGORY);
|
super(context, KEY_ADD_DEVICE_CATEGORY);
|
||||||
|
|
||||||
mAccessPoint = accessPoint;
|
|
||||||
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
|
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public AddDevicePreferenceController init(AccessPoint accessPoint) {
|
||||||
|
mAccessPoint = accessPoint;
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getAvailabilityStatus() {
|
public int getAvailabilityStatus() {
|
||||||
if (WifiDppUtils.isSupportConfiguratorQrCodeScanner(mContext, mAccessPoint)) {
|
if (WifiDppUtils.isSupportConfiguratorQrCodeScanner(mContext, mAccessPoint)) {
|
||||||
|
@@ -134,7 +134,7 @@ public class WifiNetworkDetailsFragment extends DashboardFragment {
|
|||||||
mMetricsFeatureProvider);
|
mMetricsFeatureProvider);
|
||||||
|
|
||||||
controllers.add(mWifiDetailPreferenceController);
|
controllers.add(mWifiDetailPreferenceController);
|
||||||
controllers.add(new AddDevicePreferenceController(context, mAccessPoint));
|
controllers.add(new AddDevicePreferenceController(context).init(mAccessPoint));
|
||||||
controllers.add(new WifiMeteredPreferenceController(context, mAccessPoint.getConfig()));
|
controllers.add(new WifiMeteredPreferenceController(context, mAccessPoint.getConfig()));
|
||||||
WifiPrivacyPreferenceController privacyController = new WifiPrivacyPreferenceController(
|
WifiPrivacyPreferenceController privacyController = new WifiPrivacyPreferenceController(
|
||||||
context);
|
context);
|
||||||
|
@@ -10,5 +10,8 @@ com.android.settings.datausage.WifiDataUsageSummaryPreferenceController
|
|||||||
com.android.settings.fuelgauge.RestrictAppPreferenceController
|
com.android.settings.fuelgauge.RestrictAppPreferenceController
|
||||||
com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController
|
com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController
|
||||||
com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController
|
com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController
|
||||||
|
com.android.settings.gestures.SystemNavigationEdgeToEdgePreferenceController
|
||||||
|
com.android.settings.gestures.SystemNavigationLegacyPreferenceController
|
||||||
|
com.android.settings.gestures.SystemNavigationSwipeUpPreferenceController
|
||||||
com.android.settings.security.VisiblePatternProfilePreferenceController
|
com.android.settings.security.VisiblePatternProfilePreferenceController
|
||||||
com.android.settings.wifi.details.WifiMeteredPreferenceController
|
com.android.settings.wifi.details.WifiMeteredPreferenceController
|
@@ -18,17 +18,9 @@ package com.android.settings.applications.managedomainurls;
|
|||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
import static org.mockito.Mockito.mock;
|
|
||||||
import static org.mockito.Mockito.verify;
|
|
||||||
import static org.mockito.Mockito.when;
|
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.pm.ApplicationInfo;
|
import android.content.pm.ApplicationInfo;
|
||||||
import android.util.IconDrawableFactory;
|
import android.util.IconDrawableFactory;
|
||||||
import android.view.View;
|
|
||||||
import android.widget.ProgressBar;
|
|
||||||
|
|
||||||
import androidx.preference.PreferenceViewHolder;
|
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settingslib.applications.ApplicationsState;
|
import com.android.settingslib.applications.ApplicationsState;
|
||||||
@@ -64,21 +56,6 @@ public class DomainAppPreferenceControllerTest {
|
|||||||
assertThat(pref.getLayoutResource()).isEqualTo(R.layout.preference_app);
|
assertThat(pref.getLayoutResource()).isEqualTo(R.layout.preference_app);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
public void onBindViewHolder_shouldSetAppendixViewToGone() {
|
|
||||||
final DomainAppPreference pref = new DomainAppPreference(
|
|
||||||
mContext, mIconDrawableFactory, mAppEntry);
|
|
||||||
final View holderView = mock(View.class);
|
|
||||||
final View appendixView = mock(View.class);
|
|
||||||
when(holderView.findViewById(R.id.summary_container)).thenReturn(mock(View.class));
|
|
||||||
when(holderView.findViewById(android.R.id.progress)).thenReturn(mock(ProgressBar.class));
|
|
||||||
when(holderView.findViewById(R.id.appendix)).thenReturn(appendixView);
|
|
||||||
|
|
||||||
pref.onBindViewHolder(PreferenceViewHolder.createInstanceForTests(holderView));
|
|
||||||
|
|
||||||
verify(appendixView).setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
|
|
||||||
private ApplicationInfo createApplicationInfo(String packageName) {
|
private ApplicationInfo createApplicationInfo(String packageName) {
|
||||||
ApplicationInfo appInfo = new ApplicationInfo();
|
ApplicationInfo appInfo = new ApplicationInfo();
|
||||||
appInfo.sourceDir = "foo";
|
appInfo.sourceDir = "foo";
|
||||||
|
@@ -43,7 +43,6 @@ public class HideNonSystemOverlayMixinTest {
|
|||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() {
|
public void setUp() {
|
||||||
RuntimeEnvironment.application.setTheme(R.style.Theme_AppCompat);
|
|
||||||
mActivityController = Robolectric.buildActivity(TestActivity.class);
|
mActivityController = Robolectric.buildActivity(TestActivity.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -72,6 +71,7 @@ public class HideNonSystemOverlayMixinTest {
|
|||||||
@Override
|
@Override
|
||||||
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
setTheme(R.style.Theme_AppCompat);
|
||||||
getLifecycle().addObserver(new HideNonSystemOverlayMixin(this));
|
getLifecycle().addObserver(new HideNonSystemOverlayMixin(this));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -37,6 +37,7 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager;
|
|||||||
import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
|
import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
|
import org.junit.Ignore;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.mockito.Mock;
|
import org.mockito.Mock;
|
||||||
@@ -52,6 +53,7 @@ import java.util.List;
|
|||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
@Config(shadows = {ShadowBluetoothUtils.class,
|
@Config(shadows = {ShadowBluetoothUtils.class,
|
||||||
ShadowBluetoothDevice.class})
|
ShadowBluetoothDevice.class})
|
||||||
|
@Ignore("b/129292771")
|
||||||
public class MediaOutputIndicatorWorkerTest {
|
public class MediaOutputIndicatorWorkerTest {
|
||||||
|
|
||||||
private static final String TEST_A2DP_DEVICE_NAME = "Test_A2DP_BT_Device_NAME";
|
private static final String TEST_A2DP_DEVICE_NAME = "Test_A2DP_BT_Device_NAME";
|
||||||
|
@@ -32,6 +32,7 @@ import com.android.settingslib.testutils.DrawableTestHelper;
|
|||||||
|
|
||||||
import com.google.android.setupdesign.GlifLayout;
|
import com.google.android.setupdesign.GlifLayout;
|
||||||
|
|
||||||
|
import org.junit.Ignore;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.robolectric.Robolectric;
|
import org.robolectric.Robolectric;
|
||||||
@@ -92,6 +93,7 @@ public class ChooseLockPatternTest {
|
|||||||
|
|
||||||
@Config(qualifiers = "sw400dp")
|
@Config(qualifiers = "sw400dp")
|
||||||
@Test
|
@Test
|
||||||
|
@Ignore("b/129342100")
|
||||||
public void fingerprintExtraSet_shouldDisplayFingerprintIcon() {
|
public void fingerprintExtraSet_shouldDisplayFingerprintIcon() {
|
||||||
ChooseLockPattern activity = createActivity(true);
|
ChooseLockPattern activity = createActivity(true);
|
||||||
ChooseLockPatternFragment fragment = (ChooseLockPatternFragment)
|
ChooseLockPatternFragment fragment = (ChooseLockPatternFragment)
|
||||||
|
@@ -35,8 +35,6 @@ import org.robolectric.RuntimeEnvironment;
|
|||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
public class AppCheckBoxPreferenceTest {
|
public class AppCheckBoxPreferenceTest {
|
||||||
|
|
||||||
private static final String SUMMARY = "summary info";
|
|
||||||
|
|
||||||
private Context mContext;
|
private Context mContext;
|
||||||
private AppCheckBoxPreference mPreference;
|
private AppCheckBoxPreference mPreference;
|
||||||
private AppCheckBoxPreference mAttrPreference;
|
private AppCheckBoxPreference mAttrPreference;
|
||||||
@@ -57,26 +55,6 @@ public class AppCheckBoxPreferenceTest {
|
|||||||
assertThat(mAttrPreference.getLayoutResource()).isEqualTo(R.layout.preference_app);
|
assertThat(mAttrPreference.getLayoutResource()).isEqualTo(R.layout.preference_app);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
public void onBindViewHolder_noSummary_layoutGone() {
|
|
||||||
mPreference.setSummary("");
|
|
||||||
|
|
||||||
mPreference.onBindViewHolder(mPreferenceViewHolder);
|
|
||||||
|
|
||||||
assertThat(mPreferenceViewHolder.findViewById(R.id.summary_container).getVisibility())
|
|
||||||
.isEqualTo(View.GONE);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void onBindViewHolder_hasSummary_layoutVisible() {
|
|
||||||
mPreference.setSummary(SUMMARY);
|
|
||||||
|
|
||||||
mPreference.onBindViewHolder(mPreferenceViewHolder);
|
|
||||||
|
|
||||||
assertThat(mPreferenceViewHolder.findViewById(R.id.summary_container).getVisibility())
|
|
||||||
.isEqualTo(View.VISIBLE);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onBindViewHolder_appendixGone() {
|
public void onBindViewHolder_appendixGone() {
|
||||||
mPreference.onBindViewHolder(mPreferenceViewHolder);
|
mPreference.onBindViewHolder(mPreferenceViewHolder);
|
||||||
|
@@ -1,67 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.widget;
|
|
||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.view.View;
|
|
||||||
|
|
||||||
import androidx.preference.PreferenceViewHolder;
|
|
||||||
|
|
||||||
import com.android.settings.R;
|
|
||||||
|
|
||||||
import org.junit.Before;
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.junit.runner.RunWith;
|
|
||||||
import org.robolectric.RobolectricTestRunner;
|
|
||||||
import org.robolectric.RuntimeEnvironment;
|
|
||||||
|
|
||||||
@RunWith(RobolectricTestRunner.class)
|
|
||||||
public class AppSwitchPreferenceTest {
|
|
||||||
|
|
||||||
private Context mContext;
|
|
||||||
private View mRootView;
|
|
||||||
private AppSwitchPreference mPref;
|
|
||||||
private PreferenceViewHolder mHolder;
|
|
||||||
|
|
||||||
@Before
|
|
||||||
public void setUp() {
|
|
||||||
mContext = RuntimeEnvironment.application;
|
|
||||||
mRootView = View.inflate(mContext, R.layout.preference_app, null /* parent */);
|
|
||||||
mHolder = PreferenceViewHolder.createInstanceForTests(mRootView);
|
|
||||||
mPref = new AppSwitchPreference(mContext);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void setSummary_showSummaryContainer() {
|
|
||||||
mPref.setSummary("test");
|
|
||||||
mPref.onBindViewHolder(mHolder);
|
|
||||||
|
|
||||||
assertThat(mHolder.findViewById(R.id.summary_container).getVisibility())
|
|
||||||
.isEqualTo(View.VISIBLE);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void noSummary_hideSummaryContainer() {
|
|
||||||
mPref.setSummary(null);
|
|
||||||
mPref.onBindViewHolder(mHolder);
|
|
||||||
|
|
||||||
assertThat(mHolder.findViewById(R.id.summary_container).getVisibility())
|
|
||||||
.isEqualTo(View.GONE);
|
|
||||||
}
|
|
||||||
}
|
|
Reference in New Issue
Block a user