fix tests

streetcomplete · May 23, 2024 · 27af094 · 27af094
1 parent 875a4fe
commit 27af094
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/surface/SurfaceUtils.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/surface/SurfaceUtils.kt
@@ -58,8 +58,10 @@ fun isSurfaceAndTracktypeConflicting(surface: String, tracktype: String?): Boole
  INVALID_SURFACES_FOR_TRACKTYPES[tracktype]?.contains(surface) == true
 
 private val EXPECTED_SURFACES_FOR_TRACKTYPES = mapOf(
- "grade1" to PAVED_SURFACES + setOf("stone", "rock", "ice"), // natural solid surfaces are fine too
- "grade2" to UNPAVED_SURFACES + PAVED_SURFACES - SOFT_TRACK_SURFACES, // could be basically anything except soft surfaces
+ // natural solid surfaces are fine too
+ "grade1" to PAVED_SURFACES + setOf("stone", "rock", "ice"),
+ // anything not soft or not fully paved
+ "grade2" to UNPAVED_SURFACES + PAVED_SURFACES - SOFT_TRACK_SURFACES - FULLY_PAVED_SURFACES,
  "grade3" to UNPAVED_SURFACES,
  "grade4" to UNPAVED_SURFACES,
  "grade5" to SOFT_TRACK_SURFACES,

diff --git a/app/src/test/java/de/westnordost/streetcomplete/osm/surface/SurfaceUtilsKtTest.kt b/app/src/test/java/de/westnordost/streetcomplete/osm/surface/SurfaceUtilsKtTest.kt
@@ -16,8 +16,8 @@ class SurfaceUtilsKtTest {
  }
 
  @Test fun `high quality tracktype conflicts with poor surface`() {
- assertTrue(isSurfaceAndTracktypeConflicting("gravel", "grade1"))
- assertTrue(isSurfaceAndTracktypeCombinationSuspicious("gravel", "grade1"))
+ assertTrue(isSurfaceAndTracktypeConflicting("earth", "grade1"))
+ assertTrue(isSurfaceAndTracktypeCombinationSuspicious("earth", "grade1"))
  }
 
  @Test fun `high quality tracktype fits good surface`() {