Merge "Ignore catalyst test in DisplayScreenTest" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
dc8ed36f47
@@ -23,6 +23,7 @@ import com.android.settings.flags.Flags
|
|||||||
import com.android.settings.testutils.FakeFeatureFactory
|
import com.android.settings.testutils.FakeFeatureFactory
|
||||||
import com.android.settingslib.preference.CatalystScreenTestCase
|
import com.android.settingslib.preference.CatalystScreenTestCase
|
||||||
import com.google.common.truth.Truth.assertThat
|
import com.google.common.truth.Truth.assertThat
|
||||||
|
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.ArgumentMatchers.anyInt
|
import org.mockito.ArgumentMatchers.anyInt
|
||||||
@@ -65,6 +66,7 @@ class DisplayScreenTest : CatalystScreenTestCase() {
|
|||||||
assertThat(preferenceScreenCreator.isAvailable(contextWrapper)).isFalse()
|
assertThat(preferenceScreenCreator.isAvailable(contextWrapper)).isFalse()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Ignore("robolectric.createActivityContexts cause other test failure")
|
||||||
override fun migration() {
|
override fun migration() {
|
||||||
// avoid UnsupportedOperationException when getDisplay from context
|
// avoid UnsupportedOperationException when getDisplay from context
|
||||||
System.setProperty("robolectric.createActivityContexts", "true")
|
System.setProperty("robolectric.createActivityContexts", "true")
|
||||||
|
Reference in New Issue
Block a user