Snap for 11566466 from be4fa997d10e0275852acef68e10c0026775ea1c to car-apps-aosp-releaseub-automotive-master-20240521ub-automotive-master-20240314mirror-car-apps-aosp-release

Change-Id: Ieb45ba8bd6846f4060d293bbf0aac33d2ca964fa

2 files changed, 39 insertions, 8 deletions

diff --git a/build.gradle b/build.gradle
index 3d3bad0..a25cd15 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,6 +25,7 @@ android {
         applicationId 'com.android.car.calendar'
         minSdkVersion 28
         targetSdkVersion gradle.ext.aaosTargetSDK
+        testInstrumentationRunnerArguments clearPackageData: 'true', coverage: 'true'
         versionCode gradle.ext.getVersionCode()
         versionName gradle.ext.getVersionName()
     }
@@ -45,16 +46,13 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError false
-    }
-
     flavorDimensions 'devMode'
     productFlavors {
         prod {
             dimension 'devMode'
             signingConfig signingConfigs.aaos
         }
+
         platform {
             dimension 'devMode'
             signingConfig signingConfigs.platform
@@ -68,9 +66,8 @@ android {
             res.srcDirs = ['res']
         }
 
-        platform {
-            java.srcDirs = ['src']
-        }
+        androidTest.setRoot('tests')
+        androidTest.java.srcDirs = ['tests/unit/src', 'tests/ui/src']
     }
 
     compileOptions {
@@ -101,6 +98,27 @@ android {
             }
         }
     }
+
+    lintOptions {
+        // Ignore duplicate resources due to existence of overlayable.xml
+        ignore 'DuplicateDefinition'
+        // Ignore protected permissions since Dialer is system app
+        ignore 'ProtectedPermissions'
+        // Ignore ImageView using android:tint
+        ignore 'UseAppTint'
+        // Ignore quantity errors for translations
+        ignore 'MissingQuantity'
+        ignore 'ImpliedQuantity'
+        // Ignore missing translations
+        ignore 'MissingTranslation'
+
+        // Ignore error when a translated string/plural is removed
+        ignore 'MissingDefaultResource'
+
+        abortOnError false
+    }
+
+    useLibrary 'android.test.mock'
 }
 
 dependencies {
@@ -117,4 +135,17 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
 
     implementation 'com.google.guava:guava:30.1.1-android'
+
+    //Test libs
+    androidTestImplementation project(':car-ui-lib-testing')
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test:core:1.5.0'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test:rules:1.5.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
+    androidTestImplementation 'com.google.truth:truth:1.1.3'
+    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito-inline-extended:2.28.1'
+    androidTestImplementation 'org.hamcrest:hamcrest:2.2'
 }
diff --git a/tests/unit/src/com/android/car/calendar/common/CalendarFormatterTest.java b/tests/unit/src/com/android/car/calendar/common/CalendarFormatterTest.java
index 1af9d6a..e210464 100644
--- a/tests/unit/src/com/android/car/calendar/common/CalendarFormatterTest.java
+++ b/tests/unit/src/com/android/car/calendar/common/CalendarFormatterTest.java
@@ -22,7 +22,7 @@ import android.content.Context;
 
 import androidx.test.filters.SmallTest;
 import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;