From 08d73542c24440355abf8360bb2db90773e1181f Mon Sep 17 00:00:00 2001 From: MJ Date: Sun, 23 Jul 2023 22:09:12 +0200 Subject: [PATCH] Kotlin 1.9.0 and Dokka 1.8.20 updates. #464 --- .github/workflows/build.yml | 2 +- CHANGELOG.md | 4 +- README.md | 2 +- .../src/test/kotlin/ktx/actors/StagesTest.kt | 8 ++-- .../src/test/kotlin/ktx/actors/WidgetsTest.kt | 2 +- actors/src/test/kotlin/ktx/actors/utils.kt | 4 +- app/src/test/kotlin/ktx/app/GraphicsTest.kt | 4 +- app/src/test/kotlin/ktx/app/PlatformTest.kt | 4 +- app/src/test/kotlin/ktx/app/ProfilingTest.kt | 2 +- app/src/test/kotlin/ktx/app/gameTest.kt | 18 ++++----- .../ktx/assets/async/AssetStorageTest.kt | 20 +++++----- .../ktx/assets/async/AsyncAssetManagerTest.kt | 2 +- .../assets/async/assetStorageLoadingTest.kt | 38 +++++++++---------- .../kotlin/ktx/assets/async/loadersTest.kt | 6 +-- .../src/test/kotlin/ktx/assets/AssetsTest.kt | 6 +-- .../test/kotlin/ktx/assets/DisposablesTest.kt | 12 +++--- .../kotlin/ktx/assets/TextAssetLoaderTest.kt | 6 +-- .../test/kotlin/ktx/async/dispatchersTest.kt | 2 +- async/src/test/kotlin/ktx/async/httpTest.kt | 20 +++++----- box2d/src/test/kotlin/ktx/box2d/BodiesTest.kt | 8 ++-- box2d/src/test/kotlin/ktx/box2d/WorldsTest.kt | 6 +-- build.gradle.kts | 6 +-- buildSrc/src/main/kotlin/ktx/Versions.kt | 2 +- .../ktx/freetype/async/freeTypeAsyncTest.kt | 9 +++-- .../test/kotlin/ktx/freetype/FreeTypeTest.kt | 2 +- gradle.properties | 4 +- .../test/kotlin/ktx/graphics/GraphicsTest.kt | 12 +++--- .../kotlin/ktx/graphics/ShapeRendererTest.kt | 6 +-- .../kotlin/ktx/graphics/TextUtilitiesTest.kt | 2 +- .../test/kotlin/ktx/graphics/cameraTest.kt | 12 +++--- .../src/test/kotlin/ktx/inject/injectTest.kt | 12 +++--- .../test/kotlin/ktx/json/serializersTest.kt | 4 +- .../kotlin/ktx/scene2d/StageWidgetTest.kt | 2 +- .../test/kotlin/ktx/scene2d/factoryTest.kt | 2 +- .../test/kotlin/ktx/scene2d/testUtilities.kt | 2 +- .../src/test/kotlin/ktx/style/VisStyleTest.kt | 2 +- .../kotlin/ktx/scene2d/vis/factoryTest.kt | 2 +- 37 files changed, 130 insertions(+), 127 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a9248695..66a55004 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java-version: [8, 11] + java-version: [8, 11, 17] steps: - name: Repository checkout diff --git a/CHANGELOG.md b/CHANGELOG.md index 604f5861..334efa45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,11 @@ _See also: [the official libGDX changelog](https://github.com/libgdx/libgdx/blob #### 1.12.0-SNAPSHOT - **[UPDATE]** Updated to libGDX 1.12.0. -- **[UPDATE]** Updated to Kotlin 1.8.22. +- **[UPDATE]** Updated to Kotlin 1.9.0. - **[UPDATE]** Updated to Kotlin Coroutines 1.7.2. - **[UPDATE]** Updated to VisUI 1.5.2. +- **[UPDATE]** Updated to Dokka 1.8.20. +- **[MISC]** **KTX** project should now work locally under JDK 17, including the test suite. - **[FEATURE]** (`ktx-app`) `KtxInputAdapter` now supports the `touchCancelled` event handling. By default, it calls the `touchUp` method for consistency with the previous libGDX versions. diff --git a/README.md b/README.md index c9b78239..0e3602f9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![GitHub Build](https://github.com/libktx/ktx/workflows/build/badge.svg)](https://github.com/libktx/ktx/actions?query=workflow%3Abuild) -[![Kotlin](https://img.shields.io/badge/kotlin-1.8.22-orange.svg)](http://kotlinlang.org/) +[![Kotlin](https://img.shields.io/badge/kotlin-1.9.0-orange.svg)](http://kotlinlang.org/) [![libGDX](https://img.shields.io/badge/libgdx-1.12.0-red.svg)](https://libgdx.com/) [![Maven Central](https://img.shields.io/maven-central/v/io.github.libktx/ktx-async.svg)](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.github.libktx%22) diff --git a/actors/src/test/kotlin/ktx/actors/StagesTest.kt b/actors/src/test/kotlin/ktx/actors/StagesTest.kt index b96ad335..d104a1b7 100644 --- a/actors/src/test/kotlin/ktx/actors/StagesTest.kt +++ b/actors/src/test/kotlin/ktx/actors/StagesTest.kt @@ -9,15 +9,15 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.utils.Scaling.stretch import com.badlogic.gdx.utils.viewport.ScalingViewport import com.badlogic.gdx.utils.viewport.Viewport -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doAnswer -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock import org.junit.After import org.junit.Assert.assertEquals import org.junit.Assert.assertSame import org.junit.Before import org.junit.Test +import org.mockito.kotlin.any +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock import java.nio.IntBuffer class StagesTest { diff --git a/actors/src/test/kotlin/ktx/actors/WidgetsTest.kt b/actors/src/test/kotlin/ktx/actors/WidgetsTest.kt index fe3ad1ca..37ca96fe 100644 --- a/actors/src/test/kotlin/ktx/actors/WidgetsTest.kt +++ b/actors/src/test/kotlin/ktx/actors/WidgetsTest.kt @@ -9,10 +9,10 @@ import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.scenes.scene2d.ui.Label.LabelStyle import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.badlogic.gdx.scenes.scene2d.ui.TextButton.TextButtonStyle -import com.nhaarman.mockitokotlin2.mock import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test +import org.mockito.kotlin.mock class WidgetsTest { @Before diff --git a/actors/src/test/kotlin/ktx/actors/utils.kt b/actors/src/test/kotlin/ktx/actors/utils.kt index 4d71861e..dd55b830 100644 --- a/actors/src/test/kotlin/ktx/actors/utils.kt +++ b/actors/src/test/kotlin/ktx/actors/utils.kt @@ -3,8 +3,8 @@ package ktx.actors import com.badlogic.gdx.Gdx import com.badlogic.gdx.scenes.scene2d.Stage import com.badlogic.gdx.utils.viewport.Viewport -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock /** @return [Stage] with mocked viewport and batch. */ internal fun getMockStage( diff --git a/app/src/test/kotlin/ktx/app/GraphicsTest.kt b/app/src/test/kotlin/ktx/app/GraphicsTest.kt index df8c1218..5d2fa67b 100644 --- a/app/src/test/kotlin/ktx/app/GraphicsTest.kt +++ b/app/src/test/kotlin/ktx/app/GraphicsTest.kt @@ -2,9 +2,9 @@ package ktx.app import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.GL20 -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify import org.junit.Test +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify /** * Tests general utilities related to libGDX graphics API. diff --git a/app/src/test/kotlin/ktx/app/PlatformTest.kt b/app/src/test/kotlin/ktx/app/PlatformTest.kt index 57666373..8251c4bd 100644 --- a/app/src/test/kotlin/ktx/app/PlatformTest.kt +++ b/app/src/test/kotlin/ktx/app/PlatformTest.kt @@ -4,8 +4,6 @@ import com.badlogic.gdx.Application import com.badlogic.gdx.Application.ApplicationType import com.badlogic.gdx.Gdx import com.badlogic.gdx.utils.GdxRuntimeException -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock import io.kotlintest.matchers.shouldThrow import org.junit.After import org.junit.Assert.assertEquals @@ -13,6 +11,8 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertSame import org.junit.Assert.assertTrue import org.junit.Test +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock /** * Tests [Platform] utilities. diff --git a/app/src/test/kotlin/ktx/app/ProfilingTest.kt b/app/src/test/kotlin/ktx/app/ProfilingTest.kt index 85968416..92ac57de 100644 --- a/app/src/test/kotlin/ktx/app/ProfilingTest.kt +++ b/app/src/test/kotlin/ktx/app/ProfilingTest.kt @@ -2,11 +2,11 @@ package ktx.app import com.badlogic.gdx.Gdx import com.badlogic.gdx.utils.PerformanceCounter -import com.nhaarman.mockitokotlin2.mock import org.junit.After import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test +import org.mockito.kotlin.mock class ProfilingTest { @Before diff --git a/app/src/test/kotlin/ktx/app/gameTest.kt b/app/src/test/kotlin/ktx/app/gameTest.kt index 43282eca..512a08f1 100644 --- a/app/src/test/kotlin/ktx/app/gameTest.kt +++ b/app/src/test/kotlin/ktx/app/gameTest.kt @@ -4,15 +4,6 @@ import com.badlogic.gdx.Gdx import com.badlogic.gdx.Screen import com.badlogic.gdx.graphics.GL20 import com.badlogic.gdx.utils.GdxRuntimeException -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.argThat -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.doThrow -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify import org.junit.After import org.junit.Assert.assertFalse import org.junit.Assert.assertNull @@ -20,6 +11,15 @@ import org.junit.Assert.assertSame import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test +import org.mockito.kotlin.any +import org.mockito.kotlin.argThat +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.doThrow +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.times +import org.mockito.kotlin.verify /** * Tests [KtxGame]: KTX equivalent of [com.badlogic.gdx.Game]. diff --git a/assets-async/src/test/kotlin/ktx/assets/async/AssetStorageTest.kt b/assets-async/src/test/kotlin/ktx/assets/async/AssetStorageTest.kt index c64f97c6..2dd6129c 100644 --- a/assets-async/src/test/kotlin/ktx/assets/async/AssetStorageTest.kt +++ b/assets-async/src/test/kotlin/ktx/assets/async/AssetStorageTest.kt @@ -26,12 +26,6 @@ import com.badlogic.gdx.utils.GdxRuntimeException import com.badlogic.gdx.utils.I18NBundle import com.badlogic.gdx.utils.Logger import com.google.common.collect.Sets -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doAnswer -import com.nhaarman.mockitokotlin2.doThrow -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify import io.kotlintest.matchers.shouldThrow import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.Deferred @@ -60,6 +54,12 @@ import org.junit.BeforeClass import org.junit.Rule import org.junit.Test import org.junit.rules.TestName +import org.mockito.kotlin.any +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.doThrow +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify import java.lang.Integer.min import java.util.IdentityHashMap import java.util.concurrent.CompletableFuture @@ -294,7 +294,7 @@ class AssetStorageTest : AsyncTest() { assertEquals("Content.", storage.get(path)) assertEquals("Content.", storage.getOrNull(path)) assertEquals("Content.", runBlocking { storage.getAsync(path).await() }) - assertEquals(emptyList(), storage.getDependencies(path)) + assertEquals(emptyList>(), storage.getDependencies(path)) assertEquals(storage.getIdentifier(path), storage.getAssetIdentifiers(path).first()) checkProgress(storage, loaded = 1, warn = true) } @@ -314,7 +314,7 @@ class AssetStorageTest : AsyncTest() { assertEquals("Content.", storage[identifier]) assertEquals("Content.", storage.getOrNull(identifier)) assertEquals("Content.", runBlocking { storage.getAsync(identifier).await() }) - assertEquals(emptyList(), storage.getDependencies(identifier)) + assertEquals(emptyList>(), storage.getDependencies(identifier)) assertEquals(identifier, storage.getAssetIdentifiers(identifier.path).first()) checkProgress(storage, loaded = 1, warn = true) } @@ -334,7 +334,7 @@ class AssetStorageTest : AsyncTest() { assertEquals("Content.", storage[descriptor]) assertEquals("Content.", storage.getOrNull(descriptor)) assertEquals("Content.", runBlocking { storage.getAsync(descriptor).await() }) - assertEquals(emptyList(), storage.getDependencies(descriptor)) + assertEquals(emptyList>(), storage.getDependencies(descriptor)) assertEquals(descriptor.toIdentifier(), storage.getAssetIdentifiers(descriptor.fileName).first()) checkProgress(storage, loaded = 1, warn = true) } @@ -608,7 +608,7 @@ class AssetStorageTest : AsyncTest() { assertTrue(storage.isLoaded(path)) assertEquals(1, storage.getReferenceCount(path)) assertEquals(1, storage.getReferenceCount(path)) - assertNotSame(storage.get(path), storage.get(path)) + assertNotSame(storage.get(path), storage.get(path) as Any) assertEquals( setOf(storage.getIdentifier(path), storage.getIdentifier(path)), storage.getAssetIdentifiers(path).toSet() diff --git a/assets-async/src/test/kotlin/ktx/assets/async/AsyncAssetManagerTest.kt b/assets-async/src/test/kotlin/ktx/assets/async/AsyncAssetManagerTest.kt index 6f8a039a..4404b32c 100644 --- a/assets-async/src/test/kotlin/ktx/assets/async/AsyncAssetManagerTest.kt +++ b/assets-async/src/test/kotlin/ktx/assets/async/AsyncAssetManagerTest.kt @@ -33,7 +33,6 @@ import com.badlogic.gdx.graphics.glutils.ShaderProgram import com.badlogic.gdx.scenes.scene2d.ui.Skin import com.badlogic.gdx.utils.GdxRuntimeException import com.badlogic.gdx.utils.I18NBundle -import com.nhaarman.mockitokotlin2.mock import io.kotlintest.matchers.shouldThrow import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.runBlocking @@ -51,6 +50,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.BeforeClass import org.junit.Test +import org.mockito.kotlin.mock import com.badlogic.gdx.graphics.g3d.particles.ParticleEffect as ParticleEffect3D import com.badlogic.gdx.graphics.g3d.particles.ParticleEffectLoader as ParticleEffect3dLoader diff --git a/assets-async/src/test/kotlin/ktx/assets/async/assetStorageLoadingTest.kt b/assets-async/src/test/kotlin/ktx/assets/async/assetStorageLoadingTest.kt index 510aac4a..b0760622 100644 --- a/assets-async/src/test/kotlin/ktx/assets/async/assetStorageLoadingTest.kt +++ b/assets-async/src/test/kotlin/ktx/assets/async/assetStorageLoadingTest.kt @@ -22,7 +22,6 @@ import com.badlogic.gdx.scenes.scene2d.ui.Button import com.badlogic.gdx.scenes.scene2d.ui.Skin import com.badlogic.gdx.utils.I18NBundle import com.badlogic.gdx.utils.Logger -import com.nhaarman.mockitokotlin2.mock import io.kotlintest.matchers.shouldThrow import kotlinx.coroutines.runBlocking import ktx.assets.TextAssetLoader @@ -40,6 +39,7 @@ import org.junit.BeforeClass import org.junit.Rule import org.junit.Test import org.junit.rules.TestName +import org.mockito.kotlin.mock import java.util.IdentityHashMap import com.badlogic.gdx.graphics.g3d.particles.ParticleEffect as ParticleEffect3D @@ -92,7 +92,7 @@ abstract class AbstractAssetStorageLoadingTest : AsyncTest() { assertTrue(storage.isLoaded(path)) assertSame(asset, storage.get(path)) assertEquals(1, storage.getReferenceCount(path)) - assertEquals(emptyList(), storage.getDependencies(path)) + assertEquals(emptyList>(), storage.getDependencies(path)) } @Test @@ -109,7 +109,7 @@ abstract class AbstractAssetStorageLoadingTest : AsyncTest() { assertTrue(storage.isLoaded(path)) assertSame(asset, storage.get(path)) assertEquals(1, storage.getReferenceCount(path)) - assertEquals(emptyList(), storage.getDependencies(path)) + assertEquals(emptyList>(), storage.getDependencies(path)) } @Test @@ -181,7 +181,7 @@ abstract class AbstractAssetStorageLoadingTest : AsyncTest() { assertTrue(storage.isLoaded(path)) assertSame(asset, storage.get(path)) assertEquals(1, storage.getReferenceCount(path)) - assertEquals(emptyList(), storage.getDependencies(path)) + assertEquals(emptyList>(), storage.getDependencies(path)) storage.dispose() } @@ -214,7 +214,7 @@ abstract class AbstractAssetStorageLoadingTest : AsyncTest() { assertTrue(storage.isLoaded(path)) assertSame(asset, storage.get(path)) assertEquals(1, storage.getReferenceCount(path)) - assertEquals(emptyList(), storage.getDependencies(path)) + assertEquals(emptyList>(), storage.getDependencies(path)) storage.dispose() } @@ -288,7 +288,7 @@ abstract class AbstractAssetStorageLoadingTest : AsyncTest() { assertTrue(storage.isLoaded(path)) assertSame(asset, storage.get(path)) assertEquals(1, storage.getReferenceCount(path)) - assertEquals(emptyList(), storage.getDependencies(path)) + assertEquals(emptyList>(), storage.getDependencies(path)) storage.dispose() } @@ -321,7 +321,7 @@ abstract class AbstractAssetStorageLoadingTest : AsyncTest() { assertTrue(storage.isLoaded(path)) assertSame(asset, storage.get(path)) assertEquals(1, storage.getReferenceCount(path)) - assertEquals(emptyList(), storage.getDependencies(path)) + assertEquals(emptyList>(), storage.getDependencies(path)) storage.dispose() } @@ -406,7 +406,7 @@ abstract class AbstractAssetStorageLoadingTest : AsyncTest() { assertEquals("Value.", asset["key"]) assertSame(asset, storage.get(path)) assertEquals(1, storage.getReferenceCount(path)) - assertEquals(emptyList(), storage.getDependencies(path)) + assertEquals(emptyList>(), storage.getDependencies(path)) storage.dispose() } @@ -439,7 +439,7 @@ abstract class AbstractAssetStorageLoadingTest : AsyncTest() { assertTrue(storage.isLoaded(path)) assertSame(asset, storage.get(path)) assertEquals(1, storage.getReferenceCount(path)) - assertEquals(emptyList(), storage.getDependencies(path)) + assertEquals(emptyList>(), storage.getDependencies(path)) storage.dispose() } @@ -554,7 +554,7 @@ abstract class AbstractAssetStorageLoadingTest : AsyncTest() { assertTrue(storage.isLoaded(path)) assertSame(asset, storage.get(path)) assertEquals(1, storage.getReferenceCount(path)) - assertEquals(emptyList(), storage.getDependencies(path)) + assertEquals(emptyList>(), storage.getDependencies(path)) storage.dispose() } @@ -587,7 +587,7 @@ abstract class AbstractAssetStorageLoadingTest : AsyncTest() { assertTrue(storage.isLoaded(path)) assertSame(asset, storage.get(path)) assertEquals(1, storage.getReferenceCount(path)) - assertEquals(emptyList(), storage.getDependencies(path)) + assertEquals(emptyList>(), storage.getDependencies(path)) storage.dispose() } @@ -620,7 +620,7 @@ abstract class AbstractAssetStorageLoadingTest : AsyncTest() { assertTrue(storage.isLoaded(path)) assertSame(asset, storage.get(path)) assertEquals(1, storage.getReferenceCount(path)) - assertEquals(emptyList(), storage.getDependencies(path)) + assertEquals(emptyList>(), storage.getDependencies(path)) storage.dispose() } @@ -655,7 +655,7 @@ abstract class AbstractAssetStorageLoadingTest : AsyncTest() { assertTrue(storage.isLoaded(path)) assertSame(asset, storage.get(path)) assertEquals(1, storage.getReferenceCount(path)) - assertEquals(emptyList(), storage.getDependencies(path)) + assertEquals(emptyList>(), storage.getDependencies(path)) storage.dispose() } @@ -690,7 +690,7 @@ abstract class AbstractAssetStorageLoadingTest : AsyncTest() { assertTrue(storage.isLoaded(path)) assertSame(asset, storage.get(path)) assertEquals(1, storage.getReferenceCount(path)) - assertEquals(emptyList(), storage.getDependencies(path)) + assertEquals(emptyList>(), storage.getDependencies(path)) storage.dispose() } @@ -745,7 +745,7 @@ abstract class AbstractAssetStorageLoadingTest : AsyncTest() { assertFalse(it in storage) assertFalse(storage.isLoaded(it)) assertEquals(0, storage.getReferenceCount(it)) - assertEquals(emptyList(), storage.getDependencies(it)) + assertEquals(emptyList>(), storage.getDependencies(it)) shouldThrow { storage[it] } @@ -789,7 +789,7 @@ abstract class AbstractAssetStorageLoadingTest : AsyncTest() { assertEquals("Content.", storage.get(path)) assertEquals("Content.", storage.getOrNull(path)) assertEquals("Content.", runBlocking { storage.getAsync(path).await() }) - assertEquals(emptyList(), storage.getDependencies(path)) + assertEquals(emptyList>(), storage.getDependencies(path)) checkProgress(storage, loaded = 1, warn = true) } @@ -808,7 +808,7 @@ abstract class AbstractAssetStorageLoadingTest : AsyncTest() { assertEquals("Content.", storage[identifier]) assertEquals("Content.", storage.getOrNull(identifier)) assertEquals("Content.", runBlocking { storage.getAsync(identifier).await() }) - assertEquals(emptyList(), storage.getDependencies(identifier)) + assertEquals(emptyList>(), storage.getDependencies(identifier)) checkProgress(storage, loaded = 1, warn = true) } @@ -827,7 +827,7 @@ abstract class AbstractAssetStorageLoadingTest : AsyncTest() { assertEquals("Content.", storage[descriptor]) assertEquals("Content.", storage.getOrNull(descriptor)) assertEquals("Content.", runBlocking { storage.getAsync(descriptor).await() }) - assertEquals(emptyList(), storage.getDependencies(descriptor)) + assertEquals(emptyList>(), storage.getDependencies(descriptor)) checkProgress(storage, loaded = 1, warn = true) } @@ -896,7 +896,7 @@ abstract class AbstractAssetStorageLoadingTest : AsyncTest() { assertTrue(storage.isLoaded(path)) assertEquals(1, storage.getReferenceCount(path)) assertEquals(1, storage.getReferenceCount(path)) - assertNotSame(storage.get(path), storage.get(path)) + assertNotSame(storage.get(path), storage.get(path) as Any) checkProgress(storage, loaded = 2, warn = true) storage.dispose() diff --git a/assets-async/src/test/kotlin/ktx/assets/async/loadersTest.kt b/assets-async/src/test/kotlin/ktx/assets/async/loadersTest.kt index b9133b85..209f1ba2 100644 --- a/assets-async/src/test/kotlin/ktx/assets/async/loadersTest.kt +++ b/assets-async/src/test/kotlin/ktx/assets/async/loadersTest.kt @@ -6,15 +6,15 @@ import com.badlogic.gdx.assets.AssetManager import com.badlogic.gdx.assets.loaders.AssetLoader import com.badlogic.gdx.assets.loaders.SynchronousAssetLoader import com.badlogic.gdx.files.FileHandle -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify import io.kotlintest.matchers.shouldThrow import org.junit.Assert.assertEquals import org.junit.Assert.assertNotSame import org.junit.Assert.assertNull import org.junit.Assert.assertSame import org.junit.Test +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify import java.io.File import com.badlogic.gdx.utils.Array as GdxArray diff --git a/assets/src/test/kotlin/ktx/assets/AssetsTest.kt b/assets/src/test/kotlin/ktx/assets/AssetsTest.kt index 30114f03..5e0a0b93 100644 --- a/assets/src/test/kotlin/ktx/assets/AssetsTest.kt +++ b/assets/src/test/kotlin/ktx/assets/AssetsTest.kt @@ -10,9 +10,6 @@ import com.badlogic.gdx.files.FileHandle import com.badlogic.gdx.utils.Array import com.badlogic.gdx.utils.Disposable import com.badlogic.gdx.utils.GdxRuntimeException -import com.nhaarman.mockitokotlin2.doThrow -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify import ktx.assets.AssetsTest.MockAssetLoader.MockParameter import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse @@ -23,6 +20,9 @@ import org.junit.Assert.assertTrue import org.junit.Assert.fail import org.junit.Before import org.junit.Test +import org.mockito.kotlin.doThrow +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify /** * Tests asset-related utilities and [AssetManager] extensions. diff --git a/assets/src/test/kotlin/ktx/assets/DisposablesTest.kt b/assets/src/test/kotlin/ktx/assets/DisposablesTest.kt index e8041931..8ea596d6 100644 --- a/assets/src/test/kotlin/ktx/assets/DisposablesTest.kt +++ b/assets/src/test/kotlin/ktx/assets/DisposablesTest.kt @@ -2,11 +2,6 @@ package ktx.assets import com.badlogic.gdx.utils.Disposable import com.badlogic.gdx.utils.GdxRuntimeException -import com.nhaarman.mockitokotlin2.doThrow -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.verifyZeroInteractions import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull @@ -14,6 +9,11 @@ import org.junit.Assert.assertSame import org.junit.Assert.assertTrue import org.junit.Assert.fail import org.junit.Test +import org.mockito.kotlin.doThrow +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.verify +import org.mockito.kotlin.verifyNoInteractions import com.badlogic.gdx.utils.Array as GdxArray /** @@ -181,7 +181,7 @@ class DisposablesTest { exception.ignore() - verifyZeroInteractions(exception) + verifyNoInteractions(exception) } @Test diff --git a/assets/src/test/kotlin/ktx/assets/TextAssetLoaderTest.kt b/assets/src/test/kotlin/ktx/assets/TextAssetLoaderTest.kt index 079f5031..cdfafe72 100644 --- a/assets/src/test/kotlin/ktx/assets/TextAssetLoaderTest.kt +++ b/assets/src/test/kotlin/ktx/assets/TextAssetLoaderTest.kt @@ -3,13 +3,13 @@ package ktx.assets import com.badlogic.gdx.assets.loaders.AssetLoader import com.badlogic.gdx.files.FileHandle import com.badlogic.gdx.utils.GdxRuntimeException -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify import io.kotlintest.matchers.shouldThrow import ktx.assets.TextAssetLoader.TextAssetLoaderParameters import org.junit.Assert import org.junit.Test +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify /** * Tests [TextAssetLoader]: [AssetLoader] implementation for asynchronous reading of text files. diff --git a/async/src/test/kotlin/ktx/async/dispatchersTest.kt b/async/src/test/kotlin/ktx/async/dispatchersTest.kt index d2590b52..a74771fe 100644 --- a/async/src/test/kotlin/ktx/async/dispatchersTest.kt +++ b/async/src/test/kotlin/ktx/async/dispatchersTest.kt @@ -5,7 +5,6 @@ package ktx.async import com.badlogic.gdx.Gdx import com.badlogic.gdx.utils.Timer import com.badlogic.gdx.utils.async.AsyncExecutor -import com.nhaarman.mockitokotlin2.verify import io.kotlintest.mock.mock import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope @@ -20,6 +19,7 @@ import org.junit.Assert.assertNotSame import org.junit.Assert.assertSame import org.junit.Assert.assertTrue import org.junit.Test +import org.mockito.kotlin.verify import java.util.concurrent.CompletableFuture import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.atomic.AtomicInteger diff --git a/async/src/test/kotlin/ktx/async/httpTest.kt b/async/src/test/kotlin/ktx/async/httpTest.kt index 6adbf44a..da9926b0 100644 --- a/async/src/test/kotlin/ktx/async/httpTest.kt +++ b/async/src/test/kotlin/ktx/async/httpTest.kt @@ -12,15 +12,6 @@ import com.badlogic.gdx.utils.async.AsyncExecutor import com.github.tomakehurst.wiremock.client.WireMock.aResponse import com.github.tomakehurst.wiremock.client.WireMock.get import com.github.tomakehurst.wiremock.junit.WireMockRule -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doAnswer -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.spy -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify -import com.nhaarman.mockitokotlin2.verifyZeroInteractions import io.kotlintest.matchers.shouldThrow import kotlinx.coroutines.CancellableContinuation import kotlinx.coroutines.async @@ -34,6 +25,15 @@ import org.junit.Assert.assertSame import org.junit.Assert.assertTrue import org.junit.Rule import org.junit.Test +import org.mockito.kotlin.any +import org.mockito.kotlin.doAnswer +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.spy +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.verifyNoInteractions /** * Tests [HttpRequest] API utilities. @@ -330,7 +330,7 @@ class KtxHttpResponseListenerTest { // Then: verify(coroutine, times(1)).resumeWith(Result.failure(exception)) - verifyZeroInteractions(onCancel) + verifyNoInteractions(onCancel) } @Test diff --git a/box2d/src/test/kotlin/ktx/box2d/BodiesTest.kt b/box2d/src/test/kotlin/ktx/box2d/BodiesTest.kt index 2d20a16e..a3af2189 100644 --- a/box2d/src/test/kotlin/ktx/box2d/BodiesTest.kt +++ b/box2d/src/test/kotlin/ktx/box2d/BodiesTest.kt @@ -11,15 +11,15 @@ import com.badlogic.gdx.physics.box2d.Fixture import com.badlogic.gdx.physics.box2d.PolygonShape import com.badlogic.gdx.physics.box2d.Shape import com.badlogic.gdx.physics.box2d.World -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.spy -import com.nhaarman.mockitokotlin2.verify import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertSame import org.junit.Assert.assertTrue import org.junit.Test +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.spy +import org.mockito.kotlin.verify // TODO Kotlin Contracts in 1.3 do not support vararg methods such as polygon, chain or loop. // Once that compiler bug is fixed, their tests with init blocks should be extended to test the contracts. diff --git a/box2d/src/test/kotlin/ktx/box2d/WorldsTest.kt b/box2d/src/test/kotlin/ktx/box2d/WorldsTest.kt index b6688f04..d7e8f721 100644 --- a/box2d/src/test/kotlin/ktx/box2d/WorldsTest.kt +++ b/box2d/src/test/kotlin/ktx/box2d/WorldsTest.kt @@ -9,14 +9,14 @@ import com.badlogic.gdx.physics.box2d.CircleShape import com.badlogic.gdx.physics.box2d.EdgeShape import com.badlogic.gdx.physics.box2d.Fixture import com.badlogic.gdx.physics.box2d.World -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.spy -import com.nhaarman.mockitokotlin2.verify import org.junit.Assert.assertEquals import org.junit.Assert.assertNotNull import org.junit.Assert.assertSame import org.junit.Assert.assertTrue import org.junit.Test +import org.mockito.kotlin.never +import org.mockito.kotlin.spy +import org.mockito.kotlin.verify /** * Tests [World] utilities and extension methods. diff --git a/build.gradle.kts b/build.gradle.kts index aa1c023d..c2dfa334 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -71,13 +71,13 @@ subprojects { } java { - sourceCompatibility = JavaVersion.VERSION_1_7 // For RoboVM compatibility. + sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } tasks.withType { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = JavaVersion.VERSION_1_8.toString() freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn" } } @@ -90,7 +90,7 @@ subprojects { testImplementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion") testImplementation("junit:junit:$junitVersion") testImplementation("io.kotlintest:kotlintest:$kotlinTestVersion") - testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:$kotlinMockitoVersion") + testImplementation("org.mockito.kotlin:mockito-kotlin:$kotlinMockitoVersion") testImplementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion") } diff --git a/buildSrc/src/main/kotlin/ktx/Versions.kt b/buildSrc/src/main/kotlin/ktx/Versions.kt index aeee714d..b0cb80fd 100644 --- a/buildSrc/src/main/kotlin/ktx/Versions.kt +++ b/buildSrc/src/main/kotlin/ktx/Versions.kt @@ -10,7 +10,7 @@ const val visUiVersion = "1.5.2" const val spekVersion = "1.1.5" const val kotlinTestVersion = "2.0.7" -const val kotlinMockitoVersion = "2.1.0" +const val kotlinMockitoVersion = "4.1.0" const val assertjVersion = "3.11.1" const val junitVersion = "4.12" const val slf4jVersion = "1.7.26" diff --git a/freetype-async/src/test/kotlin/ktx/freetype/async/freeTypeAsyncTest.kt b/freetype-async/src/test/kotlin/ktx/freetype/async/freeTypeAsyncTest.kt index 906136db..6515ecc1 100644 --- a/freetype-async/src/test/kotlin/ktx/freetype/async/freeTypeAsyncTest.kt +++ b/freetype-async/src/test/kotlin/ktx/freetype/async/freeTypeAsyncTest.kt @@ -7,12 +7,12 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGeneratorLoader import com.badlogic.gdx.graphics.g2d.freetype.FreetypeFontLoader -import com.nhaarman.mockitokotlin2.mock import io.kotlintest.matchers.shouldThrow import kotlinx.coroutines.async import kotlinx.coroutines.runBlocking import ktx.assets.async.AssetStorage import ktx.assets.async.AsyncAssetManager +import ktx.assets.async.Identifier import ktx.assets.async.MissingAssetException import ktx.async.AsyncTest import ktx.async.newAsyncContext @@ -27,6 +27,7 @@ import org.junit.Assert.assertSame import org.junit.Assert.assertTrue import org.junit.BeforeClass import org.junit.Test +import org.mockito.kotlin.mock /** * Tests FreeType font loading utilities for [AssetStorage]. @@ -501,7 +502,7 @@ class AssetStorageFreeTypeTest : AsyncTest() { assertTrue(storage.isLoaded(otfFile)) assertSame(asset, storage.get(otfFile)) assertEquals(1, storage.getReferenceCount(otfFile)) - assertEquals(emptyList(), storage.getDependencies(otfFile)) + assertEquals(emptyList>(), storage.getDependencies(otfFile)) storage.dispose() } @@ -519,7 +520,7 @@ class AssetStorageFreeTypeTest : AsyncTest() { assertTrue(storage.isLoaded(ttfFile)) assertSame(asset, storage.get(ttfFile)) assertEquals(1, storage.getReferenceCount(ttfFile)) - assertEquals(emptyList(), storage.getDependencies(ttfFile)) + assertEquals(emptyList>(), storage.getDependencies(ttfFile)) storage.dispose() } @@ -606,7 +607,7 @@ class AssetStorageFreeTypeTest : AsyncTest() { assertFalse(it in storage) assertFalse(storage.isLoaded(it)) assertEquals(0, storage.getReferenceCount(it)) - assertEquals(emptyList(), storage.getDependencies(it)) + assertEquals(emptyList>(), storage.getDependencies(it)) shouldThrow { storage[it] } diff --git a/freetype/src/test/kotlin/ktx/freetype/FreeTypeTest.kt b/freetype/src/test/kotlin/ktx/freetype/FreeTypeTest.kt index 4465d4c3..c74bb456 100644 --- a/freetype/src/test/kotlin/ktx/freetype/FreeTypeTest.kt +++ b/freetype/src/test/kotlin/ktx/freetype/FreeTypeTest.kt @@ -9,7 +9,6 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGeneratorLoader import com.badlogic.gdx.graphics.g2d.freetype.FreetypeFontLoader -import com.nhaarman.mockitokotlin2.mock import org.junit.After import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse @@ -18,6 +17,7 @@ import org.junit.Assert.assertSame import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test +import org.mockito.kotlin.mock /** * Tests FreeType font loading utilities. diff --git a/gradle.properties b/gradle.properties index 662be83d..d3aa9fed 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ libGroup=io.github.libktx -kotlinVersion=1.8.22 +kotlinVersion=1.9.0 -dokkaVersion=1.8.10 +dokkaVersion=1.8.20 junitPlatformVersion=1.2.0 configurationsPluginVersion=3.0.3 diff --git a/graphics/src/test/kotlin/ktx/graphics/GraphicsTest.kt b/graphics/src/test/kotlin/ktx/graphics/GraphicsTest.kt index 3a35599a..73b6e6f7 100644 --- a/graphics/src/test/kotlin/ktx/graphics/GraphicsTest.kt +++ b/graphics/src/test/kotlin/ktx/graphics/GraphicsTest.kt @@ -8,15 +8,15 @@ import com.badlogic.gdx.graphics.g2d.Batch import com.badlogic.gdx.graphics.glutils.FrameBuffer import com.badlogic.gdx.graphics.glutils.ShaderProgram import com.badlogic.gdx.math.Matrix4 -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.spy -import com.nhaarman.mockitokotlin2.verify import org.junit.Assert.assertEquals import org.junit.Assert.assertSame import org.junit.Test +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.spy +import org.mockito.kotlin.verify import java.io.File /** diff --git a/graphics/src/test/kotlin/ktx/graphics/ShapeRendererTest.kt b/graphics/src/test/kotlin/ktx/graphics/ShapeRendererTest.kt index cec35f68..996e0c13 100644 --- a/graphics/src/test/kotlin/ktx/graphics/ShapeRendererTest.kt +++ b/graphics/src/test/kotlin/ktx/graphics/ShapeRendererTest.kt @@ -7,12 +7,12 @@ import com.badlogic.gdx.graphics.glutils.ShapeRenderer.ShapeType import com.badlogic.gdx.math.Matrix4 import com.badlogic.gdx.math.Vector2 import com.badlogic.gdx.math.Vector3 -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.verify import org.junit.Assert.assertEquals import org.junit.Assert.assertSame import org.junit.Test +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.verify class ShapeRendererTest { @Test diff --git a/graphics/src/test/kotlin/ktx/graphics/TextUtilitiesTest.kt b/graphics/src/test/kotlin/ktx/graphics/TextUtilitiesTest.kt index 17e8031f..503dbb29 100644 --- a/graphics/src/test/kotlin/ktx/graphics/TextUtilitiesTest.kt +++ b/graphics/src/test/kotlin/ktx/graphics/TextUtilitiesTest.kt @@ -3,11 +3,11 @@ package ktx.graphics import com.badlogic.gdx.Gdx import com.badlogic.gdx.backends.lwjgl.LwjglFiles import com.badlogic.gdx.graphics.g2d.BitmapFont -import com.nhaarman.mockitokotlin2.mock import org.junit.After import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test +import org.mockito.kotlin.mock import com.badlogic.gdx.utils.Array as GdxArray class TextUtilitiesTest { diff --git a/graphics/src/test/kotlin/ktx/graphics/cameraTest.kt b/graphics/src/test/kotlin/ktx/graphics/cameraTest.kt index f0ee6e75..890129ea 100644 --- a/graphics/src/test/kotlin/ktx/graphics/cameraTest.kt +++ b/graphics/src/test/kotlin/ktx/graphics/cameraTest.kt @@ -5,15 +5,15 @@ import com.badlogic.gdx.backends.lwjgl.LwjglNativesLoader import com.badlogic.gdx.graphics.OrthographicCamera import com.badlogic.gdx.math.Vector2 import com.badlogic.gdx.math.Vector3 -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.never -import com.nhaarman.mockitokotlin2.spy -import com.nhaarman.mockitokotlin2.times -import com.nhaarman.mockitokotlin2.verify import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.spy +import org.mockito.kotlin.times +import org.mockito.kotlin.verify class CameraUtilitiesTest { @Before diff --git a/inject/src/test/kotlin/ktx/inject/injectTest.kt b/inject/src/test/kotlin/ktx/inject/injectTest.kt index 9778d13a..41b8a4f2 100644 --- a/inject/src/test/kotlin/ktx/inject/injectTest.kt +++ b/inject/src/test/kotlin/ktx/inject/injectTest.kt @@ -4,12 +4,6 @@ import com.badlogic.gdx.Gdx import com.badlogic.gdx.utils.Disposable import com.badlogic.gdx.utils.GdxRuntimeException import com.badlogic.gdx.utils.reflect.ReflectionException -import com.nhaarman.mockitokotlin2.any -import com.nhaarman.mockitokotlin2.argThat -import com.nhaarman.mockitokotlin2.doThrow -import com.nhaarman.mockitokotlin2.eq -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify import io.kotlintest.matchers.shouldThrow import ktx.reflect.Reflection import org.junit.After @@ -21,6 +15,12 @@ import org.junit.Assert.assertNull import org.junit.Assert.assertSame import org.junit.Assert.assertTrue import org.junit.Test +import org.mockito.kotlin.any +import org.mockito.kotlin.argThat +import org.mockito.kotlin.doThrow +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify import java.util.Random /** diff --git a/json/src/test/kotlin/ktx/json/serializersTest.kt b/json/src/test/kotlin/ktx/json/serializersTest.kt index a66215e9..85f010a7 100644 --- a/json/src/test/kotlin/ktx/json/serializersTest.kt +++ b/json/src/test/kotlin/ktx/json/serializersTest.kt @@ -2,11 +2,11 @@ package ktx.json import com.badlogic.gdx.utils.Json import com.badlogic.gdx.utils.JsonValue -import com.nhaarman.mockitokotlin2.mock -import com.nhaarman.mockitokotlin2.verify import io.kotlintest.matchers.shouldEqual import io.kotlintest.matchers.shouldThrow import org.junit.Test +import org.mockito.kotlin.mock +import org.mockito.kotlin.verify /** * Guarantees that [write] method is optional to implement. diff --git a/scene2d/src/test/kotlin/ktx/scene2d/StageWidgetTest.kt b/scene2d/src/test/kotlin/ktx/scene2d/StageWidgetTest.kt index d15d487d..a80a40af 100644 --- a/scene2d/src/test/kotlin/ktx/scene2d/StageWidgetTest.kt +++ b/scene2d/src/test/kotlin/ktx/scene2d/StageWidgetTest.kt @@ -7,12 +7,12 @@ import com.badlogic.gdx.scenes.scene2d.ui.Dialog import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.Window -import com.nhaarman.mockitokotlin2.mock import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertSame import org.junit.Assert.assertTrue import org.junit.Test +import org.mockito.kotlin.mock class StageWidgetTest : ApplicationTest() { @Test diff --git a/scene2d/src/test/kotlin/ktx/scene2d/factoryTest.kt b/scene2d/src/test/kotlin/ktx/scene2d/factoryTest.kt index 32ab415f..01b7bd93 100644 --- a/scene2d/src/test/kotlin/ktx/scene2d/factoryTest.kt +++ b/scene2d/src/test/kotlin/ktx/scene2d/factoryTest.kt @@ -6,12 +6,12 @@ import com.badlogic.gdx.scenes.scene2d.ui.Cell import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.scenes.scene2d.ui.Tree.Node import com.kotcrab.vis.ui.VisUI -import com.nhaarman.mockitokotlin2.mock import org.junit.Assert import org.junit.Assert.assertEquals import org.junit.Assert.assertNotNull import org.junit.Assert.assertTrue import org.junit.Test +import org.mockito.kotlin.mock import com.badlogic.gdx.utils.Array as GdxArray /** diff --git a/scene2d/src/test/kotlin/ktx/scene2d/testUtilities.kt b/scene2d/src/test/kotlin/ktx/scene2d/testUtilities.kt index 723d40ce..2db08642 100644 --- a/scene2d/src/test/kotlin/ktx/scene2d/testUtilities.kt +++ b/scene2d/src/test/kotlin/ktx/scene2d/testUtilities.kt @@ -4,10 +4,10 @@ import com.badlogic.gdx.Gdx import com.badlogic.gdx.backends.lwjgl.LwjglFiles import com.badlogic.gdx.backends.lwjgl.LwjglNativesLoader import com.kotcrab.vis.ui.VisUI -import com.nhaarman.mockitokotlin2.mock import org.junit.AfterClass import org.junit.Before import org.junit.BeforeClass +import org.mockito.kotlin.mock /** * Utility value for numeric tests. diff --git a/vis-style/src/test/kotlin/ktx/style/VisStyleTest.kt b/vis-style/src/test/kotlin/ktx/style/VisStyleTest.kt index bff0f76f..66a69234 100644 --- a/vis-style/src/test/kotlin/ktx/style/VisStyleTest.kt +++ b/vis-style/src/test/kotlin/ktx/style/VisStyleTest.kt @@ -27,9 +27,9 @@ import com.kotcrab.vis.ui.widget.color.ColorPickerWidgetStyle import com.kotcrab.vis.ui.widget.spinner.Spinner.SpinnerStyle import com.kotcrab.vis.ui.widget.tabbedpane.TabbedPane.TabbedPaneStyle import com.kotcrab.vis.ui.widget.toast.Toast.ToastStyle -import com.nhaarman.mockitokotlin2.mock import org.junit.Assert.assertEquals import org.junit.Test +import org.mockito.kotlin.mock /** * Tests building utilities of VisUI widget styles. diff --git a/vis/src/test/kotlin/ktx/scene2d/vis/factoryTest.kt b/vis/src/test/kotlin/ktx/scene2d/vis/factoryTest.kt index f8316a72..9fc1a309 100644 --- a/vis/src/test/kotlin/ktx/scene2d/vis/factoryTest.kt +++ b/vis/src/test/kotlin/ktx/scene2d/vis/factoryTest.kt @@ -14,7 +14,6 @@ import com.kotcrab.vis.ui.widget.VisLabel import com.kotcrab.vis.ui.widget.VisWindow import com.kotcrab.vis.ui.widget.spinner.IntSpinnerModel import com.kotcrab.vis.ui.widget.toast.ToastTable -import com.nhaarman.mockitokotlin2.mock import ktx.scene2d.ApplicationTest import ktx.scene2d.KWidget import ktx.scene2d.TOLERANCE @@ -28,6 +27,7 @@ import org.junit.Assert.assertSame import org.junit.Assert.assertTrue import org.junit.Ignore import org.junit.Test +import org.mockito.kotlin.mock import com.badlogic.gdx.utils.Array as GdxArray class TopLevelActorFactoriesTest : ApplicationTest() {