rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace deprecated shouldEqual and shouldEqualTo by shouldBeEqualTo

Browse Source
This commit is contained in:
Benoit Marty 2020-10-12 22:30:18 +02:00
parent 0fc92889c1
commit 68947588d7
4 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
View File

@ -17,15 +17,14 @@
package org.matrix.android.sdk.internal.crypto.verification.qrcode package org.matrix.android.sdk.internal.crypto.verification.qrcode
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import org.matrix.android.sdk.InstrumentedTest import org.amshove.kluent.shouldBeEqualTo
import org.amshove.kluent.shouldBeNull import org.amshove.kluent.shouldBeNull
import org.amshove.kluent.shouldEqual
import org.amshove.kluent.shouldEqualTo
import org.amshove.kluent.shouldNotBeNull import org.amshove.kluent.shouldNotBeNull
import org.junit.FixMethodOrder import org.junit.FixMethodOrder
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.junit.runners.MethodSorters import org.junit.runners.MethodSorters
import org.matrix.android.sdk.InstrumentedTest
@RunWith(AndroidJUnit4::class) @RunWith(AndroidJUnit4::class)
@FixMethodOrder(MethodSorters.JVM) @FixMethodOrder(MethodSorters.JVM)
@ -66,32 +65,32 @@ class QrCodeTest : InstrumentedTest {
@Test @Test
fun testEncoding1() { fun testEncoding1() {
qrCode1.toEncodedString() shouldEqual value1 qrCode1.toEncodedString() shouldBeEqualTo value1
} }
@Test @Test
fun testEncoding2() { fun testEncoding2() {
qrCode2.toEncodedString() shouldEqual value2 qrCode2.toEncodedString() shouldBeEqualTo value2
} }
@Test @Test
fun testEncoding3() { fun testEncoding3() {
qrCode3.toEncodedString() shouldEqual value3 qrCode3.toEncodedString() shouldBeEqualTo value3
} }
@Test @Test
fun testSymmetry1() { fun testSymmetry1() {
qrCode1.toEncodedString().toQrCodeData() shouldEqual qrCode1 qrCode1.toEncodedString().toQrCodeData() shouldBeEqualTo qrCode1
} }
@Test @Test
fun testSymmetry2() { fun testSymmetry2() {
qrCode2.toEncodedString().toQrCodeData() shouldEqual qrCode2 qrCode2.toEncodedString().toQrCodeData() shouldBeEqualTo qrCode2
} }
@Test @Test
fun testSymmetry3() { fun testSymmetry3() {
qrCode3.toEncodedString().toQrCodeData() shouldEqual qrCode3 qrCode3.toEncodedString().toQrCodeData() shouldBeEqualTo qrCode3
} }
@Test @Test
@ -102,7 +101,7 @@ class QrCodeTest : InstrumentedTest {
checkHeader(byteArray) checkHeader(byteArray)
// Mode // Mode
byteArray[7] shouldEqualTo 0 byteArray[7] shouldBeEqualTo 0
checkSizeAndTransaction(byteArray) checkSizeAndTransaction(byteArray)
@ -120,7 +119,7 @@ class QrCodeTest : InstrumentedTest {
checkHeader(byteArray) checkHeader(byteArray)
// Mode // Mode
byteArray[7] shouldEqualTo 1 byteArray[7] shouldBeEqualTo 1
checkSizeAndTransaction(byteArray) checkSizeAndTransaction(byteArray)
compareArray(byteArray.copyOfRange(23, 23 + 32), kte_byteArray) compareArray(byteArray.copyOfRange(23, 23 + 32), kte_byteArray)
@ -137,7 +136,7 @@ class QrCodeTest : InstrumentedTest {
checkHeader(byteArray) checkHeader(byteArray)
// Mode // Mode
byteArray[7] shouldEqualTo 2 byteArray[7] shouldBeEqualTo 2
checkSizeAndTransaction(byteArray) checkSizeAndTransaction(byteArray)
compareArray(byteArray.copyOfRange(23, 23 + 32), tlx_byteArray) compareArray(byteArray.copyOfRange(23, 23 + 32), tlx_byteArray)
@ -156,10 +155,10 @@ class QrCodeTest : InstrumentedTest {
val result = qrCode.toEncodedString() val result = qrCode.toEncodedString()
val expected = value1.replace("\u0000\u000DMaTransaction", "\u0007\u00D0$longTransactionId") val expected = value1.replace("\u0000\u000DMaTransaction", "\u0007\u00D0$longTransactionId")
result shouldEqual expected result shouldBeEqualTo expected
// Reverse operation // Reverse operation
expected.toQrCodeData() shouldEqual qrCode expected.toQrCodeData() shouldBeEqualTo qrCode
} }
@Test @Test
@ -170,7 +169,7 @@ class QrCodeTest : InstrumentedTest {
val qrCode = qrCode1.copy(transactionId = longTransactionId) val qrCode = qrCode1.copy(transactionId = longTransactionId)
// Symmetric operation // Symmetric operation
qrCode.toEncodedString().toQrCodeData() shouldEqual qrCode qrCode.toEncodedString().toQrCodeData() shouldBeEqualTo qrCode
} }
} }
@ -218,32 +217,32 @@ class QrCodeTest : InstrumentedTest {
} }
private fun compareArray(actual: ByteArray, expected: ByteArray) { private fun compareArray(actual: ByteArray, expected: ByteArray) {
actual.size shouldEqual expected.size actual.size shouldBeEqualTo expected.size
for (i in actual.indices) { for (i in actual.indices) {
actual[i] shouldEqualTo expected[i] actual[i] shouldBeEqualTo expected[i]
} }
} }
private fun checkHeader(byteArray: ByteArray) { private fun checkHeader(byteArray: ByteArray) {
// MATRIX // MATRIX
byteArray[0] shouldEqualTo 'M'.toByte() byteArray[0] shouldBeEqualTo 'M'.toByte()
byteArray[1] shouldEqualTo 'A'.toByte() byteArray[1] shouldBeEqualTo 'A'.toByte()
byteArray[2] shouldEqualTo 'T'.toByte() byteArray[2] shouldBeEqualTo 'T'.toByte()
byteArray[3] shouldEqualTo 'R'.toByte() byteArray[3] shouldBeEqualTo 'R'.toByte()
byteArray[4] shouldEqualTo 'I'.toByte() byteArray[4] shouldBeEqualTo 'I'.toByte()
byteArray[5] shouldEqualTo 'X'.toByte() byteArray[5] shouldBeEqualTo 'X'.toByte()
// Version // Version
byteArray[6] shouldEqualTo 2 byteArray[6] shouldBeEqualTo 2
} }
private fun checkSizeAndTransaction(byteArray: ByteArray) { private fun checkSizeAndTransaction(byteArray: ByteArray) {
// Size // Size
byteArray[8] shouldEqualTo 0 byteArray[8] shouldBeEqualTo 0
byteArray[9] shouldEqualTo 13 byteArray[9] shouldBeEqualTo 13
// Transaction // Transaction
byteArray.copyOfRange(10, 10 + "MaTransaction".length).toString(Charsets.ISO_8859_1) shouldEqual "MaTransaction" byteArray.copyOfRange(10, 10 + "MaTransaction".length).toString(Charsets.ISO_8859_1) shouldBeEqualTo "MaTransaction"
} }
} }

