mirror of
https://github.com/ankidroid/Anki-Android.git
synced 2024-09-20 12:02:16 +02:00
[Kotlin Cleanup] ListUtil
This commit is contained in:
parent
e992dab68d
commit
888b518ac2
@ -15,27 +15,25 @@
|
||||
****************************************************************************************/
|
||||
package com.ichi2.utils
|
||||
|
||||
import com.ichi2.testutils.assertThrows
|
||||
import org.junit.Assert
|
||||
import org.junit.Assert.assertThrows
|
||||
import org.junit.Test
|
||||
import org.junit.internal.ArrayComparisonFailure
|
||||
import java.lang.AssertionError
|
||||
import java.util.*
|
||||
import kotlin.Throws
|
||||
|
||||
class ListUtil {
|
||||
@Test
|
||||
@KotlinCleanup("Use Kotlin's methods instead of Arrays.asList")
|
||||
@KotlinCleanup("Use AnkiAssert.assertThrows<>")
|
||||
fun EqualsTest() {
|
||||
assertThrows(ArrayComparisonFailure::class.java) { assertListEquals(Arrays.asList(2L, 3L), Arrays.asList(2L, 4L)) }
|
||||
assertThrows(ArrayComparisonFailure::class.java) { assertListEquals(Arrays.asList(2L, 3L), Arrays.asList(2L)) }
|
||||
assertThrows(ArrayComparisonFailure::class.java) { assertListEquals(Arrays.asList(2L, 3L), Arrays.asList(5L)) }
|
||||
assertThrows(ArrayComparisonFailure::class.java) { assertListEquals(Arrays.asList(2L, 3L), Arrays.asList(2L, 3L, 5L)) }
|
||||
assertThrows(AssertionError::class.java) { assertListEquals(Arrays.asList(2L, 3L), null) }
|
||||
assertThrows(AssertionError::class.java) { assertListEquals(null, Arrays.asList(2L, 4L)) }
|
||||
fun equalsTest() {
|
||||
assertThrows<ArrayComparisonFailure> { assertListEquals(listOf(2L, 3L), listOf(2L, 4L)) }
|
||||
assertThrows<ArrayComparisonFailure> { assertListEquals(listOf(2L, 3L), listOf(2L)) }
|
||||
assertThrows<ArrayComparisonFailure> { assertListEquals(listOf(2L, 3L), listOf(5L)) }
|
||||
assertThrows<ArrayComparisonFailure> { assertListEquals(listOf(2L, 3L), listOf(2L, 3L, 5L)) }
|
||||
assertThrows<AssertionError> { assertListEquals(listOf(2L, 3L), null) }
|
||||
assertThrows<AssertionError> { assertListEquals(null, listOf(2L, 4L)) }
|
||||
assertListEquals(null, null)
|
||||
assertListEquals(Arrays.asList(2L, 3L), Arrays.asList(2L, 3L))
|
||||
assertListEquals(listOf(2L, 3L), listOf(2L, 3L))
|
||||
}
|
||||
|
||||
companion object {
|
||||
@ -47,7 +45,7 @@ class ListUtil {
|
||||
*
|
||||
* @param message the identifying message for the [AssertionError] (`null`
|
||||
* okay)
|
||||
* @param expecteds Object list or list of arrays (multi-dimensional array) with
|
||||
* @param expected Object list or list of arrays (multi-dimensional array) with
|
||||
* expected values.
|
||||
* @param actuals Object list or list of arrays (multi-dimensional array) with
|
||||
* actual values
|
||||
@ -55,12 +53,12 @@ class ListUtil {
|
||||
@Throws(ArrayComparisonFailure::class)
|
||||
fun assertListEquals(
|
||||
message: String?,
|
||||
expecteds: List<Any>?,
|
||||
expected: List<Any>?,
|
||||
actuals: List<Any>?
|
||||
) {
|
||||
val expecteds_array: Array<Any>? = expecteds?.toTypedArray()
|
||||
val actuals_array: Array<Any>? = actuals?.toTypedArray()
|
||||
Assert.assertArrayEquals(message, expecteds_array, actuals_array)
|
||||
val expectedArray: Array<Any>? = expected?.toTypedArray()
|
||||
val actualArray: Array<Any>? = actuals?.toTypedArray()
|
||||
Assert.assertArrayEquals(message, expectedArray, actualArray)
|
||||
}
|
||||
|
||||
/**
|
||||
@ -69,14 +67,14 @@ class ListUtil {
|
||||
* `actual` are `null`, they are considered
|
||||
* equal.
|
||||
*
|
||||
* @param expecteds Object list or list of arrays (multi-dimensional array) with
|
||||
* @param expected Object list or list of arrays (multi-dimensional array) with
|
||||
* expected values
|
||||
* @param actuals Object list or list of arrays (multi-dimensional array) with
|
||||
* actual values
|
||||
*/
|
||||
@JvmStatic
|
||||
fun assertListEquals(expecteds: List<Any>?, actuals: List<Any>?) {
|
||||
assertListEquals(null, expecteds, actuals)
|
||||
fun assertListEquals(expected: List<Any>?, actuals: List<Any>?) {
|
||||
assertListEquals(null, expected, actuals)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user