Skip to content

Commit 128a54d

Browse files
committed
Fixed compilation issues
1 parent e77b977 commit 128a54d

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenFlowTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
258258
.check(matches(isDisplayed()))
259259
onView(withId(R.id.editTextFrom))
260260
.perform(scrollTo())
261-
.check(matches(withText(not(`is`(emptyString())))))
261+
.check(matches(withText(not(""))))
262262
onView(withId(R.id.recyclerViewChipsTo))
263263
.check(matches(isDisplayed()))
264264
.check(matches(withRecyclerViewItemCount(1)))
@@ -920,7 +920,8 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
920920

921921
@get:ClassRule
922922
@JvmStatic
923-
val mockWebServerRule = FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT,
923+
val mockWebServerRule = FlowCryptMockWebServerRule(
924+
TestConstants.MOCK_WEB_SERVER_PORT,
924925
object : Dispatcher() {
925926
override fun dispatch(request: RecordedRequest): MockResponse {
926927
if (request.path?.startsWith("/attester/pub", ignoreCase = true) == true) {

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/StandardReplyWithServiceInfoAndOneFileFlowTest.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import com.flowcrypt.email.ui.activity.CreateMessageActivity
4242
import com.flowcrypt.email.util.AccountDaoManager
4343
import com.flowcrypt.email.util.TestGeneralUtil
4444
import org.hamcrest.Matchers.allOf
45-
import org.hamcrest.Matchers.`is`
4645
import org.hamcrest.Matchers.not
4746
import org.junit.Rule
4847
import org.junit.Test
@@ -161,8 +160,11 @@ class StandardReplyWithServiceInfoAndOneFileFlowTest : BaseTest() {
161160
matches(
162161
allOf(
163162
isDisplayed(),
164-
if (TextUtils.isEmpty(serviceInfo.systemMsg)) withText(`is`(emptyString()))
165-
else withText(serviceInfo.systemMsg),
163+
if (TextUtils.isEmpty(serviceInfo.systemMsg)) {
164+
withText("")
165+
} else {
166+
withText(serviceInfo.systemMsg)
167+
},
166168
if (serviceInfo.isMsgEditable) isFocusable() else not(isFocusable())
167169
)
168170
)

0 commit comments

Comments
 (0)