Skip to content
Snippets Groups Projects
Unverified Commit 940efa1e authored by Kolya Opahle's avatar Kolya Opahle Committed by GitHub
Browse files

Merge pull request #1654 from corona-warn-app/fix/3456-wrong-default-appconfig-name

Fixed asset appconfig resolution for v2 config (EXPOSUREAPP-3456)
parents e46a5d8e c2b01a36
No related branches found
No related tags found
No related merge requests found
...@@ -11,6 +11,6 @@ class DefaultAppConfigSource @Inject constructor( ...@@ -11,6 +11,6 @@ class DefaultAppConfigSource @Inject constructor(
) { ) {
fun getRawDefaultConfig(): ByteArray { fun getRawDefaultConfig(): ByteArray {
return context.assets.open("default_app_config.bin").readBytes() return context.assets.open("default_app_config_android.bin").readBytes()
} }
} }
...@@ -19,8 +19,8 @@ class DefaultAppConfigSourceTest : BaseIOTest() { ...@@ -19,8 +19,8 @@ class DefaultAppConfigSourceTest : BaseIOTest() {
@MockK private lateinit var assetManager: AssetManager @MockK private lateinit var assetManager: AssetManager
private val testDir = File(IO_TEST_BASEDIR, this::class.java.simpleName) private val testDir = File(IO_TEST_BASEDIR, this::class.java.simpleName)
private val configFile = File(testDir, "default_app_config.bin") private val configFile = File(testDir, "default_app_config_android.bin")
private val checksumFile = File(testDir, "default_app_config.sha256") private val checksumFile = File(testDir, "default_app_config_android.sha256")
@BeforeEach @BeforeEach
fun setup() { fun setup() {
...@@ -28,8 +28,8 @@ class DefaultAppConfigSourceTest : BaseIOTest() { ...@@ -28,8 +28,8 @@ class DefaultAppConfigSourceTest : BaseIOTest() {
every { context.assets } returns assetManager every { context.assets } returns assetManager
every { assetManager.open("default_app_config.bin") } answers { configFile.inputStream() } every { assetManager.open("default_app_config_android.bin") } answers { configFile.inputStream() }
every { assetManager.open("default_app_config.sha256") } answers { checksumFile.inputStream() } every { assetManager.open("default_app_config_android.sha256") } answers { checksumFile.inputStream() }
testDir.mkdirs() testDir.mkdirs()
testDir.exists() shouldBe true testDir.exists() shouldBe true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment