From 60806f81e72d62be7577fcc43e87c711bd88eb20 Mon Sep 17 00:00:00 2001
From: Raman Tenneti <rtenneti@google.com>
Date: Fri, 29 Mar 2019 15:06:32 -0700
Subject: AOSP/Calendar -Added TEST_MAPPING file and "LOCAL_COMPATIBILITY_SUITE
 := general-tests" to enable presubmit tests for Calendar.

Bug: 127848297

Test: manual - Ran the following CTS tests on Pixel phone. Tested the calendar UI.

$ make -j 40
$ make CalendarTests -j

$ adb install -r out/target/product/marlin/system/app/Calendar/Calendar.apk
$ adb install -r out/target/product/marlin/testcases/CalendarTests/CalendarTests.apk

$ adb shell am instrument -w com.android.calendar.tests

$ ./development/testrunner/runtest.py --path cts/tests/tests/provider/src/android/provider/cts/CalendarTest.java

atest
-----
$ cd packages/apps/Calendar
$ atest

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

$ make -j 40
$ make CalendarTests -j

$ acloud reconnect
$ adb devices
  127.0.0.1:52761	device

$ cd packages/apps/Calendar
$ atest CalendarTests -- --abi x86 --serial 127.0.0.1:52761

Change-Id: I2347ab83ddaa30d4e069419a4d9196ce913fe533
---
 Android.mk            |  2 ++
 TEST_MAPPING          |  7 +++++++
 tests/Android.mk      |  2 ++
 tests/AndroidTest.xml | 30 ++++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+)
 create mode 100644 TEST_MAPPING
 create mode 100644 tests/AndroidTest.xml

diff --git a/Android.mk b/Android.mk
index 4b5744a7..6598e440 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,6 +37,8 @@ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
 
 LOCAL_PACKAGE_NAME := Calendar
 
+LOCAL_COMPATIBILITY_SUITE := general-tests
+
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags \
                              ../../../frameworks/opt/datetimepicker/proguard.flags
 
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 00000000..31049a6f
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "CalendarTests"
+    }
+  ]
+}
diff --git a/tests/Android.mk b/tests/Android.mk
index bacb8c04..253b813d 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -19,4 +19,6 @@ LOCAL_INSTRUMENTATION_FOR := Calendar
 LOCAL_STATIC_JAVA_LIBRARIES := android-common
 LOCAL_SDK_VERSION := 16
 
+LOCAL_COMPATIBILITY_SUITE := general-tests
+
 include $(BUILD_PACKAGE)
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
new file mode 100644
index 00000000..45f79a6f
--- /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 Calendar 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="CalendarTests.apk" />
+        <option name="test-file-name" value="Calendar.apk" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.InstrumentationTest" >
+        <option name="package" value="com.android.calendar.tests" />
+        <option name="runner" value="android.test.InstrumentationTestRunner" />
+    </test>
+</configuration>
+
-- 
cgit v1.2.3