filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AOSP/Messaging - Moved LOCAL_COMPATIBILITY_SUITE to tests/Android.mk.

Browse Source 
+ Deleted the unnecessary blankId check. Updated the TODO comment for NUM_TEST_CONVERSATIONS+4.
+ Added AndroidTest.xml
+ Added "LOCAL_PROGUARD_ENABLED := disabled" for tests to pass on cf.

Bug: 126516784

Test: make messagingtests and tested the messaging UI manually. Ran the following CTS tests on Pixel phone.

$ make -j 40
  -rw-r--r-- 1 rtenneti primarygroup 8529760 Mar  8 16:46 out/target/product/marlin/system/app/messaging/messaging.apk

$ make messagingtests -j
  -rw-r--r-- 1 rtenneti primarygroup 729713 Mar 13 14:22 out/target/product/marlin/testcases/messagingtests/messagingtests.apk

$ adb install -r -d out/target/product/marlin/system/app/messaging/messaging.apk
$ adb install -r -d out/target/product/marlin/testcases/messagingtests/messagingtests.apk

atest
-----
$ cd .../packages/apps/Messaging
$ atest
  ...
  Results from tests that require device:

  Summary
  -------
  messagingtests: Passed: 113, Failed: 0, Ignored: 0

  All tests passed!

acloud test
-----------
$ lunch aosp_cf_x86_phone-userdebug

$ make -j 40
  -rw-r--r-- 1 rtenneti primarygroup 10585182 Mar 15 15:19 ./target/product/vsoc_x86/system/app/messaging/messaging.apk
$ make messagingtests -j
  -rw-r--r-- 1 rtenneti primarygroup 643697 Mar 15 15:57 ./target/product/vsoc_x86/system/app/messagingtests/messagingtests.apk

$ acloud reconnect
$ adb devices
  List of devices attached
  127.0.0.1:52761	device

$ adb install -r -d out/target/product/vsoc_x86/system/app/messaging/messaging.apk
$ adb install -r -d out/target/product/vsoc_x86/system/app/messagingtests/messagingtests.apk

$ cd packages/apps/Messaging
$ atest messagingtests -- --abi x86 --serial 127.0.0.1:52761

Change-Id: I6b1143db6c596805f3c48f310323e0e02d344d00
This commit is contained in:
Raman Tenneti
2019-04-24 22:32:45 +00:00
parent 7d08344e9b
commit a3b82b5fff
7 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java
+2 -10
View File
@@ -67,12 +67,6 @@ public class GetOrCreateConversationActionTest extends BugleTestCase {
final long threadId = MmsUtils.getOrCreateThreadId(mContext, recipients);
assertEquals(TestDataFactory.SMS_MMS_THREAD_ID_CURSOR_VALUE, threadId);
// TestDataFactory creates NUM_TEST_CONVERSATIONS conversations. blank
// conversation would be the next conversation.
final String blankId = BugleDatabaseOperations.getExistingConversation(db, threadId, false);
// TODO(rtenneti): Investigate why blankId is 4 more than NUM_TEST_CONVERSATIONS.
assertEquals(TestDataFactory.NUM_TEST_CONVERSATIONS+4, Integer.parseInt((String)blankId));
ArrayList<StubActionServiceCallLog> calls = mService.getCalls();
GetOrCreateConversationActionMonitor monitor =
@@ -91,8 +85,7 @@ public class GetOrCreateConversationActionTest extends BugleTestCase {
assertTrue(result instanceof String);
// Make sure that we created a new conversation
// TODO(rtenneti): Investigate why blankId is 4 more than NUM_TEST_CONVERSATIONS.
assertEquals(TestDataFactory.NUM_TEST_CONVERSATIONS+4, Integer.parseInt((String)result));
assertEquals(TestDataFactory.NUM_TEST_CONVERSATIONS, Integer.parseInt((String)result));
// Now get the conversation that we just created again
monitor = GetOrCreateConversationAction.getOrCreateConversation(participants, null,
@@ -110,8 +103,7 @@ public class GetOrCreateConversationActionTest extends BugleTestCase {
final String conversationId = (String) result;
// Make sure that we found the same conversation id
// TODO(rtenneti): Investigate why blankId is 4 more than NUM_TEST_CONVERSATIONS.
assertEquals(TestDataFactory.NUM_TEST_CONVERSATIONS+4, Integer.parseInt((String)result));
assertEquals(TestDataFactory.NUM_TEST_CONVERSATIONS, Integer.parseInt((String)result));
final ArrayList<ParticipantData> conversationParticipants =
BugleDatabaseOperations.getParticipantsForConversation(db, conversationId);