srctree

Robin Linden parent f5217541 272b4959
Migrate unit tests to kotlin.test

inline split

WORKSPACE added: 41, removed: 43, total 0

@@ -187,6 +187,7 @@ maven_install(

"com.typesafe.scala-logging:scala-logging_2.11:3.7.2",

"javax.inject:javax.inject:1",

"junit:junit:4.13.1",

"org.jetbrains.kotlin:kotlin-test-junit:1.7.20",

"org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0",

"org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0",

"org.jetbrains:annotations:13.0",

core/BUILD.bazel added: 41, removed: 43, total 0

@@ -20,7 +20,7 @@ kt_jvm_test(

test_class = "ltd.evilcorp.core.db.ConvertersTest",

deps = [

"//core/src/main/kotlin/db",

"@maven//:junit_junit",

"@maven//:org_jetbrains_kotlin_kotlin_test_junit",

)

core/build.gradle.kts added: 41, removed: 43, total 0

@@ -50,7 +50,7 @@ dependencies {

api(libs.androidx.room.ktx)

kapt(libs.androidx.room.compiler)

testImplementation(libs.test.junit.core)

testImplementation(kotlin("test"))

androidTestImplementation(libs.test.runner)

androidTestImplementation(libs.test.junit.ext)

core/src/test/kotlin/db/ConvertersTest.kt added: 41, removed: 43, total 0

@@ -8,8 +8,8 @@ import ltd.evilcorp.core.vo.ConnectionStatus

import ltd.evilcorp.core.vo.MessageType

import ltd.evilcorp.core.vo.Sender

import ltd.evilcorp.core.vo.UserStatus

import org.junit.Assert.assertEquals

import org.junit.Test

import kotlin.test.Test

import kotlin.test.assertEquals

class ConvertersTest {

@Test

domain/BUILD.bazel added: 41, removed: 43, total 0

@@ -39,7 +39,7 @@ kt_android_library(

TEST_DEPS = [

":domain",

"@maven//:junit_junit",

"@maven//:org_jetbrains_kotlin_kotlin_test_junit",

]

kt_jvm_test(

domain/build.gradle.kts added: 41, removed: 43, total 0

@@ -84,7 +84,7 @@ dependencies {

implementation(libs.jackson.core)

implementation(libs.jackson.annotations)

testImplementation(libs.test.junit.core)

testImplementation(kotlin("test"))

androidTestImplementation(libs.test.runner)

androidTestImplementation(libs.test.junit.ext)

androidTestImplementation(libs.google.guava.workaround)

domain/src/test/kotlin/tox/ToxIdValidatorTest.kt added: 41, removed: 43, total 0

@@ -1,19 +1,19 @@

// SPDX-FileCopyrightText: 2020 aTox contributors

// SPDX-FileCopyrightText: 2020-2022 Robin Lindén <dev@robinlinden.eu>

// SPDX-License-Identifier: GPL-3.0-only

package ltd.evilcorp.domain.tox

import org.junit.Assert

import org.junit.Test

import kotlin.test.Test

import kotlin.test.assertEquals

class ToxIdValidatorTest {

@Test

fun `fine ids validate without issues`() {

val id0 = ToxID("3982B009845B210C5A8904B7F540287A424DE029BC1A25C01E022944AB28FC3C4ACEE797596D")

val id1 = ToxID("A571A6C77225C4081BA4D7AC268B9659B78704037959817E6ED56C4E6BD84B7E3E3EDB624583")

assert(ToxIdValidator.validate(id0) == ToxIdValidator.Result.NO_ERROR)

assert(ToxIdValidator.validate(id1) == ToxIdValidator.Result.NO_ERROR)

assertEquals(ToxIdValidator.validate(id0), ToxIdValidator.Result.NO_ERROR)

assertEquals(ToxIdValidator.validate(id1), ToxIdValidator.Result.NO_ERROR)

}

@Test

@@ -21,9 +21,9 @@ class ToxIdValidatorTest {

val id0 = ToxID("3982B009845B210C5A8904B7F540287A424DE029BC1A25C01E022944AB28FC3C4ACEE797596")

val id1 = ToxID("A571A6C77225C4081BA4D7AC268B9659B78704037959817E6ED56C4E6BD84B7E3E3EDB6245833")

val id2 = ToxID("")

assert(ToxIdValidator.validate(id0) == ToxIdValidator.Result.INCORRECT_LENGTH)

assert(ToxIdValidator.validate(id1) == ToxIdValidator.Result.INCORRECT_LENGTH)

assert(ToxIdValidator.validate(id2) == ToxIdValidator.Result.INCORRECT_LENGTH)

assertEquals(ToxIdValidator.validate(id0), ToxIdValidator.Result.INCORRECT_LENGTH)

assertEquals(ToxIdValidator.validate(id1), ToxIdValidator.Result.INCORRECT_LENGTH)

assertEquals(ToxIdValidator.validate(id2), ToxIdValidator.Result.INCORRECT_LENGTH)

}

@Test

@@ -32,10 +32,10 @@ class ToxIdValidatorTest {

val id1 = ToxID("3982B009845B210C5A8904B7F540287A424DE029BC1A25C01E022944AB28FC3C00000000596D")

val id2 = ToxID("A571A6C77225C4081BA4D7AC268B9659B78704037959817E6ED56C4E6BD84B7E3E3EDB624582")

val id3 = ToxID("A571A6C77225C4081BA4D7AC268B9659B78704037959817E6ED56C4E6BD84B7E3E3EDB62FFFF")

assert(ToxIdValidator.validate(id0) == ToxIdValidator.Result.INVALID_CHECKSUM)

assert(ToxIdValidator.validate(id1) == ToxIdValidator.Result.INVALID_CHECKSUM)

assert(ToxIdValidator.validate(id2) == ToxIdValidator.Result.INVALID_CHECKSUM)

assert(ToxIdValidator.validate(id3) == ToxIdValidator.Result.INVALID_CHECKSUM)

assertEquals(ToxIdValidator.validate(id0), ToxIdValidator.Result.INVALID_CHECKSUM)

assertEquals(ToxIdValidator.validate(id1), ToxIdValidator.Result.INVALID_CHECKSUM)

assertEquals(ToxIdValidator.validate(id2), ToxIdValidator.Result.INVALID_CHECKSUM)

assertEquals(ToxIdValidator.validate(id3), ToxIdValidator.Result.INVALID_CHECKSUM)

}

@Test

@@ -44,15 +44,15 @@ class ToxIdValidatorTest {

val id1 = ToxID("3982B009845B210C5A8904B7F540287A424DE029BC1A25C01E022944AB28FC3C00000000596H")

val id2 = ToxID("A571A6C77225C4081BA4D7AC268B9659B78704037959817E6ED56C4E6BD84B7E3E3EDB62458z")

val id3 = ToxID("A571A6C77225C4081BA4D7AC268B9659B78704037959817E6ED56C4E6BD84B7E3E3EDB62FFF!")

assert(ToxIdValidator.validate(id0) == ToxIdValidator.Result.NOT_HEX)

assert(ToxIdValidator.validate(id1) == ToxIdValidator.Result.NOT_HEX)

assert(ToxIdValidator.validate(id2) == ToxIdValidator.Result.NOT_HEX)

assert(ToxIdValidator.validate(id3) == ToxIdValidator.Result.NOT_HEX)

assertEquals(ToxIdValidator.validate(id0), ToxIdValidator.Result.NOT_HEX)

assertEquals(ToxIdValidator.validate(id1), ToxIdValidator.Result.NOT_HEX)

assertEquals(ToxIdValidator.validate(id2), ToxIdValidator.Result.NOT_HEX)

assertEquals(ToxIdValidator.validate(id3), ToxIdValidator.Result.NOT_HEX)

}

@Test

fun `non-hex is reported before incorrect length`() {

val id0 = ToxID("3982BT")

Assert.assertEquals(ToxIdValidator.Result.NOT_HEX, ToxIdValidator.validate(id0))

assertEquals(ToxIdValidator.Result.NOT_HEX, ToxIdValidator.validate(id0))

}

domain/src/test/kotlin/tox/ToxTypesTest.kt added: 41, removed: 43, total 0

@@ -4,8 +4,8 @@

package ltd.evilcorp.domain.tox

import org.junit.Assert.assertEquals

import org.junit.Test

import kotlin.test.Test

import kotlin.test.assertEquals

class ToxTypesTest {

@Test

domain/src/test/kotlin/tox/ToxUtilTest.kt added: 41, removed: 43, total 0

@@ -1,4 +1,4 @@

// SPDX-FileCopyrightText: 2020 aTox contributors

// SPDX-FileCopyrightText: 2020-2022 Robin Lindén <dev@robinlinden.eu>

// SPDX-License-Identifier: GPL-3.0-only

@@ -12,10 +12,10 @@ import ltd.evilcorp.core.vo.ConnectionStatus

import ltd.evilcorp.core.vo.FileKind

import ltd.evilcorp.core.vo.MessageType

import ltd.evilcorp.core.vo.UserStatus

import org.junit.Assert.assertArrayEquals

import org.junit.Assert.assertEquals

import org.junit.Assert.assertNotEquals

import org.junit.Test

import kotlin.test.Test

import kotlin.test.assertContentEquals

import kotlin.test.assertEquals

import kotlin.test.assertNotEquals

private fun byteArrayOf(vararg bytes: Int) = ByteArray(bytes.size) { bytes[it].toByte() }

@@ -95,9 +95,6 @@ class ToxUtilTest {

@Test

fun `casing of public keys does not matter`() {

val keyString = "76518406F6A9F2217E8DC487CC783C25CC16A15EB36FF32E335A235342C48A39"

assertArrayEquals(

keyString.uppercase().hexToBytes(),

keyString.lowercase().hexToBytes(),

)

assertContentEquals(keyString.uppercase().hexToBytes(), keyString.lowercase().hexToBytes())

}