diff options
| author | Albin <albin@mullvad.net> | 2024-03-12 08:05:42 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-03-12 08:05:42 +0100 |
| commit | 2df44a8aaa1c4673d666941a2fa3aa6afc2bfa37 (patch) | |
| tree | 8c4cc3f0a99310eaf58585a91f686efe69c0cb49 /android/test | |
| parent | 1c6d12ffbc5584044e2d2f1bd9056a00f4654384 (diff) | |
| parent | 10d01230b4043fc76149efc3b49ff70a234bbee3 (diff) | |
| download | mullvadvpn-2df44a8aaa1c4673d666941a2fa3aa6afc2bfa37.tar.xz mullvadvpn-2df44a8aaa1c4673d666941a2fa3aa6afc2bfa37.zip | |
Merge branch 'bump-android-dependencies'
Diffstat (limited to 'android/test')
4 files changed, 11 insertions, 3 deletions
diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTest.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTest.kt index e1162e11d3..1732fb48d6 100644 --- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTest.kt +++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTest.kt @@ -12,6 +12,6 @@ class DataClassTest { Konsist.scopeFromProject() .classes(includeNested = true) .withDataModifier() - .properties(includeNested = false, includeLocal = false) + .properties(includeNested = false) .assertFalse { it.hasVarModifier } } diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/ValueClassTest.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/ValueClassTest.kt index 2b45d44816..737a639b60 100644 --- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/ValueClassTest.kt +++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/ValueClassTest.kt @@ -9,7 +9,7 @@ class ValueClassTest { @Test fun `ensure value classes property is named value`() { Konsist.scopeFromProject().classes(includeNested = true).withValueModifier().assertTrue { - it.properties(includeNested = false, includeLocal = false).firstOrNull { property -> + it.properties(includeNested = false).firstOrNull { property -> property.name == "value" } != null } diff --git a/android/test/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts index 7d9a78cda6..161e73b510 100644 --- a/android/test/e2e/build.gradle.kts +++ b/android/test/e2e/build.gradle.kts @@ -33,7 +33,7 @@ android { fun MutableMap<String, String>.addOptionalPropertyAsArgument(name: String) { val value = rootProject.properties.getOrDefault(name, null) as? String - ?: gradleLocalProperties(rootProject.projectDir).getProperty(name) + ?: gradleLocalProperties(rootProject.projectDir, providers).getProperty(name) if (value != null) { put(name, value) diff --git a/android/test/test-suppression.xml b/android/test/test-suppression.xml index f92e67c0db..5932bda92e 100644 --- a/android/test/test-suppression.xml +++ b/android/test/test-suppression.xml @@ -110,4 +110,12 @@ <packageUrl regex="true">^pkg:maven/com\.squareup\.okhttp3/.*@.*$</packageUrl> <cve>CVE-2023-3782</cve> </suppress> + <suppress until="2024-09-01Z"> + <notes><![CDATA[ + False-positive related to Drupal rather than Android development. + https://nvd.nist.gov/vuln/detail/CVE-2014-9152 + ]]></notes> + <packageUrl regex="true">^pkg:maven/androidx\.test\.services/storage@.*$</packageUrl> + <cve>CVE-2014-9152</cve> + </suppress> </suppressions> |