Fix + simplify PagingSample test

liwanlian · Feb 23, 2021 · e332b53 · e332b53
1 parent 082b600
commit e332b53
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 20 deletions.
diff --git a/BasicRxJavaSample/versions.gradle b/BasicRxJavaSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha13"
+versions.paging = "3.0.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/BasicRxJavaSampleKotlin/versions.gradle b/BasicRxJavaSampleKotlin/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha13"
+versions.paging = "3.0.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/BasicSample/versions.gradle b/BasicSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha13"
+versions.paging = "3.0.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/GithubBrowserSample/versions.gradle b/GithubBrowserSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha13"
+versions.paging = "3.0.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/LiveDataSample/versions.gradle b/LiveDataSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha13"
+versions.paging = "3.0.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/MADSkillsNavigationSample/versions.gradle b/MADSkillsNavigationSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha13"
+versions.paging = "3.0.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/NavigationAdvancedSample/versions.gradle b/NavigationAdvancedSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha13"
+versions.paging = "3.0.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/NavigationBasicSample/versions.gradle b/NavigationBasicSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha13"
+versions.paging = "3.0.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/...mple/app/src/androidTest/java/paging/android/example/com/pagingsample/MainActivityTest.kt b/...mple/app/src/androidTest/java/paging/android/example/com/pagingsample/MainActivityTest.kt
@@ -20,8 +20,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.hamcrest.CoreMatchers
-import org.hamcrest.MatcherAssert
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 import java.util.concurrent.TimeoutException
@@ -41,8 +40,7 @@ class MainActivityTest {
 
         scenario.onActivity { activity ->
             val recyclerView: RecyclerView = activity.binding.cheeseList
-            MatcherAssert.assertThat(recyclerView.adapter, CoreMatchers.notNullValue())
-            MatcherAssert.assertThat(recyclerView.adapter!!.itemCount > 0, CoreMatchers.`is`(true))
+            assertEquals(CHEESE_DATA.size, recyclerView.adapter!!.itemCount)
         }
     }
 }
diff --git a/PagingSample/app/src/main/java/paging/android/example/com/pagingsample/CheeseDb.kt b/PagingSample/app/src/main/java/paging/android/example/com/pagingsample/CheeseDb.kt
@@ -58,7 +58,7 @@ abstract class CheeseDb : RoomDatabase() {
 }
 
 
-private val CHEESE_DATA = arrayListOf(
+val CHEESE_DATA = arrayListOf(
         "Abbaye de Belloc", "Abbaye du Mont des Cats", "Abertam", "Abondance", "Ackawi",
         "Acorn", "Adelost", "Affidelice au Chablis", "Afuega'l Pitu", "Airag", "Airedale",
         "Aisy Cendre", "Allgauer Emmentaler", "Alverca", "Ambert", "American Cheese",

diff --git a/PagingSample/versions.gradle b/PagingSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha13"
+versions.paging = "3.0.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/PagingWithNetworkSample/versions.gradle b/PagingWithNetworkSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha13"
+versions.paging = "3.0.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/PersistenceContentProviderSample/versions.gradle b/PersistenceContentProviderSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha13"
+versions.paging = "3.0.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/PersistenceMigrationsSample/versions.gradle b/PersistenceMigrationsSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha13"
+versions.paging = "3.0.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/ViewBindingSample/versions.gradle b/ViewBindingSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha13"
+versions.paging = "3.0.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/WorkManagerSample/versions.gradle b/WorkManagerSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha13"
+versions.paging = "3.0.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/versions.gradle b/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha13"
+versions.paging = "3.0.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"