Fix RegEx in FeatureFileOrchestrator to resolve file consent type

DataDog · Sep 27, 2023 · 8b5140f · 8b5140f
1 parent 2043399
commit 8b5140f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...in/com/datadog/android/core/internal/persistence/file/advanced/FeatureFileOrchestrator.kt b/...in/com/datadog/android/core/internal/persistence/file/advanced/FeatureFileOrchestrator.kt
@@ -64,7 +64,7 @@ internal class FeatureFileOrchestrator(
     )
 
     companion object {
-        private const val BASE_DIR_NAME_REG_EX = "([a-z]+[-|_])+"
+        private const val BASE_DIR_NAME_REG_EX = "([a-z]+-)+"
         internal val IS_GRANTED_DIR_REG_EX = Regex("${BASE_DIR_NAME_REG_EX}v[0-9]+")
         internal val IS_PENDING_DIR_REG_EX = Regex("${BASE_DIR_NAME_REG_EX}pending-v[0-9]+")
 

diff --git a/...e/src/test/kotlin/com/datadog/android/core/internal/metrics/BatchMetricsDispatcherTest.kt b/...e/src/test/kotlin/com/datadog/android/core/internal/metrics/BatchMetricsDispatcherTest.kt
@@ -608,13 +608,13 @@ internal class BatchMetricsDispatcherTest {
     }
 
     private fun Forge.forgeAGrantedDirName(): String {
-        val separator = if (aBool()) "_" else "-"
+        val separator = "-"
         return aList(anInt(min = 1, max = 10)) { anAlphabeticalString() }
             .joinToString(separator) + "-v" + aNumericalString()
     }
 
     private fun Forge.forgeAPendingDirName(): String {
-        val separator = if (aBool()) "_" else "-"
+        val separator = "-"
         return aList(anInt(min = 1, max = 10)) { anAlphabeticalString() }
             .joinToString(separator) + "-pending-v" + aNumericalString()
     }