Skip to content

Commit cb67697

Browse files
authored
Two quick helpers for testing statics (#634)
Not great, but better than we have.
1 parent e19b1a2 commit cb67697

File tree

6 files changed

+28
-2
lines changed

6 files changed

+28
-2
lines changed

mosaic-runtime/api/mosaic-runtime.api

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ public abstract interface class com/jakewharton/mosaic/Mosaic {
44
public abstract fun dump ()Ljava/lang/String;
55
public abstract fun getTerminalState ()Landroidx/compose/runtime/MutableState;
66
public abstract fun paint ()Lcom/jakewharton/mosaic/TextCanvas;
7+
public fun paintStatics ()Ljava/util/List;
78
public abstract fun paintStaticsTo (Landroidx/collection/MutableObjectList;)V
89
public abstract fun sendKeyEvent (Lcom/jakewharton/mosaic/layout/KeyEvent;)V
910
public abstract fun setContent (Lkotlin/jvm/functions/Function2;)V

mosaic-runtime/api/mosaic-runtime.klib.api

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ abstract interface com.jakewharton.mosaic/Mosaic { // com.jakewharton.mosaic/Mos
207207
abstract fun sendKeyEvent(com.jakewharton.mosaic.layout/KeyEvent) // com.jakewharton.mosaic/Mosaic.sendKeyEvent|sendKeyEvent(com.jakewharton.mosaic.layout.KeyEvent){}[0]
208208
abstract fun setContent(kotlin/Function2<androidx.compose.runtime/Composer, kotlin/Int, kotlin/Unit>) // com.jakewharton.mosaic/Mosaic.setContent|setContent(kotlin.Function2<androidx.compose.runtime.Composer,kotlin.Int,kotlin.Unit>){}[0]
209209
abstract suspend fun awaitComplete() // com.jakewharton.mosaic/Mosaic.awaitComplete|awaitComplete(){}[0]
210+
open fun paintStatics(): kotlin.collections/List<com.jakewharton.mosaic/TextCanvas> // com.jakewharton.mosaic/Mosaic.paintStatics|paintStatics(){}[0]
210211
}
211212

212213
abstract interface com.jakewharton.mosaic/TextCanvas { // com.jakewharton.mosaic/TextCanvas|null[0]

mosaic-runtime/src/commonMain/kotlin/com/jakewharton/mosaic/mosaic.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.jakewharton.mosaic
22

33
import androidx.collection.MutableObjectList
4+
import androidx.collection.mutableObjectListOf
45
import androidx.collection.mutableScatterSetOf
56
import androidx.compose.runtime.AbstractApplier
67
import androidx.compose.runtime.BroadcastFrameClock
@@ -163,6 +164,12 @@ public interface Mosaic {
163164

164165
public fun paint(): TextCanvas
165166
public fun paintStaticsTo(list: MutableObjectList<TextCanvas>)
167+
public fun paintStatics(): List<TextCanvas> {
168+
return mutableObjectListOf<TextCanvas>()
169+
.apply(::paintStaticsTo)
170+
.asList()
171+
}
172+
166173
public fun dump(): String
167174

168175
public suspend fun awaitComplete()

mosaic-testing/api/mosaic-testing.api

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
public final class com/jakewharton/mosaic/testing/MosaicSnapshots : com/jakewharton/mosaic/testing/SnapshotStrategy {
2+
public static final field $stable I
3+
public static final field INSTANCE Lcom/jakewharton/mosaic/testing/MosaicSnapshots;
4+
public fun create (Lcom/jakewharton/mosaic/Mosaic;)Lcom/jakewharton/mosaic/Mosaic;
5+
public synthetic fun create (Lcom/jakewharton/mosaic/Mosaic;)Ljava/lang/Object;
6+
}
7+
18
public abstract interface class com/jakewharton/mosaic/testing/SnapshotStrategy {
29
public abstract fun create (Lcom/jakewharton/mosaic/Mosaic;)Ljava/lang/Object;
310
}

mosaic-testing/api/mosaic-testing.klib.api

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,14 @@ abstract interface <#A: kotlin/Any?> com.jakewharton.mosaic.testing/TestMosaic :
1414
abstract suspend fun awaitSnapshot(kotlin.time/Duration = ...): #A // com.jakewharton.mosaic.testing/TestMosaic.awaitSnapshot|awaitSnapshot(kotlin.time.Duration){}[0]
1515
}
1616

17+
final object com.jakewharton.mosaic.testing/MosaicSnapshots : com.jakewharton.mosaic.testing/SnapshotStrategy<com.jakewharton.mosaic/Mosaic> { // com.jakewharton.mosaic.testing/MosaicSnapshots|null[0]
18+
final fun create(com.jakewharton.mosaic/Mosaic): com.jakewharton.mosaic/Mosaic // com.jakewharton.mosaic.testing/MosaicSnapshots.create|create(com.jakewharton.mosaic.Mosaic){}[0]
19+
}
20+
21+
final val com.jakewharton.mosaic.testing/com_jakewharton_mosaic_testing_MosaicSnapshots$stableprop // com.jakewharton.mosaic.testing/com_jakewharton_mosaic_testing_MosaicSnapshots$stableprop|#static{}com_jakewharton_mosaic_testing_MosaicSnapshots$stableprop[0]
1722
final val com.jakewharton.mosaic.testing/com_jakewharton_mosaic_testing_PlainTextSnapshots$stableprop // com.jakewharton.mosaic.testing/com_jakewharton_mosaic_testing_PlainTextSnapshots$stableprop|#static{}com_jakewharton_mosaic_testing_PlainTextSnapshots$stableprop[0]
1823

24+
final fun com.jakewharton.mosaic.testing/com_jakewharton_mosaic_testing_MosaicSnapshots$stableprop_getter(): kotlin/Int // com.jakewharton.mosaic.testing/com_jakewharton_mosaic_testing_MosaicSnapshots$stableprop_getter|com_jakewharton_mosaic_testing_MosaicSnapshots$stableprop_getter(){}[0]
1925
final fun com.jakewharton.mosaic.testing/com_jakewharton_mosaic_testing_PlainTextSnapshots$stableprop_getter(): kotlin/Int // com.jakewharton.mosaic.testing/com_jakewharton_mosaic_testing_PlainTextSnapshots$stableprop_getter|com_jakewharton_mosaic_testing_PlainTextSnapshots$stableprop_getter(){}[0]
2026
final suspend fun <#A: kotlin/Any?, #B: kotlin/Any?> com.jakewharton.mosaic.testing/runMosaicTest(com.jakewharton.mosaic.testing/SnapshotStrategy<#A>, kotlin.coroutines/SuspendFunction1<com.jakewharton.mosaic.testing/TestMosaic<#A>, #B>): #B // com.jakewharton.mosaic.testing/runMosaicTest|runMosaicTest(com.jakewharton.mosaic.testing.SnapshotStrategy<0:0>;kotlin.coroutines.SuspendFunction1<com.jakewharton.mosaic.testing.TestMosaic<0:0>,0:1>){0§<kotlin.Any?>;1§<kotlin.Any?>}[0]
2127
final suspend fun com.jakewharton.mosaic.testing/runMosaicTest(kotlin.coroutines/SuspendFunction1<com.jakewharton.mosaic.testing/TestMosaic<kotlin/String>, kotlin/Unit>) // com.jakewharton.mosaic.testing/runMosaicTest|runMosaicTest(kotlin.coroutines.SuspendFunction1<com.jakewharton.mosaic.testing.TestMosaic<kotlin.String>,kotlin.Unit>){}[0]

mosaic-testing/src/commonMain/kotlin/com/jakewharton/mosaic/testing/TestMosaic.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,16 @@ import kotlinx.coroutines.currentCoroutineContext
1414
import kotlinx.coroutines.delay
1515
import kotlinx.coroutines.withTimeout
1616

17+
public suspend fun runMosaicTest(block: suspend TestMosaic<String>.() -> Unit) {
18+
runMosaicTest(PlainTextSnapshots, block)
19+
}
20+
1721
public fun interface SnapshotStrategy<T> {
1822
public fun create(mosaic: Mosaic): T
1923
}
2024

21-
public suspend fun runMosaicTest(block: suspend TestMosaic<String>.() -> Unit) {
22-
runMosaicTest(PlainTextSnapshots, block)
25+
public object MosaicSnapshots : SnapshotStrategy<Mosaic> {
26+
override fun create(mosaic: Mosaic): Mosaic = mosaic
2327
}
2428

2529
public suspend fun <T, R> runMosaicTest(

0 commit comments

Comments
 (0)