From 53d4a34c656de1387f36040798d0cdfa5c90feb6 Mon Sep 17 00:00:00 2001
From: Julien Desprez <jdesprez@google.com>
Date: Thu, 7 Feb 2019 08:40:48 -0800
Subject: [PATCH] Remove @Ignore from class level

AJUR doesn't support @Ignore on class level, it dumps some
invalid "null" method when it sees those. Instead only rely
on method level @Ignore.

Test: atest SystemUITests:com.android.systemui.statusbar.NonPhoneDependencyTest
Bug: 122613124
Change-Id: Ic3e2d0a77922c6bcd99554092c9048828c49a351
---
 .../src/com/android/systemui/doze/DozeTriggersTest.java      | 5 ++++-
 .../tests/src/com/android/systemui/qs/QSFragmentTest.java    | 1 -
 .../android/systemui/statusbar/NonPhoneDependencyTest.java   | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
index cdac7c979c550..c0dca354f5f73 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
@@ -50,7 +50,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @SmallTest
-@Ignore("failing")
 @RunWith(AndroidTestingRunner.class)
 @RunWithLooper
 public class DozeTriggersTest extends SysuiTestCase {
@@ -90,6 +89,7 @@ public class DozeTriggersTest extends SysuiTestCase {
     }
 
     @Test
+    @Ignore
     public void testOnNotification_stillWorksAfterOneFailedProxCheck() throws Exception {
         when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE);
 
@@ -111,6 +111,7 @@ public class DozeTriggersTest extends SysuiTestCase {
     }
 
     @Test
+    @Ignore
     public void testDockEventListener_registerAndUnregister() {
         mTriggers.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED);
 
@@ -122,6 +123,7 @@ public class DozeTriggersTest extends SysuiTestCase {
     }
 
     @Test
+    @Ignore
     public void testOnSensor_whenUndockedWithNearAndDoubleTapScreen_shouldNotWakeUp() {
         mSensors.getMockProximitySensor().sendProximityResult(false /* far */);
 
@@ -133,6 +135,7 @@ public class DozeTriggersTest extends SysuiTestCase {
     }
 
     @Test
+    @Ignore
     public void testOnSensor_whenDockedWithNearAndDoubleTapScreen_shouldWakeUp() {
         doReturn(true).when(mDockManagerFake).isDocked();
         mSensors.getMockProximitySensor().sendProximityResult(false /* far */);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java
index 823485f4624d5..769fdb5bb8426 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java
@@ -56,7 +56,6 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidTestingRunner.class)
 @RunWithLooper
 @SmallTest
-@Ignore
 public class QSFragmentTest extends SysuiBaseFragmentTest {
 
     private MetricsLogger mMockMetricsLogger;
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NonPhoneDependencyTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NonPhoneDependencyTest.java
index 8e92684876f66..39e1d101b9454 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NonPhoneDependencyTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NonPhoneDependencyTest.java
@@ -52,7 +52,6 @@ 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;