commit 451d67d21cc1558ead33ddc61af1b84f383578a0
author Leland Miller <lelandmiller@google.com> Fri Aug 16 18:58:55 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 16 18:58:55 2019 -0700
tree 8fde2ecd5adef608aa7290b4819acb5d72899a45
parent 6bd1f2f6235d36b6d87532c335618321e4b65aab
parent d14b09335f70506e131a5efa67e2fff6e49f40ad

Merge "Ignore flaky locked message test"
am: d14b09335f

Change-Id: I522a332631198d8dd518e10946e1209b7ac19ed6

tests/tests/telephonyprovider/src/android/telephonyprovider/cts/LockedMessageTest.java

diff --git a/tests/tests/telephonyprovider/src/android/telephonyprovider/cts/LockedMessageTest.java b/tests/tests/telephonyprovider/src/android/telephonyprovider/cts/LockedMessageTest.java
index 89c52f4..f3d04cb 100644
--- a/tests/tests/telephonyprovider/src/android/telephonyprovider/cts/LockedMessageTest.java
+++ b/tests/tests/telephonyprovider/src/android/telephonyprovider/cts/LockedMessageTest.java
@@ -31,6 +31,7 @@
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 @SmallTest
@@ -66,12 +67,13 @@
      * and SMS messages.
      */
     @Test
+    @Ignore
     public void testLockedMessage_atMostOneLockedMessage() {
         Uri mmsUri = insertMmsWithLockedMessage();
-        String mms_id = mmsUri.getLastPathSegment();
+        String mmsId = mmsUri.getLastPathSegment();
 
         Uri smsUri = insertSmsWithLockedMessage();
-        String sms_id = smsUri.getLastPathSegment();
+        String smsId = smsUri.getLastPathSegment();
 
         Cursor cursor = mContentResolver.query(Telephony.MmsSms.CONTENT_LOCKED_URI, null, null,
                 null);
@@ -80,9 +82,9 @@
         assertThat(cursor.getColumnCount()).isEqualTo(1);
         assertThat(cursor.getColumnNames()).isEqualTo(new String[]{Telephony.BaseMmsColumns._ID});
         assertThat(cursor.getInt(cursor.getColumnIndex(Telephony.BaseMmsColumns._ID)))
-                .isNotEqualTo(Integer.parseInt(mms_id));
+                .isNotEqualTo(Integer.parseInt(mmsId));
         assertThat(cursor.getInt(cursor.getColumnIndex(Telephony.BaseMmsColumns._ID)))
-                .isEqualTo(Integer.parseInt(sms_id));
+                .isEqualTo(Integer.parseInt(smsId));
     }
 
     /**