Merge pull request android#667 from googlesamples/dlam/fix-tests

Fix syntax errors + add androidx.test.core dependency for ApplicationProvider
mikelhm · Jul 1, 2019 · a857a49 · a857a49
2 parents e732a39 + 3078395
commit a857a49
Show file tree

Hide file tree

Showing 34 changed files with 95 additions and 56 deletions.
diff --git a/BasicRxJavaSample/versions.gradle b/BasicRxJavaSample/versions.gradle
@@ -24,6 +24,7 @@ def versions = [:]
 versions.android_gradle_plugin = '3.4.0'
 versions.apache_commons = "2.5"
 versions.arch_core = "2.0.1"
+versions.atsl_core = "1.1.0"
 versions.atsl_rules = "1.1.1"
 versions.atsl_runner = "1.1.1"
 versions.atsl_junit = "1.1.0"
@@ -117,6 +118,7 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
 deps.espresso = espresso
 
 def atsl = [:]
+atsl.core = "androidx.test:core:$versions.atsl_core"
 atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
 atsl.runner = "androidx.test:runner:$versions.atsl_runner"
 atsl.rules = "androidx.test:rules:$versions.atsl_rules"

diff --git a/BasicRxJavaSampleKotlin/versions.gradle b/BasicRxJavaSampleKotlin/versions.gradle
@@ -24,6 +24,7 @@ def versions = [:]
 versions.android_gradle_plugin = '3.4.0'
 versions.apache_commons = "2.5"
 versions.arch_core = "2.0.1"
+versions.atsl_core = "1.1.0"
 versions.atsl_rules = "1.1.1"
 versions.atsl_runner = "1.1.1"
 versions.atsl_junit = "1.1.0"
@@ -117,6 +118,7 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
 deps.espresso = espresso
 
 def atsl = [:]
+atsl.core = "androidx.test:core:$versions.atsl_core"
 atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
 atsl.runner = "androidx.test:runner:$versions.atsl_runner"
 atsl.rules = "androidx.test:rules:$versions.atsl_rules"

