From 0166b3bb81bc2a274da85e65b98cf5a39081d38e Mon Sep 17 00:00:00 2001 From: Ralf Gehrer <ralfgehrer@users.noreply.github.com> Date: Wed, 12 May 2021 12:24:20 +0200 Subject: [PATCH] Change default environment to WRU (EXPOSUREAPP-7213) (#3146) * Change default environment to WRU (EXPOSUREAPP-7213) * fix test * Improve default server env test. Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com> Co-authored-by: Mohamed <mohamed.metwalli@sap.com> --- Corona-Warn-App/build.gradle | 2 +- .../environment/BuildConfigWrapTest.kt | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Corona-Warn-App/build.gradle b/Corona-Warn-App/build.gradle index ae065c3f0..863839fac 100644 --- a/Corona-Warn-App/build.gradle +++ b/Corona-Warn-App/build.gradle @@ -127,7 +127,7 @@ android { applicationIdSuffix '.test' ext { - envTypeDefault = [debug: "INT", release: "WRU-XD"] + envTypeDefault = [debug: "INT", release: "WRU"] } if (signingPropFile.canRead()) { diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/environment/BuildConfigWrapTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/environment/BuildConfigWrapTest.kt index cded06c92..9d9acada7 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/environment/BuildConfigWrapTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/environment/BuildConfigWrapTest.kt @@ -1,13 +1,24 @@ package de.rki.coronawarnapp.environment -import io.kotest.matchers.collections.shouldBeIn +import de.rki.coronawarnapp.BuildConfig +import io.kotest.matchers.shouldBe import org.junit.jupiter.api.Test import testhelpers.BaseTest class BuildConfigWrapTest : BaseTest() { @Test - fun `default environment type should be DEV`() { - BuildConfigWrap.ENVIRONMENT_TYPE_DEFAULT shouldBeIn listOf("DEV", "INT", "WRU-XD", "PROD") + fun `default environment type `() { + if (BuildConfig.FLAVOR == "deviceForTesters" && BuildConfig.BUILD_TYPE == "debug") { + BuildConfigWrap.ENVIRONMENT_TYPE_DEFAULT shouldBe "INT" + } else if (BuildConfig.FLAVOR == "deviceForTesters" && BuildConfig.BUILD_TYPE == "release") { + BuildConfigWrap.ENVIRONMENT_TYPE_DEFAULT shouldBe "WRU" + } else if (BuildConfig.FLAVOR == "device" && BuildConfig.BUILD_TYPE == "debug") { + BuildConfigWrap.ENVIRONMENT_TYPE_DEFAULT shouldBe "INT" + } else if (BuildConfig.FLAVOR == "device" && BuildConfig.BUILD_TYPE == "release") { + BuildConfigWrap.ENVIRONMENT_TYPE_DEFAULT shouldBe "PROD" + } else { + throw IllegalStateException("Unknown flavor/build combination.") + } } } -- GitLab