From bcd86977d2ff2ab6e52993fd96875dc7e9e477bf Mon Sep 17 00:00:00 2001 From: Valere Date: Wed, 25 Nov 2020 17:17:48 +0100 Subject: [PATCH] Fix test + lint --- .../java/im/vector/app/ui/UiAllScreensSanityTest.kt | 5 ++++- .../vector/app/features/usercode/UserCodeSharedViewModel.kt | 1 - .../vector/app/features/userdirectory/UserListViewModel.kt | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt index 1c05a5d529..6b30700116 100644 --- a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt +++ b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt @@ -310,7 +310,10 @@ class UiAllScreensSanityTest { clickOn(R.id.createChatRoomButton) withIdlingResource(activityIdlingResource(CreateDirectRoomActivity::class.java)) { - assertDisplayed(R.id.addByMatrixId) + onView(withId(R.id.userListRecyclerView)) + .perform(waitForView(withText(R.string.qr_code))) + onView(withId(R.id.userListRecyclerView)) + .perform(waitForView(withText(R.string.invite_friends))) } closeSoftKeyboard() diff --git a/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt index aa1f882e78..abef15a1ba 100644 --- a/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt @@ -47,7 +47,6 @@ class UserCodeSharedViewModel @AssistedInject constructor( companion object : MvRxViewModelFactory { override fun create(viewModelContext: ViewModelContext, state: UserCodeState): UserCodeSharedViewModel? { - val args = viewModelContext.args() val factory = when (viewModelContext) { is FragmentViewModelContext -> viewModelContext.fragment as? Factory is ActivityViewModelContext -> viewModelContext.activity as? Factory diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt index 85701c25a1..f8eabbaed0 100644 --- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt @@ -63,7 +63,6 @@ class UserListViewModel @AssistedInject constructor(@Assisted initialState: User is FragmentViewModelContext -> viewModelContext.fragment as? Factory is ActivityViewModelContext -> viewModelContext.activity as? Factory } - val args = viewModelContext.args() return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface") } }