Merge "DO NOT MERGE: CDD Annotations for Section 3.8.3" into oreo-mr1-cts-dev
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/NotificationListenerVerifierActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/NotificationListenerVerifierActivity.java
index 269f4fd..7f3bfc7 100755
--- a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/NotificationListenerVerifierActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/NotificationListenerVerifierActivity.java
@@ -32,6 +32,8 @@
import com.android.cts.verifier.R;
+import com.android.compatibility.common.util.CddTest;
+
import org.json.JSONException;
import org.json.JSONObject;
@@ -45,6 +47,7 @@
import static junit.framework.Assert.assertNotNull;
+@CddTest(requirement="3.8.3.2/C-1-1,C-1-2,C-2-1")
public class NotificationListenerVerifierActivity extends InteractiveVerifierActivity
implements Runnable {
private static final String TAG = "NoListenerVerifier";
diff --git a/tests/app/src/android/app/cts/NotificationChannelTest.java b/tests/app/src/android/app/cts/NotificationChannelTest.java
index 70ec9cf..c54df84 100644
--- a/tests/app/src/android/app/cts/NotificationChannelTest.java
+++ b/tests/app/src/android/app/cts/NotificationChannelTest.java
@@ -28,6 +28,9 @@
import android.provider.Settings;
import android.test.AndroidTestCase;
+import com.android.compatibility.common.util.CddTest;
+
+@CddTest(requirement="3.8.3.1/C-1-1,C-1-4")
public class NotificationChannelTest extends AndroidTestCase {
@Override
diff --git a/tests/app/src/android/app/cts/NotificationManagerTest.java b/tests/app/src/android/app/cts/NotificationManagerTest.java
index b6077ca..4ee7eaf 100644
--- a/tests/app/src/android/app/cts/NotificationManagerTest.java
+++ b/tests/app/src/android/app/cts/NotificationManagerTest.java
@@ -36,6 +36,8 @@
import android.test.AndroidTestCase;
import android.util.Log;
+import com.android.compatibility.common.util.CddTest;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -43,6 +45,7 @@
import java.util.Map;
import java.util.UUID;
+@CddTest(requirement="3.8.3.1/C-1-3,C-1-4")
public class NotificationManagerTest extends AndroidTestCase {
final String TAG = NotificationManagerTest.class.getSimpleName();
final boolean DEBUG = false;
@@ -173,6 +176,7 @@
compareChannels(channel, mNotificationManager.getNotificationChannel(channel.getId()));
}
+ @CddTest(requirement="3.8.3.1/C-1-3")
public void testCreateChannelWithGroup() throws Exception {
NotificationChannelGroup ncg = new NotificationChannelGroup("g", "n");
mNotificationManager.createNotificationChannelGroup(ncg);
@@ -387,6 +391,7 @@
checkNotificationExistence(id, false);
}
+ @CddTest(requirement="3.8.3/H-0-2,3.8.3.1/C-2-1")
public void testMediaStyle() throws Exception {
mNotificationManager.cancelAll();
final int id = 99;
@@ -438,6 +443,7 @@
}
}
+ @CddTest(requirement="3.8.3/H-0-2,3.8.3.1/C-2-1")
public void testBigTextStyle() throws Exception {
final int id = 101;
@@ -464,6 +470,7 @@
}
}
+ @CddTest(requirement="3.8.3/H-0-2,3.8.3.1/C-2-1")
public void testBigPictureStyle() throws Exception {
final int id = 102;
@@ -491,6 +498,7 @@
}
}
+ @CddTest(requirement="3.8.3.1/C-1-3")
public void testAutogrouping() throws Exception {
sendNotification(1, R.drawable.black);
sendNotification(2, R.drawable.blue);
@@ -501,6 +509,7 @@
assertAllPostedNotificationsAutogrouped();
}
+ @CddTest(requirement="3.8.3.1/C-1-3")
public void testAutogrouping_autogroupStaysUntilAllNotificationsCanceled() throws Exception {
sendNotification(1, R.drawable.black);
sendNotification(2, R.drawable.blue);
diff --git a/tests/app/src/android/app/cts/NotificationTest.java b/tests/app/src/android/app/cts/NotificationTest.java
index 25c25e3..47ab3a1 100644
--- a/tests/app/src/android/app/cts/NotificationTest.java
+++ b/tests/app/src/android/app/cts/NotificationTest.java
@@ -29,8 +29,11 @@
import android.test.AndroidTestCase;
import android.widget.RemoteViews;
+import com.android.compatibility.common.util.CddTest;
+
import org.mockito.internal.matchers.Not;
+@CddTest(requirement="3.8.3/H-0-1,3.8.3.1/C-1-4")
public class NotificationTest extends AndroidTestCase {
private static final String TEXT_RESULT_KEY = "text";
private static final String DATA_RESULT_KEY = "data";