28
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
View File

@ -18,6 +18,14 @@ package org.matrix.android.sdk.session.room.timeline
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import com.zhuinden.monarchy.Monarchy import com.zhuinden.monarchy.Monarchy
import io.realm.Realm
import io.realm.RealmConfiguration
import io.realm.kotlin.createObject
import org.amshove.kluent.shouldBeEqualTo
import org.amshove.kluent.shouldBeTrue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.matrix.android.sdk.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import org.matrix.android.sdk.api.session.events.model.Event import org.matrix.android.sdk.api.session.events.model.Event
import org.matrix.android.sdk.api.session.room.send.SendState import org.matrix.android.sdk.api.session.room.send.SendState
@ -29,14 +37,6 @@ import org.matrix.android.sdk.internal.database.model.SessionRealmModule
import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
import org.matrix.android.sdk.session.room.timeline.RoomDataHelper.createFakeListOfEvents import org.matrix.android.sdk.session.room.timeline.RoomDataHelper.createFakeListOfEvents
import org.matrix.android.sdk.session.room.timeline.RoomDataHelper.createFakeMessageEvent import org.matrix.android.sdk.session.room.timeline.RoomDataHelper.createFakeMessageEvent
import io.realm.Realm
import io.realm.RealmConfiguration
import io.realm.kotlin.createObject
import org.amshove.kluent.shouldBeTrue
import org.amshove.kluent.shouldEqual
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
@RunWith(AndroidJUnit4::class) @RunWith(AndroidJUnit4::class)
internal class ChunkEntityTest : InstrumentedTest { internal class ChunkEntityTest : InstrumentedTest {
@ -63,7 +63,7 @@ internal class ChunkEntityTest : InstrumentedTest {
realm.copyToRealmOrUpdate(it) realm.copyToRealmOrUpdate(it)
} }
chunk.addTimelineEvent(ROOM_ID, fakeEvent, PaginationDirection.FORWARDS, emptyMap()) chunk.addTimelineEvent(ROOM_ID, fakeEvent, PaginationDirection.FORWARDS, emptyMap())
chunk.timelineEvents.size shouldEqual 1 chunk.timelineEvents.size shouldBeEqualTo 1
} }
} }
@ -76,7 +76,7 @@ internal class ChunkEntityTest : InstrumentedTest {
} }
chunk.addTimelineEvent(ROOM_ID, fakeEvent, PaginationDirection.FORWARDS, emptyMap()) chunk.addTimelineEvent(ROOM_ID, fakeEvent, PaginationDirection.FORWARDS, emptyMap())
chunk.addTimelineEvent(ROOM_ID, fakeEvent, PaginationDirection.FORWARDS, emptyMap()) chunk.addTimelineEvent(ROOM_ID, fakeEvent, PaginationDirection.FORWARDS, emptyMap())
chunk.timelineEvents.size shouldEqual 1 chunk.timelineEvents.size shouldBeEqualTo 1
} }
} }
@ -88,7 +88,7 @@ internal class ChunkEntityTest : InstrumentedTest {
chunk1.addAll(ROOM_ID, createFakeListOfEvents(30), PaginationDirection.BACKWARDS) chunk1.addAll(ROOM_ID, createFakeListOfEvents(30), PaginationDirection.BACKWARDS)
chunk2.addAll(ROOM_ID, createFakeListOfEvents(30), PaginationDirection.BACKWARDS) chunk2.addAll(ROOM_ID, createFakeListOfEvents(30), PaginationDirection.BACKWARDS)
chunk1.merge(ROOM_ID, chunk2, PaginationDirection.BACKWARDS) chunk1.merge(ROOM_ID, chunk2, PaginationDirection.BACKWARDS)
chunk1.timelineEvents.size shouldEqual 60 chunk1.timelineEvents.size shouldBeEqualTo 60
} }
} }
@ -104,7 +104,7 @@ internal class ChunkEntityTest : InstrumentedTest {
chunk1.addAll(ROOM_ID, eventsForChunk1, PaginationDirection.FORWARDS) chunk1.addAll(ROOM_ID, eventsForChunk1, PaginationDirection.FORWARDS)
chunk2.addAll(ROOM_ID, eventsForChunk2, PaginationDirection.BACKWARDS) chunk2.addAll(ROOM_ID, eventsForChunk2, PaginationDirection.BACKWARDS)
chunk1.merge(ROOM_ID, chunk2, PaginationDirection.BACKWARDS) chunk1.merge(ROOM_ID, chunk2, PaginationDirection.BACKWARDS)
chunk1.timelineEvents.size shouldEqual 40 chunk1.timelineEvents.size shouldBeEqualTo 40
chunk1.isLastForward.shouldBeTrue() chunk1.isLastForward.shouldBeTrue()
} }
} }
@ -119,7 +119,7 @@ internal class ChunkEntityTest : InstrumentedTest {
chunk1.addAll(ROOM_ID, createFakeListOfEvents(30), PaginationDirection.BACKWARDS) chunk1.addAll(ROOM_ID, createFakeListOfEvents(30), PaginationDirection.BACKWARDS)
chunk2.addAll(ROOM_ID, createFakeListOfEvents(30), PaginationDirection.BACKWARDS) chunk2.addAll(ROOM_ID, createFakeListOfEvents(30), PaginationDirection.BACKWARDS)
chunk1.merge(ROOM_ID, chunk2, PaginationDirection.FORWARDS) chunk1.merge(ROOM_ID, chunk2, PaginationDirection.FORWARDS)
chunk1.prevToken shouldEqual prevToken chunk1.prevToken shouldBeEqualTo prevToken
} }
} }
@ -133,7 +133,7 @@ internal class ChunkEntityTest : InstrumentedTest {
chunk1.addAll(ROOM_ID, createFakeListOfEvents(30), PaginationDirection.BACKWARDS) chunk1.addAll(ROOM_ID, createFakeListOfEvents(30), PaginationDirection.BACKWARDS)
chunk2.addAll(ROOM_ID, createFakeListOfEvents(30), PaginationDirection.BACKWARDS) chunk2.addAll(ROOM_ID, createFakeListOfEvents(30), PaginationDirection.BACKWARDS)
chunk1.merge(ROOM_ID, chunk2, PaginationDirection.BACKWARDS) chunk1.merge(ROOM_ID, chunk2, PaginationDirection.BACKWARDS)
chunk1.nextToken shouldEqual nextToken chunk1.nextToken shouldBeEqualTo nextToken
} }
} }

