From bae8753ef40000e5f66d6f630ac4d1cd994c26fe Mon Sep 17 00:00:00 2001 From: EpicDima Date: Fri, 3 Jan 2025 18:48:15 +0300 Subject: [PATCH] Change generic `assertFails` to `assertFailure` with specific exception --- .../kotlin/com/jakewharton/mosaic/assertk.kt | 9 +++++ .../mosaic/layout/AspectRatioTest.kt | 6 +-- .../jakewharton/mosaic/layout/OffsetTest.kt | 38 ++++++++++++------- .../jakewharton/mosaic/layout/PaddingTest.kt | 12 +++--- .../jakewharton/mosaic/ui/RowColumnTest.kt | 14 +++---- 5 files changed, 50 insertions(+), 29 deletions(-) create mode 100644 mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/assertk.kt diff --git a/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/assertk.kt b/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/assertk.kt new file mode 100644 index 000000000..cf1057115 --- /dev/null +++ b/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/assertk.kt @@ -0,0 +1,9 @@ +package com.jakewharton.mosaic + +import assertk.Assert +import assertk.assertFailure as originalAssertFailure +import assertk.assertions.isInstanceOf + +inline fun assertFailure(block: () -> Unit): Assert { + return originalAssertFailure(block).isInstanceOf() +} diff --git a/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/layout/AspectRatioTest.kt b/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/layout/AspectRatioTest.kt index af45e8199..7ca6c50df 100644 --- a/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/layout/AspectRatioTest.kt +++ b/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/layout/AspectRatioTest.kt @@ -5,6 +5,7 @@ import assertk.assertions.isEqualTo import com.jakewharton.mosaic.Container import com.jakewharton.mosaic.NodeSnapshots import com.jakewharton.mosaic.TestFiller +import com.jakewharton.mosaic.assertFailure import com.jakewharton.mosaic.modifier.Modifier import com.jakewharton.mosaic.runMosaicTest import com.jakewharton.mosaic.size @@ -13,18 +14,17 @@ import com.jakewharton.mosaic.ui.Layout import com.jakewharton.mosaic.ui.unit.Constraints import com.jakewharton.mosaic.ui.unit.IntSize import kotlin.test.Test -import kotlin.test.assertFails import kotlinx.coroutines.test.runTest class AspectRatioTest { @Test fun aspectRatioNegative() { - assertFails { + assertFailure { Modifier.aspectRatio(-2.0f) } } @Test fun aspectRatioZero() { - assertFails { + assertFailure { Modifier.aspectRatio(0.0f) } } diff --git a/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/layout/OffsetTest.kt b/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/layout/OffsetTest.kt index 06b928d0a..242ea308f 100644 --- a/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/layout/OffsetTest.kt +++ b/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/layout/OffsetTest.kt @@ -4,13 +4,13 @@ import assertk.assertThat import assertk.assertions.isEqualTo import com.jakewharton.mosaic.TestChar import com.jakewharton.mosaic.TestFiller +import com.jakewharton.mosaic.assertFailure import com.jakewharton.mosaic.modifier.Modifier import com.jakewharton.mosaic.runMosaicTest import com.jakewharton.mosaic.s import com.jakewharton.mosaic.ui.Box import com.jakewharton.mosaic.ui.unit.IntOffset import kotlin.test.Test -import kotlin.test.assertFails import kotlinx.coroutines.test.runTest class OffsetTest { @@ -41,7 +41,8 @@ class OffsetTest { TestFiller(modifier = Modifier.size(1)) } } - assertFails { + // check when going beyond the border of the TextSurface#get + assertFailure { awaitSnapshot() } } @@ -54,7 +55,8 @@ class OffsetTest { TestFiller(modifier = Modifier.size(1)) } } - assertFails { + // check when going beyond the border of the TextSurface#get + assertFailure { awaitSnapshot() } } @@ -87,7 +89,8 @@ class OffsetTest { TestFiller(modifier = Modifier.size(1)) } } - assertFails { + // check when going beyond the border of the TextSurface#get + assertFailure { awaitSnapshot() } } @@ -100,7 +103,8 @@ class OffsetTest { TestFiller(modifier = Modifier.size(1)) } } - assertFails { + // check when going beyond the border of the TextSurface#get + assertFailure { awaitSnapshot() } } @@ -133,7 +137,8 @@ class OffsetTest { TestFiller(modifier = Modifier.size(1)) } } - assertFails { + // check when going beyond the border of the TextSurface#get + assertFailure { awaitSnapshot() } } @@ -146,7 +151,8 @@ class OffsetTest { TestFiller(modifier = Modifier.size(1)) } } - assertFails { + // check when going beyond the border of the TextSurface#get + assertFailure { awaitSnapshot() } } @@ -184,7 +190,8 @@ class OffsetTest { TestFiller(modifier = Modifier.size(1)) } } - assertFails { + // check when going beyond the border of the TextSurface#get + assertFailure { awaitSnapshot() } } @@ -197,7 +204,8 @@ class OffsetTest { TestFiller(modifier = Modifier.size(1)) } } - assertFails { + // check when going beyond the border of the TextSurface#get + assertFailure { awaitSnapshot() } } @@ -230,7 +238,8 @@ class OffsetTest { TestFiller(modifier = Modifier.size(1)) } } - assertFails { + // check when going beyond the border of the TextSurface#get + assertFailure { awaitSnapshot() } } @@ -243,7 +252,8 @@ class OffsetTest { TestFiller(modifier = Modifier.size(1)) } } - assertFails { + // check when going beyond the border of the TextSurface#get + assertFailure { awaitSnapshot() } } @@ -276,7 +286,8 @@ class OffsetTest { TestFiller(modifier = Modifier.size(1)) } } - assertFails { + // check when going beyond the border of the TextSurface#get + assertFailure { awaitSnapshot() } } @@ -289,7 +300,8 @@ class OffsetTest { TestFiller(modifier = Modifier.size(1)) } } - assertFails { + // check when going beyond the border of the TextSurface#get + assertFailure { awaitSnapshot() } } diff --git a/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/layout/PaddingTest.kt b/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/layout/PaddingTest.kt index 3ef8951aa..69cf73605 100644 --- a/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/layout/PaddingTest.kt +++ b/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/layout/PaddingTest.kt @@ -6,6 +6,7 @@ import assertk.assertions.isEqualTo import com.jakewharton.mosaic.Container import com.jakewharton.mosaic.TestChar import com.jakewharton.mosaic.TestFiller +import com.jakewharton.mosaic.assertFailure import com.jakewharton.mosaic.modifier.Modifier import com.jakewharton.mosaic.runMosaicTest import com.jakewharton.mosaic.s @@ -13,7 +14,6 @@ import com.jakewharton.mosaic.testIntrinsics import com.jakewharton.mosaic.ui.Layout import com.jakewharton.mosaic.ui.unit.Constraints import kotlin.test.Test -import kotlin.test.assertFails import kotlinx.coroutines.test.runTest class PaddingTest { @@ -28,7 +28,7 @@ class PaddingTest { } @Test fun paddingLeftNegative() { - assertFails { + assertFailure { Modifier.padding(left = -2) } } @@ -65,7 +65,7 @@ class PaddingTest { } @Test fun paddingTopNegative() { - assertFails { + assertFailure { Modifier.padding(top = -2) } } @@ -104,7 +104,7 @@ class PaddingTest { } @Test fun paddingRightNegative() { - assertFails { + assertFailure { Modifier.padding(right = -2) } } @@ -141,7 +141,7 @@ class PaddingTest { } @Test fun paddingBottomNegative() { - assertFails { + assertFailure { Modifier.padding(bottom = -2) } } @@ -180,7 +180,7 @@ class PaddingTest { } @Test fun paddingLeftBottomNegative() { - assertFails { + assertFailure { Modifier.padding(left = -1, bottom = -2) } } diff --git a/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/ui/RowColumnTest.kt b/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/ui/RowColumnTest.kt index df6817253..66d3a8115 100644 --- a/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/ui/RowColumnTest.kt +++ b/mosaic-runtime/src/commonTest/kotlin/com/jakewharton/mosaic/ui/RowColumnTest.kt @@ -8,6 +8,7 @@ import com.jakewharton.mosaic.ConstrainedBox import com.jakewharton.mosaic.Container import com.jakewharton.mosaic.Holder import com.jakewharton.mosaic.NodeSnapshots +import com.jakewharton.mosaic.assertFailure import com.jakewharton.mosaic.layout.aspectRatio import com.jakewharton.mosaic.layout.fillMaxHeight import com.jakewharton.mosaic.layout.fillMaxWidth @@ -30,7 +31,6 @@ import com.jakewharton.mosaic.ui.unit.IntOffset import com.jakewharton.mosaic.ui.unit.IntSize import kotlin.math.min import kotlin.test.Test -import kotlin.test.assertFails import kotlinx.coroutines.test.runTest class RowColumnTest { @@ -182,13 +182,13 @@ class RowColumnTest { @Test fun testRow_invalidWeight() { with(RowScopeInstance) { - assertFails { + assertFailure { Modifier.weight(-1.0f) } - assertFails { + assertFailure { Modifier.weight(Float.NaN) } - assertFails { + assertFailure { Modifier.weight(Float.NEGATIVE_INFINITY) } } @@ -341,13 +341,13 @@ class RowColumnTest { @Test fun testColumn_invalidWeight() { with(ColumnScopeInstance) { - assertFails { + assertFailure { Modifier.weight(-1.0f) } - assertFails { + assertFailure { Modifier.weight(Float.NaN) } - assertFails { + assertFailure { Modifier.weight(Float.NEGATIVE_INFINITY) } }