From 9a8f169e8601e9409268077bb5321a4e4b3218d6 Mon Sep 17 00:00:00 2001 From: andrekir Date: Sat, 8 Jul 2023 07:24:00 -0300 Subject: [PATCH] test: update distanceStrGood() --- .../java/com/geeksville/mesh/NodeInfoTest.kt | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/app/src/test/java/com/geeksville/mesh/NodeInfoTest.kt b/app/src/test/java/com/geeksville/mesh/NodeInfoTest.kt index 58264ba50..f7a361740 100644 --- a/app/src/test/java/com/geeksville/mesh/NodeInfoTest.kt +++ b/app/src/test/java/com/geeksville/mesh/NodeInfoTest.kt @@ -1,6 +1,7 @@ package com.geeksville.mesh import androidx.core.os.LocaleListCompat +import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig.DisplayUnits import org.junit.After import org.junit.Assert import org.junit.Before @@ -8,16 +9,19 @@ import org.junit.Test import java.util.* class NodeInfoTest { - val model = MeshProtos.HardwareModel.ANDROID_SIM - val ni1 = NodeInfo(4, MeshUser("+one", "User One", "U1", model), Position(37.1, 121.1, 35)) - val ni2 = NodeInfo(5, MeshUser("+two", "User Two", "U2", model), Position(37.11, 121.1, 40)) - val ni3 = NodeInfo(6, MeshUser("+three", "User Three", "U3", model), Position(37.101, 121.1, 40)) + private val model = MeshProtos.HardwareModel.ANDROID_SIM + private val node = listOf( + NodeInfo(4, MeshUser("+zero", "User Zero", "U0", model)), + NodeInfo(5, MeshUser("+one", "User One", "U1", model), Position(37.1, 121.1, 35)), + NodeInfo(6, MeshUser("+two", "User Two", "U2", model), Position(37.11, 121.1, 40)), + NodeInfo(7, MeshUser("+three", "User Three", "U3", model), Position(37.101, 121.1, 40)), + NodeInfo(8, MeshUser("+four", "User Four", "U4", model), Position(37.116, 121.1, 40)), + ) private val currentDefaultLocale = LocaleListCompat.getDefault().get(0) ?: Locale.US @Before - fun setup() - { + fun setup() { Locale.setDefault(Locale.US) } @@ -28,13 +32,16 @@ class NodeInfoTest { @Test fun distanceGood() { - Assert.assertEquals(ni1.distance(ni2), 1111) - Assert.assertEquals(ni1.distance(ni3), 111) + Assert.assertEquals(node[1].distance(node[2]), 1111) + Assert.assertEquals(node[1].distance(node[3]), 111) + Assert.assertEquals(node[1].distance(node[4]), 1777) } @Test fun distanceStrGood() { - Assert.assertEquals(ni1.distanceStr(ni2, ConfigProtos.Config.DisplayConfig.DisplayUnits.METRIC_VALUE), "1.1 km") - Assert.assertEquals(ni1.distanceStr(ni3, ConfigProtos.Config.DisplayConfig.DisplayUnits.METRIC_VALUE), "111 m") + Assert.assertEquals(node[1].distanceStr(node[2], DisplayUnits.METRIC_VALUE), "1.1 km") + Assert.assertEquals(node[1].distanceStr(node[3], DisplayUnits.METRIC_VALUE), "111 m") + Assert.assertEquals(node[1].distanceStr(node[4], DisplayUnits.IMPERIAL_VALUE), "1.1 mi") + Assert.assertEquals(node[1].distanceStr(node[3], DisplayUnits.IMPERIAL_VALUE), "364 ft") } }