Skip to content

Commit 38ec058

Browse files
Formatting
1 parent 053c7da commit 38ec058

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import kotlinx.coroutines.flow.filter
1616
import kotlinx.coroutines.flow.first
1717
import kotlinx.coroutines.launch
1818
import kotlinx.coroutines.runBlocking
19-
import net.mullvad.mullvadvpn.lib.common.constant.BuildTypes
2019
import net.mullvad.mullvadvpn.lib.common.constant.GRPC_SOCKET_FILE_NAMED_ARGUMENT
2120
import net.mullvad.mullvadvpn.lib.common.constant.KEY_CONNECT_ACTION
2221
import net.mullvad.mullvadvpn.lib.common.constant.KEY_DISCONNECT_ACTION

android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/extension/UiAutomatorExtensions.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import androidx.test.uiautomator.By
55
import androidx.test.uiautomator.BySelector
66
import androidx.test.uiautomator.UiDevice
77
import androidx.test.uiautomator.UiObject2
8-
import androidx.test.uiautomator.UiObjectNotFoundException
98
import androidx.test.uiautomator.Until
109
import java.util.regex.Pattern
1110
import net.mullvad.mullvadvpn.test.common.constant.DEFAULT_INTERACTION_TIMEOUT
@@ -27,9 +26,7 @@ fun UiDevice.findObjectWithTimeout(
2726

2827
val foundObject = findObject(selector)
2928

30-
require(foundObject != null) {
31-
"No matches for selector within timeout ($timeout): $selector"
32-
}
29+
require(foundObject != null) { "No matches for selector within timeout ($timeout): $selector" }
3330

3431
return foundObject
3532
}

android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/ConnectionTest.kt

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import net.mullvad.mullvadvpn.test.e2e.misc.AccountTestRule
99
import net.mullvad.mullvadvpn.test.e2e.misc.ConnCheckState
1010
import net.mullvad.mullvadvpn.test.e2e.misc.SimpleMullvadHttpClient
1111
import org.junit.jupiter.api.Assertions.assertEquals
12-
import org.junit.jupiter.api.Disabled
1312
import org.junit.jupiter.api.Test
1413
import org.junit.jupiter.api.extension.RegisterExtension
1514

android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/annotations/HighlyRateLimited.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ annotation class HighlyRateLimited {
2626

2727
if (ignoreHighlyRateLimited) {
2828
return ConditionEvaluationResult.disabled(
29-
"Skipping test because this run is configured to skip tests that are highly affected by rate limiting")
29+
"Skipping test highly affected by rate limiting."
30+
)
3031
} else {
3132
return ConditionEvaluationResult.enabled(
32-
"Running test highly affected by rate limiting")
33+
"Running test highly affected by rate limiting."
34+
)
3335
}
3436
}
3537
}

0 commit comments

Comments
 (0)