Merge "Revert "Remove @Ignore from class level"" (fce528d4) · Commits · e / os / android_frameworks_base

packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ import org.junit.Test;
		import org.junit.runner.RunWith;

		@SmallTest
		@Ignore("failing")
		@RunWith(AndroidTestingRunner.class)
		@RunWithLooper
		public class DozeTriggersTest extends SysuiTestCase {
		@@ -89,7 +90,6 @@ public class DozeTriggersTest extends SysuiTestCase {
		}

		@Test
		@Ignore
		public void testOnNotification_stillWorksAfterOneFailedProxCheck() throws Exception {
		when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE);

		@@ -111,7 +111,6 @@ public class DozeTriggersTest extends SysuiTestCase {
		}

		@Test
		@Ignore
		public void testDockEventListener_registerAndUnregister() {
		mTriggers.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED);

		@@ -123,7 +122,6 @@ public class DozeTriggersTest extends SysuiTestCase {
		}

		@Test
		@Ignore
		public void testOnSensor_whenUndockedWithNearAndDoubleTapScreen_shouldNotWakeUp() {
		mSensors.getMockProximitySensor().sendProximityResult(false /* far */);

		@@ -135,7 +133,6 @@ public class DozeTriggersTest extends SysuiTestCase {
		}

		@Test
		@Ignore
		public void testOnSensor_whenDockedWithNearAndDoubleTapScreen_shouldWakeUp() {
		doReturn(true).when(mDockManagerFake).isDocked();
		mSensors.getMockProximitySensor().sendProximityResult(false /* far */);

+1 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ import org.junit.runner.RunWith;
		@RunWith(AndroidTestingRunner.class)
		@RunWithLooper
		@SmallTest
		@Ignore
		public class QSFragmentTest extends SysuiBaseFragmentTest {

		private MetricsLogger mMockMetricsLogger;

+1 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ import org.mockito.MockitoAnnotations;
		@SmallTest
		@RunWith(AndroidTestingRunner.class)
		@TestableLooper.RunWithLooper
		@Ignore("b/118400112")
		public class NonPhoneDependencyTest extends SysuiTestCase {
		@Mock private NotificationPresenter mPresenter;
		@Mock private NotificationListContainer mListContainer;