2
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineTest.kt
View File

@ -78,7 +78,7 @@ internal class TimelineTest : InstrumentedTest {
// } // }
// } // }
// latch.await() // latch.await()
// timelineEvents.size shouldEqual initialLoad + paginationCount // timelineEvents.size shouldBeEqualTo initialLoad + paginationCount
// timeline.dispose() // timeline.dispose()
// } // }
} }

12
matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/BinaryStringTest.kt
View File

@ -17,13 +17,13 @@
package org.matrix.android.sdk.internal.crypto.verification.qrcode package org.matrix.android.sdk.internal.crypto.verification.qrcode
import org.matrix.android.sdk.MatrixTest import org.matrix.android.sdk.MatrixTest
import org.amshove.kluent.shouldEqualTo import org.amshove.kluent.shouldBeEqualTo
import org.junit.FixMethodOrder import org.junit.FixMethodOrder
import org.junit.Test import org.junit.Test
import org.junit.runners.MethodSorters import org.junit.runners.MethodSorters
@FixMethodOrder(MethodSorters.JVM) @FixMethodOrder(MethodSorters.JVM)
class BinaryStringTest: MatrixTest { class BinaryStringTest : MatrixTest {
/** /**
* I want to put bytes to a String, and vice versa * I want to put bytes to a String, and vice versa
@ -37,17 +37,17 @@ class BinaryStringTest: MatrixTest {
val str = byteArray.toString(Charsets.ISO_8859_1) val str = byteArray.toString(Charsets.ISO_8859_1)
str.length shouldEqualTo 256 str.length shouldBeEqualTo 256
// Ok convert back to bytearray // Ok convert back to bytearray
val result = str.toByteArray(Charsets.ISO_8859_1) val result = str.toByteArray(Charsets.ISO_8859_1)
result.size shouldEqualTo 256 result.size shouldBeEqualTo 256
for (i in 0..255) { for (i in 0..255) {
result[i] shouldEqualTo i.toByte() result[i] shouldBeEqualTo i.toByte()
result[i] shouldEqualTo byteArray[i] result[i] shouldBeEqualTo byteArray[i]
} }
} }
} }