Skip to content

Commit 5ac969d

Browse files
committed
Improve unit tests
1 parent 3138e21 commit 5ac969d

File tree

2 files changed

+74
-28
lines changed

2 files changed

+74
-28
lines changed

openmapview/src/test/kotlin/de/afarber/openmapview/BitmapDescriptorFactoryTest.kt

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,44 @@ import org.robolectric.RobolectricTestRunner
1818
@RunWith(RobolectricTestRunner::class)
1919
class BitmapDescriptorFactoryTest {
2020
@Test
21-
fun testHueConstants() {
22-
// Verify all HUE constants have expected values
23-
assertEquals(0f, BitmapDescriptorFactory.HUE_RED, 0.001f)
24-
assertEquals(30f, BitmapDescriptorFactory.HUE_ORANGE, 0.001f)
25-
assertEquals(60f, BitmapDescriptorFactory.HUE_YELLOW, 0.001f)
26-
assertEquals(120f, BitmapDescriptorFactory.HUE_GREEN, 0.001f)
27-
assertEquals(180f, BitmapDescriptorFactory.HUE_CYAN, 0.001f)
28-
assertEquals(210f, BitmapDescriptorFactory.HUE_AZURE, 0.001f)
29-
assertEquals(240f, BitmapDescriptorFactory.HUE_BLUE, 0.001f)
30-
assertEquals(270f, BitmapDescriptorFactory.HUE_VIOLET, 0.001f)
31-
assertEquals(300f, BitmapDescriptorFactory.HUE_MAGENTA, 0.001f)
32-
assertEquals(330f, BitmapDescriptorFactory.HUE_ROSE, 0.001f)
21+
fun testHueConstantsAreInValidRange() {
22+
val hues =
23+
listOf(
24+
BitmapDescriptorFactory.HUE_RED,
25+
BitmapDescriptorFactory.HUE_ORANGE,
26+
BitmapDescriptorFactory.HUE_YELLOW,
27+
BitmapDescriptorFactory.HUE_GREEN,
28+
BitmapDescriptorFactory.HUE_CYAN,
29+
BitmapDescriptorFactory.HUE_AZURE,
30+
BitmapDescriptorFactory.HUE_BLUE,
31+
BitmapDescriptorFactory.HUE_VIOLET,
32+
BitmapDescriptorFactory.HUE_MAGENTA,
33+
BitmapDescriptorFactory.HUE_ROSE,
34+
)
35+
hues.forEach { hue ->
36+
assertTrue("Hue $hue must be in 0-360 range", hue in 0f..360f)
37+
}
3338
}
3439

40+
@Test
41+
fun testHueConstantsAreUnique() {
42+
val hues =
43+
setOf(
44+
BitmapDescriptorFactory.HUE_RED,
45+
BitmapDescriptorFactory.HUE_ORANGE,
46+
BitmapDescriptorFactory.HUE_YELLOW,
47+
BitmapDescriptorFactory.HUE_GREEN,
48+
BitmapDescriptorFactory.HUE_CYAN,
49+
BitmapDescriptorFactory.HUE_AZURE,
50+
BitmapDescriptorFactory.HUE_BLUE,
51+
BitmapDescriptorFactory.HUE_VIOLET,
52+
BitmapDescriptorFactory.HUE_MAGENTA,
53+
BitmapDescriptorFactory.HUE_ROSE,
54+
)
55+
assertEquals(10, hues.size)
56+
}
57+
58+
3559
@Test
3660
fun testDefaultMarker_Red() {
3761
val descriptor = BitmapDescriptorFactory.defaultMarker()

openmapview/src/test/kotlin/de/afarber/openmapview/MapTypeTest.kt

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,44 @@ class MapTypeTest {
2929
}
3030

3131
@Test
32-
fun testMapTypeConstants() {
33-
assertEquals(0, MapType.NONE)
34-
assertEquals(1, MapType.STANDARD)
35-
assertEquals(2, MapType.CYCLOSM)
36-
assertEquals(3, MapType.CYCLEMAP)
37-
assertEquals(4, MapType.TRANSPORT)
38-
assertEquals(5, MapType.TRANSPORT_DARK)
39-
assertEquals(6, MapType.TRACESTRACK_TOPO)
40-
assertEquals(7, MapType.HUMANITARIAN)
41-
assertEquals(8, MapType.OPNVKARTE)
42-
assertEquals(9, MapType.OPENTOPOMAP)
43-
assertEquals(10, MapType.CARTO_LIGHT)
44-
assertEquals(11, MapType.CARTO_DARK)
45-
assertEquals(12, MapType.CARTO_VOYAGER)
46-
assertEquals(13, MapType.STAMEN_TONER)
47-
assertEquals(14, MapType.STAMEN_WATERCOLOR)
32+
fun testMapTypeConstantsAreUnique() {
33+
val values =
34+
setOf(
35+
MapType.NONE,
36+
MapType.STANDARD,
37+
MapType.CYCLOSM,
38+
MapType.CYCLEMAP,
39+
MapType.TRANSPORT,
40+
MapType.TRANSPORT_DARK,
41+
MapType.TRACESTRACK_TOPO,
42+
MapType.HUMANITARIAN,
43+
MapType.OPNVKARTE,
44+
MapType.OPENTOPOMAP,
45+
MapType.CARTO_LIGHT,
46+
MapType.CARTO_DARK,
47+
MapType.CARTO_VOYAGER,
48+
MapType.STAMEN_TONER,
49+
MapType.STAMEN_WATERCOLOR,
50+
)
51+
assertEquals(15, values.size)
52+
}
53+
54+
55+
@Test
56+
fun testAllMapTypesHaveTileSource() {
57+
for (type in 0..14) {
58+
val source = TileSource.fromMapType(type)
59+
assertNotNull(source)
60+
}
61+
}
62+
63+
@Test
64+
fun testAllMapTypesHaveDisplayName() {
65+
for (type in 0..14) {
66+
val name = TileSource.getMapTypeName(type)
67+
assertNotNull(name)
68+
assert(name != "Unknown")
69+
}
4870
}
4971

5072
@Test

0 commit comments

Comments
 (0)