Removed test dependency on ToT AppCompat and Core
Bug: 135917380
Test: ./gradlew viewpager2:connectedCheck
Change-Id: Ia7bdc35a185e5aaccc38709bcc0f67fac53a87ac
diff --git a/viewpager2/build.gradle b/viewpager2/build.gradle
index 30c1569..9de6aa7 100644
--- a/viewpager2/build.gradle
+++ b/viewpager2/build.gradle
@@ -32,8 +32,6 @@
api("androidx.recyclerview:recyclerview:1.1.0-beta01")
implementation("androidx.collection:collection:1.1.0")
- androidTestImplementation(project(":appcompat"))
- androidTestImplementation(project(":core:core"))
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
androidTestImplementation(ANDROIDX_TEST_CORE)
androidTestImplementation(ANDROIDX_TEST_RUNNER)
diff --git a/viewpager2/src/androidTest/java/androidx/viewpager2/widget/AccessibilityTest.kt b/viewpager2/src/androidTest/java/androidx/viewpager2/widget/AccessibilityTest.kt
index 7aa57a9..050aab8 100644
--- a/viewpager2/src/androidTest/java/androidx/viewpager2/widget/AccessibilityTest.kt
+++ b/viewpager2/src/androidTest/java/androidx/viewpager2/widget/AccessibilityTest.kt
@@ -19,10 +19,6 @@
import android.os.Build
import androidx.core.view.ViewCompat
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_PAGE_DOWN
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_PAGE_LEFT
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_PAGE_RIGHT
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_PAGE_UP
import androidx.test.filters.LargeTest
import androidx.test.filters.SdkSuppress
import androidx.testutils.LocaleTestUtils
@@ -142,12 +138,12 @@
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
if (orientation == ViewPager2.ORIENTATION_HORIZONTAL) {
if (isRtl) {
- return ACTION_PAGE_LEFT.id
+ return ACTION_ID_PAGE_LEFT
} else {
- return ACTION_PAGE_RIGHT.id
+ return ACTION_ID_PAGE_RIGHT
}
}
- return ACTION_PAGE_DOWN.id
+ return ACTION_ID_PAGE_DOWN
}
return AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD
}
@@ -156,12 +152,12 @@
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
if (orientation == ViewPager2.ORIENTATION_HORIZONTAL) {
if (isRtl) {
- return ACTION_PAGE_RIGHT.id
+ return ACTION_ID_PAGE_RIGHT
} else {
- return ACTION_PAGE_LEFT.id
+ return ACTION_ID_PAGE_LEFT
}
}
- return ACTION_PAGE_UP.id
+ return ACTION_ID_PAGE_UP
}
return AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD
}
diff --git a/viewpager2/src/androidTest/java/androidx/viewpager2/widget/BaseTest.kt b/viewpager2/src/androidTest/java/androidx/viewpager2/widget/BaseTest.kt
index 3f02ba8..679943f 100644
--- a/viewpager2/src/androidTest/java/androidx/viewpager2/widget/BaseTest.kt
+++ b/viewpager2/src/androidTest/java/androidx/viewpager2/widget/BaseTest.kt
@@ -27,10 +27,6 @@
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_PAGE_DOWN
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_PAGE_LEFT
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_PAGE_RIGHT
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_PAGE_UP
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.test.core.app.ApplicationProvider
@@ -81,6 +77,10 @@
open class BaseTest {
companion object {
const val TAG = "VP2_TESTS"
+ const val ACTION_ID_PAGE_LEFT = android.R.id.accessibilityActionPageLeft
+ const val ACTION_ID_PAGE_RIGHT = android.R.id.accessibilityActionPageRight
+ const val ACTION_ID_PAGE_UP = android.R.id.accessibilityActionPageUp
+ const val ACTION_ID_PAGE_DOWN = android.R.id.accessibilityActionPageDown
}
lateinit var localeUtil: LocaleTestUtils
@@ -284,20 +284,20 @@
currentPage < numPages - 1
assertThat("Left action expected: $expectPageLeftAction",
- hasPageAction(customActions, ACTION_PAGE_LEFT.id),
+ hasPageAction(customActions, ACTION_ID_PAGE_LEFT),
equalTo(expectPageLeftAction)
)
assertThat("Right action expected: $expectPageRightAction",
- hasPageAction(customActions, ACTION_PAGE_RIGHT.id),
+ hasPageAction(customActions, ACTION_ID_PAGE_RIGHT),
equalTo(expectPageRightAction)
)
assertThat("Up action expected: $expectPageUpAction",
- hasPageAction(customActions, ACTION_PAGE_UP.id),
+ hasPageAction(customActions, ACTION_ID_PAGE_UP),
equalTo(expectPageUpAction)
)
assertThat("Down action expected: $expectPageDownAction",
- hasPageAction(customActions, ACTION_PAGE_DOWN.id),
+ hasPageAction(customActions, ACTION_ID_PAGE_DOWN),
equalTo(expectPageDownAction)
)
diff --git a/viewpager2/src/androidTest/java/androidx/viewpager2/widget/FakeDragTest.kt b/viewpager2/src/androidTest/java/androidx/viewpager2/widget/FakeDragTest.kt
index 314cad3..7d6e3a3 100644
--- a/viewpager2/src/androidTest/java/androidx/viewpager2/widget/FakeDragTest.kt
+++ b/viewpager2/src/androidTest/java/androidx/viewpager2/widget/FakeDragTest.kt
@@ -24,9 +24,6 @@
import android.view.animation.LinearInterpolator
import androidx.core.view.ViewCompat
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_PAGE_DOWN
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_PAGE_LEFT
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_PAGE_RIGHT
import androidx.core.view.animation.PathInterpolatorCompat
import androidx.test.filters.LargeTest
import androidx.test.filters.SdkSuppress
@@ -336,11 +333,11 @@
val isHorizontal = test.viewPager.isHorizontal
return if (useEnhancedA11y && isHorizontal && test.viewPager.isRtl) {
- ACTION_PAGE_LEFT.id
+ ACTION_ID_PAGE_LEFT
} else if (useEnhancedA11y && isHorizontal) {
- ACTION_PAGE_RIGHT.id
+ ACTION_ID_PAGE_RIGHT
} else if (useEnhancedA11y) {
- ACTION_PAGE_DOWN.id
+ ACTION_ID_PAGE_DOWN
} else {
ACTION_SCROLL_FORWARD
}