mirror of
https://github.com/praktimarc/kst4contest.git
synced 2026-10-26 16:15:51 +01:00
Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c23982c339 | ||
|
|
834f4b131a | ||
|
|
1868f21c06 | ||
|
|
9d433f9ba4 | ||
|
|
f4f046c04f | ||
|
|
8fc3b9f424 |
No files matched your search
+38
-36
@@ -55,45 +55,47 @@ class CompactControlsVisualRenderingTest(@param:TempDir private val tempDir: Pat
|
|||||||
}
|
}
|
||||||
val filters = StationFilterState()
|
val filters = StationFilterState()
|
||||||
|
|
||||||
val scene = ImageComposeScene(width = 1366, height = 380, density = Density(scale)) {
|
return onEventThread {
|
||||||
Kst4ContestTheme(darkMode = darkMode, baseFontSizeSp = 12f) {
|
val scene = ImageComposeScene(width = 1366, height = 380, density = Density(scale)) {
|
||||||
Surface(
|
Kst4ContestTheme(darkMode = darkMode, baseFontSizeSp = 12f) {
|
||||||
modifier = Modifier.fillMaxSize(),
|
Surface(
|
||||||
color = MaterialTheme.colorScheme.background,
|
modifier = Modifier.fillMaxSize(),
|
||||||
) {
|
color = MaterialTheme.colorScheme.background,
|
||||||
Column(Modifier.padding(4.dp)) {
|
) {
|
||||||
TimelineView(
|
Column(Modifier.padding(4.dp)) {
|
||||||
state = TimelineState(),
|
TimelineView(
|
||||||
onCandidateClicked = {},
|
state = TimelineState(),
|
||||||
modifier = Modifier.fillMaxWidth(),
|
onCandidateClicked = {},
|
||||||
)
|
modifier = Modifier.fillMaxWidth(),
|
||||||
Spacer(Modifier.height(8.dp))
|
)
|
||||||
StationFilterBar(
|
Spacer(Modifier.height(8.dp))
|
||||||
filters = filters,
|
StationFilterBar(
|
||||||
activeBands = EnumSet.of(Band.B_144, Band.B_432, Band.B_1296),
|
filters = filters,
|
||||||
reachability = ReachabilityState(
|
activeBands = EnumSet.of(Band.B_144, Band.B_432, Band.B_1296),
|
||||||
EnumSet.of(Band.B_144, Band.B_432, Band.B_1296),
|
reachability = ReachabilityState(
|
||||||
),
|
EnumSet.of(Band.B_144, Band.B_432, Band.B_1296),
|
||||||
onChanged = {},
|
),
|
||||||
)
|
onChanged = {},
|
||||||
Spacer(Modifier.height(12.dp))
|
)
|
||||||
ChatInputRow(
|
Spacer(Modifier.height(12.dp))
|
||||||
state = chatInputState,
|
ChatInputRow(
|
||||||
prefs = preferences,
|
state = chatInputState,
|
||||||
ownQrgMain = ObservedValue(preferences.getMYQRGFirstCat()),
|
prefs = preferences,
|
||||||
ownQrgSecond = ObservedValue(preferences.getMYQRGSecondCat()),
|
ownQrgMain = ObservedValue(preferences.getMYQRGFirstCat()),
|
||||||
antennaQtf = ObservedValue(preferences.getActualQTF()),
|
ownQrgSecond = ObservedValue(preferences.getMYQRGSecondCat()),
|
||||||
antennaQtf2 = ObservedValue(preferences.getActualQTF2()),
|
antennaQtf = ObservedValue(preferences.getActualQTF()),
|
||||||
so2rEnabled = false,
|
antennaQtf2 = ObservedValue(preferences.getActualQTF2()),
|
||||||
)
|
so2rEnabled = false,
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
try {
|
||||||
return try {
|
scene.render().encodeToData()!!.bytes
|
||||||
scene.render().encodeToData()!!.bytes
|
} finally {
|
||||||
} finally {
|
scene.close()
|
||||||
scene.close()
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package kst4contest.view.compose
|
||||||
|
|
||||||
|
import java.awt.EventQueue
|
||||||
|
import java.lang.reflect.InvocationTargetException
|
||||||
|
|
||||||
|
/*
|
||||||
|
* An ImageComposeScene must live on the AWT event thread, the thread the application renders
|
||||||
|
* on. Compose Multiplatform 1.8.2 sends the global snapshot notifications there
|
||||||
|
* (GlobalSnapshotManager), and doing so takes two locks in the opposite order from a render
|
||||||
|
* on any other thread:
|
||||||
|
*
|
||||||
|
* - the render holds the scene's FlushCoroutineDispatcher runLock while a task it runs
|
||||||
|
* (here LazyListState.scrollToItem) measures and wants the SnapshotStateObserver's
|
||||||
|
* observedScopeMapsLock;
|
||||||
|
* - the event thread holds observedScopeMapsLock in drainChanges while a derived state it
|
||||||
|
* re-reads wakes a snapshotFlow collector of that scene, whose dispatch wants runLock.
|
||||||
|
*
|
||||||
|
* Both waited forever in CI runs 40252077018, 40252089738 and 40299943329; the thread dump of
|
||||||
|
* the last one shows both stacks. On one thread the two monitors are simply re-entered, which
|
||||||
|
* is why the application never hangs this way.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Runs [block] on the AWT event thread, waits for it and returns its result. Whatever
|
||||||
|
* [block] throws is rethrown here unwrapped, so a failed assertion still reads as one.
|
||||||
|
*/
|
||||||
|
internal fun <T> onEventThread(block: () -> T): T {
|
||||||
|
if (EventQueue.isDispatchThread()) return block()
|
||||||
|
|
||||||
|
var result: Result<T>? = null
|
||||||
|
try {
|
||||||
|
EventQueue.invokeAndWait { result = runCatching(block) }
|
||||||
|
} catch (wrapped: InvocationTargetException) {
|
||||||
|
throw wrapped.cause ?: wrapped
|
||||||
|
}
|
||||||
|
return result!!.getOrThrow()
|
||||||
|
}
|
||||||
+29
-27
@@ -84,37 +84,39 @@ class SelectedStationMessageUiVisualRenderingTest {
|
|||||||
replaceRows(listOf(message(member("DL1ABC", 2), member("DL2XYZ", 2), "pse sked")))
|
replaceRows(listOf(message(member("DL1ABC", 2), member("DL2XYZ", 2), "pse sked")))
|
||||||
}
|
}
|
||||||
|
|
||||||
val scene = ImageComposeScene(width = 1366, height = windowHeight, density = Density(scale)) {
|
return onEventThread {
|
||||||
Kst4ContestTheme(darkMode = darkMode, baseFontSizeSp = 12f) {
|
val scene = ImageComposeScene(width = 1366, height = windowHeight, density = Density(scale)) {
|
||||||
Surface(
|
Kst4ContestTheme(darkMode = darkMode, baseFontSizeSp = 12f) {
|
||||||
modifier = Modifier.fillMaxSize(),
|
Surface(
|
||||||
color = MaterialTheme.colorScheme.background,
|
modifier = Modifier.fillMaxSize(),
|
||||||
) {
|
color = MaterialTheme.colorScheme.background,
|
||||||
Row(Modifier.fillMaxSize().padding(6.dp)) {
|
) {
|
||||||
MessageTabs(
|
Row(Modifier.fillMaxSize().padding(6.dp)) {
|
||||||
publicMessages = publicMessages,
|
MessageTabs(
|
||||||
clusterMessages = clusterTable(),
|
publicMessages = publicMessages,
|
||||||
qsoOfTheOther = qsoMessages,
|
clusterMessages = clusterTable(),
|
||||||
modifier = Modifier.weight(1f),
|
qsoOfTheOther = qsoMessages,
|
||||||
)
|
modifier = Modifier.weight(1f),
|
||||||
SelectedStationPanel(
|
)
|
||||||
state = selectedState,
|
SelectedStationPanel(
|
||||||
messages = selectedMessages,
|
state = selectedState,
|
||||||
activeBands = EnumSet.of(Band.B_144, Band.B_432, Band.B_1296),
|
messages = selectedMessages,
|
||||||
openInBrowser = Consumer {},
|
activeBands = EnumSet.of(Band.B_144, Band.B_432, Band.B_1296),
|
||||||
onShowOnMap = {},
|
openInBrowser = Consumer {},
|
||||||
onShowPathInAirScout = {},
|
onShowOnMap = {},
|
||||||
modifier = Modifier.width(panelWidth).padding(start = 6.dp),
|
onShowPathInAirScout = {},
|
||||||
)
|
modifier = Modifier.width(panelWidth).padding(start = 6.dp),
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return try {
|
try {
|
||||||
scene.render().encodeToData()!!.bytes
|
scene.render().encodeToData()!!.bytes
|
||||||
} finally {
|
} finally {
|
||||||
scene.close()
|
scene.close()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+53
-51
@@ -87,62 +87,64 @@ class StationWorkspaceVisualRenderingTest {
|
|||||||
RowKeys.byReference<ChatMessage>(),
|
RowKeys.byReference<ChatMessage>(),
|
||||||
)
|
)
|
||||||
|
|
||||||
val scene = ImageComposeScene(
|
return onEventThread {
|
||||||
width = 1366,
|
val scene = ImageComposeScene(
|
||||||
height = scenario.height,
|
width = 1366,
|
||||||
density = Density(scale),
|
height = scenario.height,
|
||||||
) {
|
density = Density(scale),
|
||||||
Kst4ContestTheme(darkMode = darkMode, baseFontSizeSp = 12f) {
|
) {
|
||||||
Surface(
|
Kst4ContestTheme(darkMode = darkMode, baseFontSizeSp = 12f) {
|
||||||
modifier = Modifier.fillMaxSize(),
|
Surface(
|
||||||
color = MaterialTheme.colorScheme.background,
|
modifier = Modifier.fillMaxSize(),
|
||||||
) {
|
color = MaterialTheme.colorScheme.background,
|
||||||
Box(Modifier.fillMaxSize()) {
|
|
||||||
Column(
|
|
||||||
Modifier
|
|
||||||
.width(scenario.width.dp)
|
|
||||||
.fillMaxHeight()
|
|
||||||
.align(Alignment.TopEnd)
|
|
||||||
.padding(4.dp),
|
|
||||||
) {
|
) {
|
||||||
StationFilterBar(
|
Box(Modifier.fillMaxSize()) {
|
||||||
filters = StationFilterState(),
|
Column(
|
||||||
activeBands = EnumSet.of(Band.B_144, Band.B_432),
|
Modifier
|
||||||
reachability = ReachabilityState(EnumSet.of(Band.B_144, Band.B_432)),
|
.width(scenario.width.dp)
|
||||||
onChanged = {},
|
.fillMaxHeight()
|
||||||
)
|
.align(Alignment.TopEnd)
|
||||||
DataTableView(
|
.padding(4.dp),
|
||||||
state = stations,
|
) {
|
||||||
modifier = Modifier.weight(0.45f),
|
StationFilterBar(
|
||||||
emphasizeCell = { member, column ->
|
filters = StationFilterState(),
|
||||||
column.id == "callsign" && newJoined.isRecent(member)
|
activeBands = EnumSet.of(Band.B_144, Band.B_432),
|
||||||
},
|
reachability = ReachabilityState(EnumSet.of(Band.B_144, Band.B_432)),
|
||||||
)
|
onChanged = {},
|
||||||
TopPriorityBar(
|
)
|
||||||
state = priority,
|
DataTableView(
|
||||||
newJoined = newJoined,
|
state = stations,
|
||||||
onShowMore = {},
|
modifier = Modifier.weight(0.45f),
|
||||||
)
|
emphasizeCell = { member, column ->
|
||||||
SelectedStationPanel(
|
column.id == "callsign" && newJoined.isRecent(member)
|
||||||
state = selected,
|
},
|
||||||
messages = selectedMessages,
|
)
|
||||||
activeBands = EnumSet.of(Band.B_144, Band.B_432),
|
TopPriorityBar(
|
||||||
contentSplitter = SplitterState(2, doubleArrayOf(0.48)) {},
|
state = priority,
|
||||||
openInBrowser = Consumer {},
|
newJoined = newJoined,
|
||||||
onShowOnMap = {},
|
onShowMore = {},
|
||||||
onShowPathInAirScout = {},
|
)
|
||||||
modifier = Modifier.weight(0.55f),
|
SelectedStationPanel(
|
||||||
)
|
state = selected,
|
||||||
}
|
messages = selectedMessages,
|
||||||
|
activeBands = EnumSet.of(Band.B_144, Band.B_432),
|
||||||
|
contentSplitter = SplitterState(2, doubleArrayOf(0.48)) {},
|
||||||
|
openInBrowser = Consumer {},
|
||||||
|
onShowOnMap = {},
|
||||||
|
onShowPathInAirScout = {},
|
||||||
|
modifier = Modifier.weight(0.55f),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return try {
|
try {
|
||||||
scene.render().encodeToData()!!.bytes
|
scene.render().encodeToData()!!.bytes
|
||||||
} finally {
|
} finally {
|
||||||
scene.close()
|
scene.close()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+21
-17
@@ -32,17 +32,19 @@ class TopPriorityCandidatesWindowTest {
|
|||||||
/** Runs [block] against a rendered list of [twoCandidates] and reports what it picked. */
|
/** Runs [block] against a rendered list of [twoCandidates] and reports what it picked. */
|
||||||
private fun picking(block: (ImageComposeScene) -> Unit): String? {
|
private fun picking(block: (ImageComposeScene) -> Unit): String? {
|
||||||
var picked: String? = null
|
var picked: String? = null
|
||||||
val scene = ImageComposeScene(width = 360, height = 500, density = Density(1f)) {
|
onEventThread {
|
||||||
TopPriorityCandidatesWindow.CandidateListForTest(twoCandidates) {
|
val scene = ImageComposeScene(width = 360, height = 500, density = Density(1f)) {
|
||||||
picked = it.displayCallSign
|
TopPriorityCandidatesWindow.CandidateListForTest(twoCandidates) {
|
||||||
|
picked = it.displayCallSign
|
||||||
|
}
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
scene.render()
|
||||||
|
block(scene)
|
||||||
|
scene.render()
|
||||||
|
} finally {
|
||||||
|
scene.close()
|
||||||
}
|
}
|
||||||
}
|
|
||||||
try {
|
|
||||||
scene.render()
|
|
||||||
block(scene)
|
|
||||||
scene.render()
|
|
||||||
} finally {
|
|
||||||
scene.close()
|
|
||||||
}
|
}
|
||||||
return picked
|
return picked
|
||||||
}
|
}
|
||||||
@@ -78,13 +80,15 @@ class TopPriorityCandidatesWindowTest {
|
|||||||
@Test
|
@Test
|
||||||
fun `the list renders with candidates and without`() {
|
fun `the list renders with candidates and without`() {
|
||||||
listOf(emptyList(), twoCandidates).forEach { ranking ->
|
listOf(emptyList(), twoCandidates).forEach { ranking ->
|
||||||
val scene = ImageComposeScene(width = 360, height = 500, density = Density(1f)) {
|
onEventThread {
|
||||||
TopPriorityCandidatesWindow.CandidateListForTest(ranking) { }
|
val scene = ImageComposeScene(width = 360, height = 500, density = Density(1f)) {
|
||||||
}
|
TopPriorityCandidatesWindow.CandidateListForTest(ranking) { }
|
||||||
try {
|
}
|
||||||
scene.render()
|
try {
|
||||||
} finally {
|
scene.render()
|
||||||
scene.close()
|
} finally {
|
||||||
|
scene.close()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+24
-21
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.fillMaxSize
|
|||||||
import androidx.compose.ui.ImageComposeScene
|
import androidx.compose.ui.ImageComposeScene
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.unit.Density
|
import androidx.compose.ui.unit.Density
|
||||||
|
import kst4contest.view.compose.onEventThread
|
||||||
import kst4contest.view.map.MapCallsignRawSnapshot
|
import kst4contest.view.map.MapCallsignRawSnapshot
|
||||||
import kst4contest.view.map.MapViewport
|
import kst4contest.view.map.MapViewport
|
||||||
import kst4contest.view.map.TileFetcher
|
import kst4contest.view.map.TileFetcher
|
||||||
@@ -71,27 +72,29 @@ class ComposeStationMapDrawingTest {
|
|||||||
workedGrossFields: Set<String> = emptySet(),
|
workedGrossFields: Set<String> = emptySet(),
|
||||||
darkMode: Boolean = true,
|
darkMode: Boolean = true,
|
||||||
): BufferedImage {
|
): BufferedImage {
|
||||||
val scene = ImageComposeScene(canvasWidth, canvasHeight, Density(1f)) {
|
return onEventThread {
|
||||||
ComposeStationMap(
|
val scene = ImageComposeScene(canvasWidth, canvasHeight, Density(1f)) {
|
||||||
markers = markers,
|
ComposeStationMap(
|
||||||
tileFetcher = offlineTileFetcher,
|
markers = markers,
|
||||||
mapState = MapState(zoom = zoom, centerLon = 10.0, centerLat = 51.0),
|
tileFetcher = offlineTileFetcher,
|
||||||
groupingEnabled = false,
|
mapState = MapState(zoom = zoom, centerLon = 10.0, centerLat = 51.0),
|
||||||
selectedMarkerCallsign = null,
|
groupingEnabled = false,
|
||||||
ownLocator6 = ownLocator6,
|
selectedMarkerCallsign = null,
|
||||||
antennaAzimuthDeg = 90.0,
|
ownLocator6 = ownLocator6,
|
||||||
antennaBeamWidthDeg = 0.0,
|
antennaAzimuthDeg = 90.0,
|
||||||
maxQrbKm = 0.0,
|
antennaBeamWidthDeg = 0.0,
|
||||||
onMarkerClicked = null,
|
maxQrbKm = 0.0,
|
||||||
workedGrossFields = workedGrossFields,
|
onMarkerClicked = null,
|
||||||
darkMode = darkMode,
|
workedGrossFields = workedGrossFields,
|
||||||
modifier = Modifier.fillMaxSize(),
|
darkMode = darkMode,
|
||||||
)
|
modifier = Modifier.fillMaxSize(),
|
||||||
}
|
)
|
||||||
try {
|
}
|
||||||
return ImageIO.read(ByteArrayInputStream(scene.render().encodeToData()!!.bytes))
|
try {
|
||||||
} finally {
|
ImageIO.read(ByteArrayInputStream(scene.render().encodeToData()!!.bytes))
|
||||||
scene.close()
|
} finally {
|
||||||
|
scene.close()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+27
-24
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.fillMaxSize
|
|||||||
import androidx.compose.ui.ImageComposeScene
|
import androidx.compose.ui.ImageComposeScene
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.unit.Density
|
import androidx.compose.ui.unit.Density
|
||||||
|
import kst4contest.view.compose.onEventThread
|
||||||
import kst4contest.view.map.MapCallsignRawSnapshot
|
import kst4contest.view.map.MapCallsignRawSnapshot
|
||||||
import kst4contest.view.map.TileFetcher
|
import kst4contest.view.map.TileFetcher
|
||||||
import org.junit.jupiter.api.Test
|
import org.junit.jupiter.api.Test
|
||||||
@@ -33,30 +34,32 @@ class ComposeStationMapLayoutTest {
|
|||||||
)
|
)
|
||||||
|
|
||||||
private fun renderAt(widthPx: Int, heightPx: Int, zoom: Float) {
|
private fun renderAt(widthPx: Int, heightPx: Int, zoom: Float) {
|
||||||
val scene = ImageComposeScene(
|
onEventThread {
|
||||||
width = widthPx,
|
val scene = ImageComposeScene(
|
||||||
height = heightPx,
|
width = widthPx,
|
||||||
density = Density(1f),
|
height = heightPx,
|
||||||
) {
|
density = Density(1f),
|
||||||
ComposeStationMap(
|
) {
|
||||||
markers = stations,
|
ComposeStationMap(
|
||||||
tileFetcher = TileFetcher(),
|
markers = stations,
|
||||||
mapState = MapState(zoom = zoom, centerLon = 10.0, centerLat = 51.0),
|
tileFetcher = TileFetcher(),
|
||||||
groupingEnabled = true,
|
mapState = MapState(zoom = zoom, centerLon = 10.0, centerLat = 51.0),
|
||||||
selectedMarkerCallsign = "F5JMI",
|
groupingEnabled = true,
|
||||||
ownLocator6 = "JO50JP",
|
selectedMarkerCallsign = "F5JMI",
|
||||||
antennaAzimuthDeg = 229.0,
|
ownLocator6 = "JO50JP",
|
||||||
antennaBeamWidthDeg = 60.0,
|
antennaAzimuthDeg = 229.0,
|
||||||
maxQrbKm = 800.0,
|
antennaBeamWidthDeg = 60.0,
|
||||||
onMarkerClicked = null,
|
maxQrbKm = 800.0,
|
||||||
darkMode = true,
|
onMarkerClicked = null,
|
||||||
modifier = Modifier.fillMaxSize(),
|
darkMode = true,
|
||||||
)
|
modifier = Modifier.fillMaxSize(),
|
||||||
}
|
)
|
||||||
try {
|
}
|
||||||
scene.render()
|
try {
|
||||||
} finally {
|
scene.render()
|
||||||
scene.close()
|
} finally {
|
||||||
|
scene.close()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+18
-15
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
|
|||||||
import androidx.compose.ui.ImageComposeScene
|
import androidx.compose.ui.ImageComposeScene
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.unit.Density
|
import androidx.compose.ui.unit.Density
|
||||||
|
import kst4contest.view.compose.onEventThread
|
||||||
import kst4contest.view.map.PathAnalysisResult
|
import kst4contest.view.map.PathAnalysisResult
|
||||||
import org.junit.jupiter.api.Test
|
import org.junit.jupiter.api.Test
|
||||||
|
|
||||||
@@ -25,21 +26,23 @@ class PathAnalysisDetailsLayoutTest {
|
|||||||
private val narrowWidthPx = 120
|
private val narrowWidthPx = 120
|
||||||
|
|
||||||
private fun renderAt(widthPx: Int, result: PathAnalysisResult?) {
|
private fun renderAt(widthPx: Int, result: PathAnalysisResult?) {
|
||||||
val scene = ImageComposeScene(
|
onEventThread {
|
||||||
width = widthPx,
|
val scene = ImageComposeScene(
|
||||||
height = 600,
|
width = widthPx,
|
||||||
density = Density(1f),
|
height = 600,
|
||||||
) {
|
density = Density(1f),
|
||||||
PathAnalysisDetails(
|
) {
|
||||||
result = result,
|
PathAnalysisDetails(
|
||||||
darkMode = true,
|
result = result,
|
||||||
modifier = Modifier.fillMaxWidth(),
|
darkMode = true,
|
||||||
)
|
modifier = Modifier.fillMaxWidth(),
|
||||||
}
|
)
|
||||||
try {
|
}
|
||||||
scene.render()
|
try {
|
||||||
} finally {
|
scene.render()
|
||||||
scene.close()
|
} finally {
|
||||||
|
scene.close()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+15
-12
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
|
|||||||
import androidx.compose.ui.ImageComposeScene
|
import androidx.compose.ui.ImageComposeScene
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.unit.Density
|
import androidx.compose.ui.unit.Density
|
||||||
|
import kst4contest.view.compose.onEventThread
|
||||||
import kst4contest.view.map.PathAnalysisResult
|
import kst4contest.view.map.PathAnalysisResult
|
||||||
import org.junit.jupiter.api.Assertions.assertTrue
|
import org.junit.jupiter.api.Assertions.assertTrue
|
||||||
import org.junit.jupiter.api.Test
|
import org.junit.jupiter.api.Test
|
||||||
@@ -31,18 +32,20 @@ class PathAnalysisDetailsWidthTest {
|
|||||||
private val assessmentBackground = 0x33383E
|
private val assessmentBackground = 0x33383E
|
||||||
|
|
||||||
private fun render(paneWidthPx: Int, heightPx: Int = 600): BufferedImage {
|
private fun render(paneWidthPx: Int, heightPx: Int = 600): BufferedImage {
|
||||||
val scene = ImageComposeScene(width = paneWidthPx, height = heightPx, density = Density(1f)) {
|
return onEventThread {
|
||||||
PathAnalysisDetails(
|
val scene = ImageComposeScene(width = paneWidthPx, height = heightPx, density = Density(1f)) {
|
||||||
result = PathAnalysisResult.loading("JO50JP", "JN24JB", "F5JMI"),
|
PathAnalysisDetails(
|
||||||
darkMode = true,
|
result = PathAnalysisResult.loading("JO50JP", "JN24JB", "F5JMI"),
|
||||||
modifier = Modifier.fillMaxWidth(),
|
darkMode = true,
|
||||||
)
|
modifier = Modifier.fillMaxWidth(),
|
||||||
}
|
)
|
||||||
try {
|
}
|
||||||
val png = scene.render().encodeToData()!!.bytes
|
try {
|
||||||
return ImageIO.read(ByteArrayInputStream(png))
|
val png = scene.render().encodeToData()!!.bytes
|
||||||
} finally {
|
ImageIO.read(ByteArrayInputStream(png))
|
||||||
scene.close()
|
} finally {
|
||||||
|
scene.close()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+14
-11
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.fillMaxSize
|
|||||||
import androidx.compose.ui.ImageComposeScene
|
import androidx.compose.ui.ImageComposeScene
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.unit.Density
|
import androidx.compose.ui.unit.Density
|
||||||
|
import kst4contest.view.compose.onEventThread
|
||||||
import org.junit.jupiter.api.Test
|
import org.junit.jupiter.api.Test
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -18,17 +19,19 @@ import org.junit.jupiter.api.Test
|
|||||||
class PathProfileChartLayoutTest {
|
class PathProfileChartLayoutTest {
|
||||||
|
|
||||||
private fun renderAt(widthPx: Int, heightPx: Int) {
|
private fun renderAt(widthPx: Int, heightPx: Int) {
|
||||||
val scene = ImageComposeScene(
|
onEventThread {
|
||||||
width = widthPx,
|
val scene = ImageComposeScene(
|
||||||
height = heightPx,
|
width = widthPx,
|
||||||
density = Density(1f),
|
height = heightPx,
|
||||||
) {
|
density = Density(1f),
|
||||||
PathProfileChart(modifier = Modifier.fillMaxSize(), darkMode = true)
|
) {
|
||||||
}
|
PathProfileChart(modifier = Modifier.fillMaxSize(), darkMode = true)
|
||||||
try {
|
}
|
||||||
scene.render()
|
try {
|
||||||
} finally {
|
scene.render()
|
||||||
scene.close()
|
} finally {
|
||||||
|
scene.close()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+10
-7
@@ -15,6 +15,7 @@ import androidx.compose.ui.unit.dp
|
|||||||
import kst4contest.view.compose.SplitterOrientation
|
import kst4contest.view.compose.SplitterOrientation
|
||||||
import kst4contest.view.compose.SplitterPane
|
import kst4contest.view.compose.SplitterPane
|
||||||
import kst4contest.view.compose.SplitterState
|
import kst4contest.view.compose.SplitterState
|
||||||
|
import kst4contest.view.compose.onEventThread
|
||||||
import kst4contest.view.map.MapCallsignRawSnapshot
|
import kst4contest.view.map.MapCallsignRawSnapshot
|
||||||
import kst4contest.view.map.PathAnalysisResult
|
import kst4contest.view.map.PathAnalysisResult
|
||||||
import kst4contest.view.map.TileFetcher
|
import kst4contest.view.map.TileFetcher
|
||||||
@@ -88,13 +89,15 @@ class StationMapBodyLayoutTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun renderAt(widthPx: Int, heightPx: Int, pathAnalysisVisible: Boolean = true) {
|
private fun renderAt(widthPx: Int, heightPx: Int, pathAnalysisVisible: Boolean = true) {
|
||||||
val scene = ImageComposeScene(width = widthPx, height = heightPx, density = Density(1f)) {
|
onEventThread {
|
||||||
Body(pathAnalysisVisible)
|
val scene = ImageComposeScene(width = widthPx, height = heightPx, density = Density(1f)) {
|
||||||
}
|
Body(pathAnalysisVisible)
|
||||||
try {
|
}
|
||||||
scene.render()
|
try {
|
||||||
} finally {
|
scene.render()
|
||||||
scene.close()
|
} finally {
|
||||||
|
scene.close()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -151,6 +151,13 @@ subprojects {
|
|||||||
*/
|
*/
|
||||||
systemProperty("junit.jupiter.execution.timeout.default", "2m")
|
systemProperty("junit.jupiter.execution.timeout.default", "2m")
|
||||||
systemProperty("junit.jupiter.execution.timeout.thread.mode.default", "SEPARATE_THREAD")
|
systemProperty("junit.jupiter.execution.timeout.thread.mode.default", "SEPARATE_THREAD")
|
||||||
|
/*
|
||||||
|
* The timed-out thread's stack shows where a test waits, not who it waits for: the
|
||||||
|
* rare CI hang in SelectedStationMessageUiVisualRenderingTest blocks on a monitor
|
||||||
|
* that another thread holds. On a timeout JUnit prints all threads to the test's
|
||||||
|
* standard output, which lands in its XML report (the test-results artifact).
|
||||||
|
*/
|
||||||
|
systemProperty("junit.jupiter.execution.timeout.threaddump.enabled", "true")
|
||||||
// The default short format prints only the first frame of each cause, which for a
|
// The default short format prints only the first frame of each cause, which for a
|
||||||
// timed-out test is the line it hung in but not the call that blocked there.
|
// timed-out test is the line it hung in but not the call that blocked there.
|
||||||
testLogging {
|
testLogging {
|
||||||
|
|||||||
Generated
+19
-19
@@ -7,15 +7,15 @@
|
|||||||
"": {
|
"": {
|
||||||
"name": "kst4contest-website",
|
"name": "kst4contest-website",
|
||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"engines": {
|
|
||||||
"node": ">=18.19.1"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"markdown-it": "^14.3.0",
|
"markdown-it": "^14.3.3",
|
||||||
"markdown-it-anchor": "^9.2.0"
|
"markdown-it-anchor": "^9.2.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@11ty/eleventy": "^3.0.0"
|
"@11ty/eleventy": "^3.0.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=18.19.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@11ty/dependency-tree": {
|
"node_modules/@11ty/dependency-tree": {
|
||||||
@@ -397,9 +397,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/brace-expansion": {
|
"node_modules/brace-expansion": {
|
||||||
"version": "1.1.15",
|
"version": "1.1.21",
|
||||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz",
|
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz",
|
||||||
"integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==",
|
"integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -831,9 +831,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/gray-matter/node_modules/js-yaml": {
|
"node_modules/gray-matter/node_modules/js-yaml": {
|
||||||
"version": "3.15.0",
|
"version": "3.15.2",
|
||||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.15.0.tgz",
|
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.15.2.tgz",
|
||||||
"integrity": "sha512-ttBQIIQPDeLjpPOohtUdXuXUVoA2uIB6fEH9HyJ7234s5mBJ5wTx20njxplLZQgLaOfpmPQA7X2t5AX6tIPbog==",
|
"integrity": "sha512-6EuL879VkRA+1Cz578mKMiKvjPNEuk6+r1JaFzoSWejZmtf7xWbIyw1e3KkxlkzTIt9Taw6JBhEppG7utc1P+w==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -1026,9 +1026,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/js-yaml": {
|
"node_modules/js-yaml": {
|
||||||
"version": "4.3.0",
|
"version": "4.3.2",
|
||||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.2.tgz",
|
||||||
"integrity": "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==",
|
"integrity": "sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -1098,9 +1098,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/liquidjs": {
|
"node_modules/liquidjs": {
|
||||||
"version": "10.27.1",
|
"version": "10.30.0",
|
||||||
"resolved": "https://registry.npmjs.org/liquidjs/-/liquidjs-10.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/liquidjs/-/liquidjs-10.30.0.tgz",
|
||||||
"integrity": "sha512-ylE+1q2kSef1UxAyxqbyuWM3FRWS1v48JK1Y3CoW3bD6TSNXZh0+GsVnihujEpKyR+Jejx2aRAFfC3AHm9rElg==",
|
"integrity": "sha512-Fw4wA+8CZsJkaeLEIlPE3AoponfjEZhj7FQvYNcAEcg7jNRik7mEMoaco382FBdrYlykVf6w4vClPNctz2OYjg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -1136,9 +1136,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/markdown-it": {
|
"node_modules/markdown-it": {
|
||||||
"version": "14.3.0",
|
"version": "14.3.3",
|
||||||
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.3.3.tgz",
|
||||||
"integrity": "sha512-RCEsPjR+sr0x+AuYp601tKTkgFG4YEPLCzHST3cQ/fhlJkqAkz1L2/Qbp1j9qw5SBwQHFBoW8+hoN5xssOF0Tw==",
|
"integrity": "sha512-L//tDAkjTjJCU6pBUSBTgs3Kg4InVaZuUZog/b6V12UKhcDQ7S78877ibbCanRExwPuYP1CZD7Gd2dxSy1GXRg==",
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
"type": "github",
|
"type": "github",
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
"@11ty/eleventy": "^3.0.0"
|
"@11ty/eleventy": "^3.0.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"markdown-it": "^14.3.0",
|
"markdown-it": "^14.3.3",
|
||||||
"markdown-it-anchor": "^9.2.0"
|
"markdown-it-anchor": "^9.2.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user