diff --git a/BasicSample/app/build.gradle b/BasicSample/app/build.gradle
@@ -70,6 +70,7 @@ dependencies {
  annotationProcessor deps.room.compiler
 
  // Android Testing Support Library's runner and rules
+ androidTestImplementation deps.atsl.core
  androidTestImplementation deps.atsl.runner
  androidTestImplementation deps.atsl.rules
  androidTestImplementation deps.room.testing

diff --git a/...cSample/app/src/androidTest/java/com/example/android/persistence/ui/MainActivityTest.java b/...cSample/app/src/androidTest/java/com/example/android/persistence/ui/MainActivityTest.java
@@ -15,34 +15,38 @@
  */
 package com.example.android.persistence.ui;
 
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.core.IsNot.not;
+import androidx.annotation.Nullable;
 import androidx.arch.core.executor.testing.CountingTaskExecutorRule;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
-import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.espresso.contrib.RecyclerViewActions;
 import androidx.test.espresso.matcher.ViewMatchers;
 import androidx.test.rule.ActivityTestRule;
+
 import com.example.android.persistence.AppExecutors;
 import com.example.android.persistence.EspressoTestUtil;
 import com.example.android.persistence.R;
 import com.example.android.persistence.db.AppDatabase;
+
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.core.IsNot.not;
+
 public class MainActivityTest {
 
  @Rule

diff --git a/BasicSample/versions.gradle b/BasicSample/versions.gradle
@@ -24,6 +24,7 @@ def versions = [:]
 versions.android_gradle_plugin = '3.4.0'
 versions.apache_commons = "2.5"
 versions.arch_core = "2.0.1"
+versions.atsl_core = "1.1.0"
 versions.atsl_rules = "1.1.1"
 versions.atsl_runner = "1.1.1"
 versions.atsl_junit = "1.1.0"
@@ -117,6 +118,7 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
 deps.espresso = espresso
 
 def atsl = [:]
+atsl.core = "androidx.test:core:$versions.atsl_core"
 atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
 atsl.runner = "androidx.test:runner:$versions.atsl_runner"
 atsl.rules = "androidx.test:rules:$versions.atsl_rules"

diff --git a/GithubBrowserSample/app/build.gradle b/GithubBrowserSample/app/build.gradle
@@ -99,6 +99,7 @@ dependencies {
  testImplementation deps.arch_core.testing
  testImplementation deps.mockito.core
 
+ androidTestImplementation deps.atsl.core
  androidTestImplementation deps.atsl.runner
  androidTestImplementation deps.atsl.rules
 

diff --git a/GithubBrowserSample/app/src/androidTest/java/com/android/example/github/db/DbTest.kt b/GithubBrowserSample/app/src/androidTest/java/com/android/example/github/db/DbTest.kt
@@ -36,7 +36,7 @@ abstract class DbTest {
  @Before
  fun initDb() {
  _db = Room.inMemoryDatabaseBuilder(
- ApplicationProvider.getApplicationContext()(),
+ ApplicationProvider.getApplicationContext(),
  GithubDb::class.java
  ).build()
  }

diff --git a/...serSample/app/src/androidTest/java/com/android/example/github/ui/repo/RepoFragmentTest.kt b/...serSample/app/src/androidTest/java/com/android/example/github/ui/repo/RepoFragmentTest.kt
@@ -16,6 +16,7 @@
 
 package com.android.example.github.ui.repo
 
+import android.content.Context
 import androidx.lifecycle.MutableLiveData
 import androidx.databinding.DataBindingComponent
 import androidx.annotation.StringRes
@@ -208,7 +209,7 @@ class RepoFragmentTest {
  }
 
  private fun getString(@StringRes id: Int, vararg args: Any): String {
- return ApplicationProvider.getApplicationContext()().getString(id, *args)
+ return ApplicationProvider.getApplicationContext<Context>().getString(id, *args)
  }
 
  class TestRepoFragment : RepoFragment() {

diff --git a/...erSample/app/src/androidTest/java/com/android/example/github/util/AutoClearedValueTest.kt b/...erSample/app/src/androidTest/java/com/android/example/github/util/AutoClearedValueTest.kt
@@ -15,11 +15,11 @@
  */
 package com.android.example.github.util
 
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.rule.ActivityTestRule
-import androidx.test.runner.AndroidJUnit4
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
 import com.android.example.github.testing.SingleFragmentActivity
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.`is`

diff --git a/...app/src/androidTest/java/com/android/example/github/util/DataBindingIdlingResourceTest.kt b/...app/src/androidTest/java/com/android/example/github/util/DataBindingIdlingResourceTest.kt
@@ -16,20 +16,20 @@
 
 package com.android.example.github.util
 
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import androidx.databinding.DataBindingComponent
 import androidx.databinding.ViewDataBinding
-import android.os.Bundle
-import androidx.test.core.app.ApplicationProvider
+import androidx.databinding.library.R
+import androidx.fragment.app.Fragment
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.IdlingResource
+import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
 import androidx.test.runner.AndroidJUnit4
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.databinding.library.R
 import com.android.example.github.testing.SingleFragmentActivity
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.MatcherAssert.assertThat

diff --git a/GithubBrowserSample/versions.gradle b/GithubBrowserSample/versions.gradle
@@ -24,6 +24,7 @@ def versions = [:]
 versions.android_gradle_plugin = '3.4.0'
 versions.apache_commons = "2.5"
 versions.arch_core = "2.0.1"
+versions.atsl_core = "1.1.0"
 versions.atsl_rules = "1.1.1"
 versions.atsl_runner = "1.1.1"
 versions.atsl_junit = "1.1.0"
@@ -117,6 +118,7 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
 deps.espresso = espresso
 
 def atsl = [:]
+atsl.core = "androidx.test:core:$versions.atsl_core"
 atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
 atsl.runner = "androidx.test:runner:$versions.atsl_runner"
 atsl.rules = "androidx.test:rules:$versions.atsl_rules"

diff --git a/NavigationAdvancedSample/versions.gradle b/NavigationAdvancedSample/versions.gradle
@@ -24,6 +24,7 @@ def versions = [:]
 versions.android_gradle_plugin = '3.4.0'
 versions.apache_commons = "2.5"
 versions.arch_core = "2.0.1"
+versions.atsl_core = "1.1.0"
 versions.atsl_rules = "1.1.1"
 versions.atsl_runner = "1.1.1"
 versions.atsl_junit = "1.1.0"
@@ -117,6 +118,7 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
 deps.espresso = espresso
 
 def atsl = [:]
+atsl.core = "androidx.test:core:$versions.atsl_core"
 atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
 atsl.runner = "androidx.test:runner:$versions.atsl_runner"
 atsl.rules = "androidx.test:rules:$versions.atsl_rules"

diff --git a/NavigationBasicSample/versions.gradle b/NavigationBasicSample/versions.gradle
@@ -24,6 +24,7 @@ def versions = [:]
 versions.android_gradle_plugin = '3.4.0'
 versions.apache_commons = "2.5"
 versions.arch_core = "2.0.1"
+versions.atsl_core = "1.1.0"
 versions.atsl_rules = "1.1.1"
 versions.atsl_runner = "1.1.1"
 versions.atsl_junit = "1.1.0"
@@ -117,6 +118,7 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
 deps.espresso = espresso
 
 def atsl = [:]
+atsl.core = "androidx.test:core:$versions.atsl_core"
 atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
 atsl.runner = "androidx.test:runner:$versions.atsl_runner"
 atsl.rules = "androidx.test:rules:$versions.atsl_rules"

diff --git a/PagingSample/app/build.gradle b/PagingSample/app/build.gradle
@@ -51,6 +51,7 @@ dependencies {
  implementation deps.kotlin.stdlib
 
  // Android Testing Support Library's runner and rules
+ androidTestImplementation deps.atsl.core
  androidTestImplementation deps.atsl.runner
  androidTestImplementation deps.atsl.rules
  androidTestImplementation deps.room.testing

diff --git a/...le/app/src/androidTest/java/paging/android/example/com/pagingsample/MainActivityTest.java b/...le/app/src/androidTest/java/paging/android/example/com/pagingsample/MainActivityTest.java
@@ -20,6 +20,7 @@
 import androidx.arch.core.executor.testing.CountingTaskExecutorRule;
 import android.content.Intent;
 import androidx.test.core.app.ApplicationProvider;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -45,7 +46,7 @@ public class MainActivityTest {
 
  @Test
  public void showSomeResults() throws InterruptedException, TimeoutException {
- Intent intent = new Intent(ApplicationProvider.getApplicationContext()(), MainActivity.class);
+ Intent intent = new Intent(ApplicationProvider.getApplicationContext(), MainActivity.class);
  intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
  Activity activity = InstrumentationRegistry.getInstrumentation().startActivitySync(intent);
  testRule.drainTasks(10, TimeUnit.SECONDS);

diff --git a/PagingSample/versions.gradle b/PagingSample/versions.gradle
@@ -24,6 +24,7 @@ def versions = [:]
 versions.android_gradle_plugin = '3.4.0'
 versions.apache_commons = "2.5"
 versions.arch_core = "2.0.1"
+versions.atsl_core = "1.1.0"
 versions.atsl_rules = "1.1.1"
 versions.atsl_runner = "1.1.1"
 versions.atsl_junit = "1.1.0"
@@ -117,6 +118,7 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
 deps.espresso = espresso
 
 def atsl = [:]
+atsl.core = "androidx.test:core:$versions.atsl_core"
 atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
 atsl.runner = "androidx.test:runner:$versions.atsl_runner"
 atsl.rules = "androidx.test:rules:$versions.atsl_rules"

diff --git a/PagingWithNetworkSample/app/build.gradle b/PagingWithNetworkSample/app/build.gradle
@@ -69,6 +69,7 @@ dependencies {
  implementation deps.glide.runtime
 
  // Android Testing Support Library's runner and rules
+ androidTestImplementation deps.atsl.core
  androidTestImplementation deps.atsl.runner
  androidTestImplementation deps.atsl.rules
  androidTestImplementation deps.arch_core.testing

diff --git a/...oidTest/java/com/android/example/paging/pagingwithnetwork/reddit/ui/RedditActivityTest.kt b/...oidTest/java/com/android/example/paging/pagingwithnetwork/reddit/ui/RedditActivityTest.kt
@@ -19,8 +19,9 @@ package com.android.example.paging.pagingwithnetwork.reddit.ui
 import android.app.Application
 import android.content.Intent
 import androidx.arch.core.executor.testing.CountingTaskExecutorRule
-import androidx.test.core.app.ApplicationProvider
 import androidx.recyclerview.widget.RecyclerView
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.platform.app.InstrumentationRegistry
 import com.android.example.paging.pagingwithnetwork.R
 import com.android.example.paging.pagingwithnetwork.reddit.DefaultServiceLocator
 import com.android.example.paging.pagingwithnetwork.reddit.ServiceLocator
@@ -62,7 +63,7 @@ class RedditActivityTest(private val type: RedditPostRepository.Type) {
  fakeApi.addPost(postFactory.createRedditPost(DEFAULT_SUBREDDIT))
  fakeApi.addPost(postFactory.createRedditPost(DEFAULT_SUBREDDIT))
  fakeApi.addPost(postFactory.createRedditPost(DEFAULT_SUBREDDIT))
- val app = ApplicationProvider.getApplicationContext()().applicationContext as Application
+ val app = ApplicationProvider.getApplicationContext<Application>()
  // use a controlled service locator w/ fake API
  ServiceLocator.swap(
  object : DefaultServiceLocator(app = app,
@@ -76,7 +77,7 @@ class RedditActivityTest(private val type: RedditPostRepository.Type) {
  @Throws(InterruptedException::class, TimeoutException::class)
  fun showSomeResults() {
  val intent = RedditActivity.intentFor(
- context = ApplicationProvider.getApplicationContext()(),
+ context = ApplicationProvider.getApplicationContext(),
  type = type)
  intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
  val activity = InstrumentationRegistry.getInstrumentation().startActivitySync(intent)

diff --git a/PagingWithNetworkSample/versions.gradle b/PagingWithNetworkSample/versions.gradle
@@ -24,6 +24,7 @@ def versions = [:]
 versions.android_gradle_plugin = '3.4.0'
 versions.apache_commons = "2.5"
 versions.arch_core = "2.0.1"
+versions.atsl_core = "1.1.0"
 versions.atsl_rules = "1.1.1"
 versions.atsl_runner = "1.1.1"
 versions.atsl_junit = "1.1.0"
@@ -117,6 +118,7 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
 deps.espresso = espresso
 
 def atsl = [:]
+atsl.core = "androidx.test:core:$versions.atsl_core"
 atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
 atsl.runner = "androidx.test:runner:$versions.atsl_runner"
 atsl.rules = "androidx.test:rules:$versions.atsl_rules"

diff --git a/PersistenceContentProviderSample/app/build.gradle b/PersistenceContentProviderSample/app/build.gradle
@@ -48,6 +48,7 @@ dependencies {
  androidTestImplementation(deps.espresso.core, {
  exclude group: 'com.android.support', module: 'support-annotations'
  })
+ androidTestImplementation deps.atsl.core
 
  // Support Libraries
  implementation deps.support.app_compat

diff --git a/...Sample/app/src/androidTest/java/com/example/android/contentprovidersample/CheeseTest.java b/...Sample/app/src/androidTest/java/com/example/android/contentprovidersample/CheeseTest.java
@@ -41,7 +41,7 @@ public class CheeseTest {
 
  @Before
  public void createDatabase() {
- mDatabase = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext()(),
+ mDatabase = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(),
  SampleDatabase.class).build();
  }
 

diff --git a/...androidTest/java/com/example/android/contentprovidersample/SampleContentProviderTest.java b/...androidTest/java/com/example/android/contentprovidersample/SampleContentProviderTest.java
@@ -51,7 +51,7 @@ public class SampleContentProviderTest {
 
  @Before
  public void setUp() {
- final Context context = ApplicationProvider.getApplicationContext()();
+ final Context context = ApplicationProvider.getApplicationContext();
  SampleDatabase.switchToInMemory(context);
  mContentResolver = context.getContentResolver();
  }

diff --git a/PersistenceContentProviderSample/versions.gradle b/PersistenceContentProviderSample/versions.gradle
@@ -24,6 +24,7 @@ def versions = [:]
 versions.android_gradle_plugin = '3.4.0'
 versions.apache_commons = "2.5"
 versions.arch_core = "2.0.1"
+versions.atsl_core = "1.1.0"
 versions.atsl_rules = "1.1.1"
 versions.atsl_runner = "1.1.1"
 versions.atsl_junit = "1.1.0"
@@ -117,6 +118,7 @@ espresso.intents = "androidx.test.espresso:espresso-intents:$versions.espresso"
 deps.espresso = espresso
 
 def atsl = [:]
+atsl.core = "androidx.test:core:$versions.atsl_core"
 atsl.ext_junit = "androidx.test.ext:junit:$versions.atsl_junit"
 atsl.runner = "androidx.test:runner:$versions.atsl_runner"
 atsl.rules = "androidx.test:rules:$versions.atsl_rules"

diff --git a/...roidTestRoom/java/com/example/android/persistence/migrations/LocalUserDataSourceTest.java b/...roidTestRoom/java/com/example/android/persistence/migrations/LocalUserDataSourceTest.java
@@ -39,7 +39,7 @@ public class LocalUserDataSourceTest {
  public void initDb() throws Exception {
  // using an in-memory database because the information stored here disappears when the
  // process is killed
- mDatabase = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext()(),
+ mDatabase = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(),
  UsersDatabase.class).build();
  mDataSource = new LocalUserDataSource(mDatabase.userDao());
  }