From a3b82b5fff723cb0fc80175a8c7398dd7f63f77a Mon Sep 17 00:00:00 2001 From: Raman Tenneti Date: Wed, 13 Mar 2019 14:29:53 -0700 Subject: [PATCH] AOSP/Messaging - Moved LOCAL_COMPATIBILITY_SUITE to tests/Android.mk. + 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 --- Android.mk | 4 +++ proguard-release.flags | 2 ++ proguard-test.flags | 2 ++ proguard.flags | 1 + tests/Android.mk | 4 +++ tests/AndroidTest.xml | 30 +++++++++++++++++++ .../GetOrCreateConversationActionTest.java | 12 ++------ 7 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 tests/AndroidTest.xml diff --git a/Android.mk b/Android.mk index b21b98f..9309776 100644 --- a/Android.mk +++ b/Android.mk @@ -70,6 +70,10 @@ LOCAL_CERTIFICATE := platform LOCAL_SDK_VERSION := current +LOCAL_MODULE_PATH := $(TARGET_OUT_APPS) + +LOCAL_COMPATIBILITY_SUITE := general-tests + include $(BUILD_PACKAGE) include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/proguard-release.flags b/proguard-release.flags index 36b6720..67ae150 100644 --- a/proguard-release.flags +++ b/proguard-release.flags @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +-keep class com.android.messaging.ui.contact.* { *; } + -assumenosideeffects public class com.android.messaging.util.Trace { public void beginSection(...); public void endSection(...); diff --git a/proguard-test.flags b/proguard-test.flags index 46e569f..353970a 100755 --- a/proguard-test.flags +++ b/proguard-test.flags @@ -35,6 +35,8 @@ !private *; } +-keep class com.android.messaging.ui.contact.* { *; } + # Keep the classes needed by emma -keep class com.vladium.** { *; } diff --git a/proguard.flags b/proguard.flags index 44f6ccd..cb04900 100644 --- a/proguard.flags +++ b/proguard.flags @@ -21,6 +21,7 @@ -keepclassmembers class * { @com.google.common.annotations.VisibleForTesting *; } +-keep class com.android.messaging.ui.contact.* { *; } # Keep methods that have the @VisibleForAnimation annotation -keep @interface com.android.messaging.annotation.VisibleForAnimation diff --git a/tests/Android.mk b/tests/Android.mk index dc1999b..aaff57a 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -24,9 +24,13 @@ LOCAL_PACKAGE_NAME := messagingtests LOCAL_INSTRUMENTATION_FOR := messaging +LOCAL_PROGUARD_ENABLED := disabled + # Matching ../Android.mk LOCAL_SDK_VERSION := current +LOCAL_COMPATIBILITY_SUITE := general-tests + LOCAL_CERTIFICATE := platform LOCAL_STATIC_JAVA_LIBRARIES := \ diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml new file mode 100644 index 0000000..601bc8e --- /dev/null +++ b/tests/AndroidTest.xml @@ -0,0 +1,30 @@ + + + + + diff --git a/tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java b/tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java index 1c0d0b5..f98d090 100644 --- a/tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java +++ b/tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java @@ -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 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 conversationParticipants = BugleDatabaseOperations.getParticipantsForConversation(db, conversationId);