diff options
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | proguard-release.flags | 2 | ||||
| -rwxr-xr-x | proguard-test.flags | 2 | ||||
| -rw-r--r-- | proguard.flags | 1 | ||||
| -rw-r--r-- | tests/Android.mk | 4 | ||||
| -rw-r--r-- | tests/AndroidTest.xml | 30 | ||||
| -rw-r--r-- | tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java | 6 |
7 files changed, 45 insertions, 4 deletions
@@ -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 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2019 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<configuration description="Runs Messaging Tests."> + <option name="test-suite-tag" value="apct" /> + <option name="test-suite-tag" value="apct-instrumentation" /> + <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> + <option name="cleanup-apks" value="true" /> + <option name="test-file-name" value="messagingtests.apk" /> + <option name="test-file-name" value="messaging.apk" /> + </target_preparer> + + <test class="com.android.tradefed.testtype.InstrumentationTest" > + <option name="package" value="com.android.messaging.test" /> + <option name="runner" value="android.test.InstrumentationTestRunner" /> + </test> +</configuration> + diff --git a/tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java b/tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java index 9643b1e..f98d090 100644 --- a/tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java +++ b/tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java @@ -85,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, @@ -104,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); |