meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Modularize some model classes (#3153)

Browse source
This commit is contained in:
Phil Oliver 2025-09-19 15:53:43 -04:00 • committed by GitHub
parent ab2fff219d
commit 8fb41aab74
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 215 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/androidTest/java/com/geeksville/mesh/ChannelTest.kt
View file

@ -18,14 +18,14 @@
package com.geeksville.mesh
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.geeksville.mesh.model.Channel
import com.geeksville.mesh.model.URL_PREFIX
import com.geeksville.mesh.model.getChannelUrl
import com.geeksville.mesh.model.numChannels
import com.geeksville.mesh.model.toChannelSet
import org.junit.Assert
import org.junit.Test
import org.junit.runner.RunWith
import org.meshtastic.core.model.Channel
import org.meshtastic.core.model.numChannels
@RunWith(AndroidJUnit4::class)
class ChannelTest {

55
app/src/androidTest/java/com/geeksville/mesh/compose/ScannedQrCodeDialogTest.kt
View file

@ -29,21 +29,19 @@ import com.geeksville.mesh.R
import com.geeksville.mesh.channelSet
import com.geeksville.mesh.channelSettings
import com.geeksville.mesh.copy
import com.geeksville.mesh.model.Channel
import com.geeksville.mesh.ui.common.components.ScannedQrCodeDialog
import org.junit.Assert
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.meshtastic.core.model.Channel
@RunWith(AndroidJUnit4::class)
class ScannedQrCodeDialogTest {
@get:Rule
val composeTestRule = createComposeRule()
@get:Rule val composeTestRule = createComposeRule()
private fun getString(id: Int): String =
InstrumentationRegistry.getInstrumentation().targetContext.getString(id)
private fun getString(id: Int): String = InstrumentationRegistry.getInstrumentation().targetContext.getString(id)
private fun getRandomKey() = Channel.getRandomKey()
@ -56,26 +54,28 @@ class ScannedQrCodeDialogTest {
settings.addAll(
listOf(
Channel.default.settings,
channelSettings { name = "2"; psk = getRandomKey() },
channelSettings { name = "3"; psk = getRandomKey() },
channelSettings { name = "admin"; psk = getRandomKey() },
)
channelSettings {
name = "2"
psk = getRandomKey()
},
channelSettings {
name = "3"
psk = getRandomKey()
},
channelSettings {
name = "admin"
psk = getRandomKey()
},
),
)
loraConfig = Channel.default.loraConfig
.copy { modemPreset = ConfigProtos.Config.LoRaConfig.ModemPreset.SHORT_FAST }
loraConfig =
Channel.default.loraConfig.copy { modemPreset = ConfigProtos.Config.LoRaConfig.ModemPreset.SHORT_FAST }
}
private fun testScannedQrCodeDialog(
onDismiss: () -> Unit = {},
onConfirm: (ChannelSet) -> Unit = {},
) = composeTestRule.setContent {
ScannedQrCodeDialog(
channels = channels,
incoming = incoming,
onDismiss = onDismiss,
onConfirm = onConfirm,
)
}
private fun testScannedQrCodeDialog(onDismiss: () -> Unit = {}, onConfirm: (ChannelSet) -> Unit = {}) =
composeTestRule.setContent {
ScannedQrCodeDialog(channels = channels, incoming = incoming, onDismiss = onDismiss, onConfirm = onConfirm)
}
@Test
fun testScannedQrCodeDialog_showsDialogTitle() {
@ -149,11 +149,12 @@ class ScannedQrCodeDialogTest {
}
// Verify onConfirm is called with the correct ChannelSet
val expectedChannelSet = channels.copy {
val list = LinkedHashSet(settings + incoming.settingsList)
settings.clear()
settings.addAll(list)
}
val expectedChannelSet =
channels.copy {
val list = LinkedHashSet(settings + incoming.settingsList)
settings.clear()
settings.addAll(list)
}
Assert.assertEquals(expectedChannelSet, actualChannelSet)
}
}