Merge "Ignore failing tests under com.android.settings.panel" into main
This commit is contained in:
@@ -42,6 +42,7 @@ import com.android.settings.R;
|
|||||||
import com.android.settings.testutils.FakeFeatureFactory;
|
import com.android.settings.testutils.FakeFeatureFactory;
|
||||||
|
|
||||||
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.ArgumentCaptor;
|
import org.mockito.ArgumentCaptor;
|
||||||
@@ -54,6 +55,7 @@ import org.robolectric.annotation.LooperMode;
|
|||||||
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
|
@Ignore("b/313576125")
|
||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
@LooperMode(LooperMode.Mode.LEGACY)
|
@LooperMode(LooperMode.Mode.LEGACY)
|
||||||
@Config(shadows = {
|
@Config(shadows = {
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ import com.android.settings.testutils.FakeFeatureFactory;
|
|||||||
|
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
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.ArgumentCaptor;
|
import org.mockito.ArgumentCaptor;
|
||||||
@@ -125,6 +126,7 @@ public class PanelSlicesAdapterTest {
|
|||||||
/**
|
/**
|
||||||
* ViewHolder should load and set the action label correctly.
|
* ViewHolder should load and set the action label correctly.
|
||||||
*/
|
*/
|
||||||
|
@Ignore("b/313576125")
|
||||||
@Test
|
@Test
|
||||||
public void setActionLabel_loadsActionLabel() {
|
public void setActionLabel_loadsActionLabel() {
|
||||||
addTestLiveData(VOLUME_NOTIFICATION_URI);
|
addTestLiveData(VOLUME_NOTIFICATION_URI);
|
||||||
@@ -165,6 +167,7 @@ public class PanelSlicesAdapterTest {
|
|||||||
return foundLabel;
|
return foundLabel;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Ignore("b/313576125")
|
||||||
@Test
|
@Test
|
||||||
public void sizeOfAdapter_shouldNotExceedMaxNum() {
|
public void sizeOfAdapter_shouldNotExceedMaxNum() {
|
||||||
for (int i = 0; i < MAX_NUM_OF_SLICES + 2; i++) {
|
for (int i = 0; i < MAX_NUM_OF_SLICES + 2; i++) {
|
||||||
@@ -183,6 +186,7 @@ public class PanelSlicesAdapterTest {
|
|||||||
assertThat(adapter.getData().size()).isEqualTo(MAX_NUM_OF_SLICES);
|
assertThat(adapter.getData().size()).isEqualTo(MAX_NUM_OF_SLICES);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Ignore("b/313576125")
|
||||||
@Test
|
@Test
|
||||||
public void mediaOutputIndicatorSlice_notSliderPanel_noSliderLayout() {
|
public void mediaOutputIndicatorSlice_notSliderPanel_noSliderLayout() {
|
||||||
addTestLiveData(MEDIA_OUTPUT_INDICATOR_SLICE_URI);
|
addTestLiveData(MEDIA_OUTPUT_INDICATOR_SLICE_URI);
|
||||||
@@ -199,6 +203,7 @@ public class PanelSlicesAdapterTest {
|
|||||||
assertThat(viewHolder.mSliceSliderLayout).isNull();
|
assertThat(viewHolder.mSliceSliderLayout).isNull();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Ignore("b/313576125")
|
||||||
@Test
|
@Test
|
||||||
public void onBindViewHolder_viewTypeSlider_verifyActionLabelSet() {
|
public void onBindViewHolder_viewTypeSlider_verifyActionLabelSet() {
|
||||||
addTestLiveData(VOLUME_NOTIFICATION_URI);
|
addTestLiveData(VOLUME_NOTIFICATION_URI);
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin;
|
|||||||
|
|
||||||
import org.junit.After;
|
import org.junit.After;
|
||||||
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.ArgumentCaptor;
|
import org.mockito.ArgumentCaptor;
|
||||||
@@ -101,6 +102,7 @@ public class SettingsPanelActivityTest {
|
|||||||
mSettingsPanelActivity.getResources().getConfiguration().uiMode = mOriginalUiMode;
|
mSettingsPanelActivity.getResources().getConfiguration().uiMode = mOriginalUiMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Ignore("b/313576125")
|
||||||
@Test
|
@Test
|
||||||
public void onStart_isNotDebuggable_shouldHideSystemOverlay() {
|
public void onStart_isNotDebuggable_shouldHideSystemOverlay() {
|
||||||
ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", false);
|
ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", false);
|
||||||
@@ -117,6 +119,7 @@ public class SettingsPanelActivityTest {
|
|||||||
verify(window).addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
|
verify(window).addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Ignore("b/313576125")
|
||||||
@Test
|
@Test
|
||||||
public void onStop_isNotDebuggable_shouldRemoveHideSystemOverlay() {
|
public void onStop_isNotDebuggable_shouldRemoveHideSystemOverlay() {
|
||||||
ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", false);
|
ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", false);
|
||||||
@@ -144,6 +147,7 @@ public class SettingsPanelActivityTest {
|
|||||||
& SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS).isEqualTo(0);
|
& SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS).isEqualTo(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Ignore("b/313576125")
|
||||||
@Test
|
@Test
|
||||||
public void onStop_panelIsNotCreating_shouldForceUpdate() {
|
public void onStop_panelIsNotCreating_shouldForceUpdate() {
|
||||||
mSettingsPanelActivity.mForceCreation = false;
|
mSettingsPanelActivity.mForceCreation = false;
|
||||||
@@ -155,6 +159,7 @@ public class SettingsPanelActivityTest {
|
|||||||
assertThat(mSettingsPanelActivity.mForceCreation).isTrue();
|
assertThat(mSettingsPanelActivity.mForceCreation).isTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Ignore("b/313576125")
|
||||||
@Test
|
@Test
|
||||||
public void onStop_panelIsCreating_shouldNotForceUpdate() {
|
public void onStop_panelIsCreating_shouldNotForceUpdate() {
|
||||||
mSettingsPanelActivity.mForceCreation = false;
|
mSettingsPanelActivity.mForceCreation = false;
|
||||||
|
|||||||
Reference in New Issue
Block a user