Update test annotations

Author: keyboardsurfer

OurStreets/app/build.gradle

@@ -38,6 +38,7 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            resValue "string", "google_maps_key", "\"${maps_api_key}\""
         }
     }
     packagingOptions {
@@ -62,6 +63,8 @@ dependencies {
     implementation "com.firebase:firebase-client-android:${firebaseVersion}"
     implementation "com.google.android.gms:play-services-maps:${mapsVersion}"
     implementation "com.google.maps.android:android-maps-utils:${mapsUtilsVersion}"
+
+    testImplementation "androidx.test:runner:1.2.0"
     testImplementation 'junit:junit:4.12'
     testImplementation "org.hamcrest:hamcrest-core:${hamcrestVersion}"
     testImplementation "org.hamcrest:hamcrest-library:${hamcrestVersion}"

OurStreets/app/src/test/java/com/google/samples/apps/ourstreets/model/DetailTest.java

@@ -16,15 +16,14 @@
 
 package com.google.samples.apps.ourstreets.model;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.google.android.gms.maps.model.LatLng;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
@@ -80,4 +79,4 @@ public void testGetTilt() {
     public void testGetBearing() {
         assertThat( Math.abs(mDetailUnderTest.getBearing() - mBearing) < MAX_FLOAT_DELTA, is(true));
     }
-}
+}

OurStreets/app/src/test/java/com/google/samples/apps/ourstreets/model/GalleryTest.java

@@ -16,7 +16,7 @@
 
 package com.google.samples.apps.ourstreets.model;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.google.android.gms.maps.model.LatLng;
 
@@ -111,4 +111,4 @@ public void testGetBounds_none() {
         mGalleryUnderTest.replaceDetails(testList);
         assertThat(mGalleryUnderTest.getBounds(), notNullValue());
     }
-}
+}