mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-02-09 15:23:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: replace MyNodeInfo with MyNodeEntity (#1277)

Browse Source
This commit is contained in:
Andre K
2024-10-02 06:18:30 -03:00
committed by GitHub
parent d89d4b7baa
commit c30ee2f55f
14 changed files with 550 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/androidTest/java/com/geeksville/mesh/NodeInfoDaoTest.kt
View File

@@ -5,6 +5,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import com.geeksville.mesh.database.MeshtasticDatabase
import com.geeksville.mesh.database.dao.NodeInfoDao
import com.geeksville.mesh.database.entity.MyNodeEntity
import com.geeksville.mesh.database.entity.NodeEntity
import com.geeksville.mesh.model.NodeSortOption
import kotlinx.coroutines.flow.first
@@ -35,9 +36,8 @@ class NodeInfoDaoTest {
latitude = 30.267153, longitude = -97.743057 // Austin
)
private val myNodeInfo: MyNodeInfo = MyNodeInfo(
private val myNodeInfo: MyNodeEntity = MyNodeEntity(
myNodeNum = ourNode.num,
hasGPS = false,
model = null,
firmwareVersion = null,
couldUpdate = false,
@@ -47,8 +47,6 @@ class NodeInfoDaoTest {
minAppVersion = 1,
maxChannels = 8,
hasWifi = false,
channelUtilization = 0f,
airUtilTx = 0f,
)
private val testPositions = arrayOf(

6
app/src/androidTest/java/com/geeksville/mesh/PacketDaoTest.kt
View File

@@ -6,6 +6,7 @@ import androidx.test.platform.app.InstrumentationRegistry
import com.geeksville.mesh.database.MeshtasticDatabase
import com.geeksville.mesh.database.dao.NodeInfoDao
import com.geeksville.mesh.database.dao.PacketDao
import com.geeksville.mesh.database.entity.MyNodeEntity
import com.geeksville.mesh.database.entity.Packet
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.runBlocking
@@ -22,9 +23,8 @@ class PacketDaoTest {
private lateinit var nodeInfoDao: NodeInfoDao
private lateinit var packetDao: PacketDao
private val myNodeInfo: MyNodeInfo = MyNodeInfo(
private val myNodeInfo: MyNodeEntity = MyNodeEntity(
myNodeNum = 42424242,
hasGPS = false,
model = null,
firmwareVersion = null,
couldUpdate = false,
@@ -34,8 +34,6 @@ class PacketDaoTest {
minAppVersion = 1,
maxChannels = 8,
hasWifi = false,
channelUtilization = 0f,
airUtilTx = 0f,
)
private val myNodeNum: Int get() = myNodeInfo.myNodeNum