Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
门心叼龙
flexbox-layout
提交
4f317e9c
F
flexbox-layout
项目概览
门心叼龙
/
flexbox-layout
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
flexbox-layout
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
4f317e9c
编写于
1月 17, 2020
作者:
T
Takeshi Hagikura
提交者:
GitHub
1月 17, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update the deprecated test dependencies. (#532)
Also bumps the Kotlin version to 1.3.61
上级
a86c232e
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
40 addition
and
13 deletion
+40
-13
build.gradle
build.gradle
+2
-1
flexbox/build.gradle
flexbox/build.gradle
+1
-0
flexbox/src/androidTest/java/com/google/android/flexbox/FlexboxHelperTest.kt
...Test/java/com/google/android/flexbox/FlexboxHelperTest.kt
+1
-1
flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxAndroidTest.kt
...ava/com/google/android/flexbox/test/FlexboxAndroidTest.kt
+16
-4
flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerTest.kt
...m/google/android/flexbox/test/FlexboxLayoutManagerTest.kt
+20
-7
未找到文件。
build.gradle
浏览文件 @
4f317e9c
...
...
@@ -30,10 +30,11 @@ buildscript {
androidxPreferenceVersion
=
"1.1.0"
androidxRecyclerViewVersion
=
"1.1.0"
androidxEspressoVersion
=
"3.2.0"
androidxTestExtVersion
=
"1.1.1"
androidxTestVersion
=
"1.2.0"
junitVersion
=
"4.12"
gradleBintrayPluginVersion
=
"1.6"
kotlinVersion
=
"1.3.
50
"
kotlinVersion
=
"1.3.
61
"
materialVersion
=
"1.0.0"
}
...
...
flexbox/build.gradle
浏览文件 @
4f317e9c
...
...
@@ -52,6 +52,7 @@ dependencies {
androidTestImplementation
"androidx.core:core:${rootProject.androidxCoreVersion}"
androidTestImplementation
"androidx.recyclerview:recyclerview:${rootProject.androidxRecyclerViewVersion}"
androidTestImplementation
"androidx.annotation:annotation:${rootProject.androidxAnnotationVersion}"
androidTestImplementation
"androidx.test.ext:junit:${rootProject.androidxTestExtVersion}"
androidTestImplementation
"androidx.test:runner:${rootProject.androidxTestVersion}"
androidTestImplementation
"androidx.test:rules:${rootProject.androidxTestVersion}"
androidTestImplementation
"androidx.test.espresso:espresso-core:${rootProject.androidxEspressoVersion}"
...
...
flexbox/src/androidTest/java/com/google/android/flexbox/FlexboxHelperTest.kt
浏览文件 @
4f317e9c
...
...
@@ -20,8 +20,8 @@ import android.view.View
import
android.widget.CheckBox
import
android.widget.TextView
import
androidx.core.widget.CompoundButtonCompat
import
androidx.test.ext.junit.runners.AndroidJUnit4
import
androidx.test.rule.ActivityTestRule
import
androidx.test.runner.AndroidJUnit4
import
com.google.android.flexbox.test.FlexboxTestActivity
import
com.google.android.flexbox.test.IsEqualAllowingError.Companion.isEqualAllowingError
import
org.hamcrest.Matchers.`is`
...
...
flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxAndroidTest.kt
浏览文件 @
4f317e9c
...
...
@@ -22,17 +22,29 @@ import android.view.ViewGroup
import
android.widget.TextView
import
androidx.annotation.LayoutRes
import
androidx.core.content.res.ResourcesCompat
import
androidx.test.InstrumentationRegistry
import
androidx.test.espresso.Espresso.onView
import
androidx.test.espresso.ViewAssertion
import
androidx.test.espresso.assertion.PositionAssertions.*
import
androidx.test.espresso.assertion.PositionAssertions.isBottomAlignedWith
import
androidx.test.espresso.assertion.PositionAssertions.isCompletelyAbove
import
androidx.test.espresso.assertion.PositionAssertions.isCompletelyBelow
import
androidx.test.espresso.assertion.PositionAssertions.isCompletelyLeftOf
import
androidx.test.espresso.assertion.PositionAssertions.isCompletelyRightOf
import
androidx.test.espresso.assertion.PositionAssertions.isLeftAlignedWith
import
androidx.test.espresso.assertion.PositionAssertions.isRightAlignedWith
import
androidx.test.espresso.assertion.PositionAssertions.isTopAlignedWith
import
androidx.test.espresso.assertion.ViewAssertions.matches
import
androidx.test.espresso.matcher.ViewMatchers.withId
import
androidx.test.ext.junit.runners.AndroidJUnit4
import
androidx.test.filters.FlakyTest
import
androidx.test.filters.MediumTest
import
androidx.test.platform.app.InstrumentationRegistry
import
androidx.test.rule.ActivityTestRule
import
androidx.test.runner.AndroidJUnit4
import
com.google.android.flexbox.*
import
com.google.android.flexbox.AlignContent
import
com.google.android.flexbox.AlignItems
import
com.google.android.flexbox.FlexDirection
import
com.google.android.flexbox.FlexWrap
import
com.google.android.flexbox.FlexboxLayout
import
com.google.android.flexbox.JustifyContent
import
com.google.android.flexbox.test.IsEqualAllowingError.Companion.isEqualAllowingError
import
org.hamcrest.Description
import
org.hamcrest.TypeSafeMatcher
...
...
flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerTest.kt
浏览文件 @
4f317e9c
...
...
@@ -24,20 +24,33 @@ import android.widget.TextView
import
androidx.core.content.res.ResourcesCompat
import
androidx.recyclerview.widget.LinearLayoutManager
import
androidx.recyclerview.widget.RecyclerView
import
androidx.test.InstrumentationRegistry
import
androidx.test.espresso.Espresso.onView
import
androidx.test.espresso.ViewAction
import
androidx.test.espresso.action.*
import
androidx.test.espresso.action.CoordinatesProvider
import
androidx.test.espresso.action.GeneralLocation
import
androidx.test.espresso.action.GeneralSwipeAction
import
androidx.test.espresso.action.Press
import
androidx.test.espresso.action.Swipe
import
androidx.test.espresso.matcher.ViewMatchers.withId
import
androidx.test.ext.junit.runners.AndroidJUnit4
import
androidx.test.filters.FlakyTest
import
androidx.test.filters.MediumTest
import
androidx.test.platform.app.InstrumentationRegistry
import
androidx.test.rule.ActivityTestRule
import
androidx.test.runner.AndroidJUnit4
import
com.google.android.flexbox.*
import
com.google.android.flexbox.AlignItems
import
com.google.android.flexbox.AlignSelf
import
com.google.android.flexbox.FlexDirection
import
com.google.android.flexbox.FlexWrap
import
com.google.android.flexbox.FlexboxItemDecoration
import
com.google.android.flexbox.FlexboxItemDecoration.HORIZONTAL
import
com.google.android.flexbox.FlexboxItemDecoration.VERTICAL
import
com.google.android.flexbox.FlexboxLayoutManager
import
com.google.android.flexbox.JustifyContent
import
com.google.android.flexbox.test.IsEqualAllowingError.Companion.isEqualAllowingError
import
org.hamcrest.Matchers.*
import
org.hamcrest.Matchers.`is`
import
org.hamcrest.Matchers.instanceOf
import
org.hamcrest.Matchers.lessThan
import
org.hamcrest.Matchers.notNullValue
import
org.hamcrest.core.IsNot.not
import
org.junit.Assert.assertThat
import
org.junit.Assert.assertTrue
...
...
@@ -2808,7 +2821,7 @@ class FlexboxLayoutManagerTest {
// https://github.com/google/flexbox-layout/issues/208, the width of the inner
// RecyclerViews were set to 0.
val
activity
=
activityRule
.
activity
val
outerLayoutManager
=
androidx
.
recyclerview
.
widget
.
LinearLayoutManager
(
activity
)
val
outerLayoutManager
=
LinearLayoutManager
(
activity
)
// Give the inner adapter item count enough so that inner RecyclerView with
// FlexboxLayoutManager wraps its items
...
...
@@ -2818,7 +2831,7 @@ class FlexboxLayoutManagerTest {
activityRule
.
runOnUiThread
{
activity
.
setContentView
(
R
.
layout
.
recyclerview
)
val
recyclerView
=
activity
.
findViewById
<
RecyclerView
>(
R
.
id
.
recyclerview
)
outerLayoutManager
.
orientation
=
androidx
.
recyclerview
.
widget
.
LinearLayoutManager
.
HORIZONTAL
outerLayoutManager
.
orientation
=
LinearLayoutManager
.
HORIZONTAL
recyclerView
.
layoutManager
=
outerLayoutManager
recyclerView
.
adapter
=
adapter
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录