Implement sentence naming of tests

6 files changed, 193 insertions, 181 deletions

diff --git a/android/lib/billing/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepositoryTest.kt b/android/lib/billing/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepositoryTest.kt
index 386932681d..7ca3219cfb 100644
--- a/android/lib/billing/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepositoryTest.kt
+++ b/android/lib/billing/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepositoryTest.kt
@@ -52,7 +52,7 @@ class BillingRepositoryTest {
         CapturingSlot()
 
     @BeforeEach
-    fun setUp() {
+    fun setup() {
         mockkStatic(BILLING_CLIENT_CLASS)
         mockkStatic(BILLING_CLIENT_KOTLIN_CLASS)
         mockkStatic(BILLING_FLOW_PARAMS)
diff --git a/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/extension/ProductDetailsResultToPaymentAvailability.kt b/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/extension/ProductDetailsResultToPaymentAvailability.kt
index 37cc701724..2cb3e1371a 100644
--- a/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/extension/ProductDetailsResultToPaymentAvailability.kt
+++ b/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/extension/ProductDetailsResultToPaymentAvailability.kt
@@ -17,7 +17,7 @@ fun ProductDetailsResult.toPaymentAvailability(
                     productDetailsList.toPaymentProducts(productIdToPaymentStatus)
                 )
             } else {
-                PaymentAvailability.NoProductsFounds
+                PaymentAvailability.NoProductsFound
             }
         }
         BillingClient.BillingResponseCode.BILLING_UNAVAILABLE ->
diff --git a/android/lib/billing/src/test/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepositoryTest.kt b/android/lib/billing/src/test/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepositoryTest.kt
index 21e13d5da8..c4d1b04905 100644
--- a/android/lib/billing/src/test/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepositoryTest.kt
+++ b/android/lib/billing/src/test/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepositoryTest.kt
@@ -40,7 +40,7 @@ class BillingPaymentRepositoryTest {
     private lateinit var paymentRepository: BillingPaymentRepository
 
     @BeforeEach
-    fun setUp() {
+    fun setup() {
         mockkStatic(PRODUCT_DETAILS_TO_PAYMENT_PRODUCT_EXT)
 
         every { mockBillingRepository.purchaseEvents } returns purchaseEventFlow
@@ -53,7 +53,7 @@ class BillingPaymentRepositoryTest {
     }
 
     @Test
-    fun testQueryAvailablePaymentProductsAvailable() = runTest {
+    fun `queryPaymentAvailability should return available products when billing is OK`() = runTest {
         // Arrange
         val expectedProduct: PaymentProduct = mockk()
         val mockProduct: ProductDetails = mockk()
@@ -76,45 +76,47 @@ class BillingPaymentRepositoryTest {
     }
 
     @Test
-    fun testQueryAvailablePaymentProductsUnavailable() = runTest {
-        // Arrange
-        val mockResult: ProductDetailsResult = mockk()
-        every { mockResult.billingResult.responseCode } returns BillingResponseCode.OK
-        every { mockResult.productDetailsList } returns emptyList()
-        coEvery { mockBillingRepository.queryPurchases() } returns mockk(relaxed = true)
-        coEvery { mockBillingRepository.queryProducts(any()) } returns mockResult
+    fun `queryPaymentAvailability should return NoProductsFound when billing is OK with no products `() =
+        runTest {
+            // Arrange
+            val mockResult: ProductDetailsResult = mockk()
+            every { mockResult.billingResult.responseCode } returns BillingResponseCode.OK
+            every { mockResult.productDetailsList } returns emptyList()
+            coEvery { mockBillingRepository.queryPurchases() } returns mockk(relaxed = true)
+            coEvery { mockBillingRepository.queryProducts(any()) } returns mockResult
 
-        // Act, Assert
-        paymentRepository.queryPaymentAvailability().test {
-            // Loading
-            awaitItem()
-            val result = awaitItem()
-            assertIs<PaymentAvailability.NoProductsFounds>(result)
-            awaitComplete()
+            // Act, Assert
+            paymentRepository.queryPaymentAvailability().test {
+                // Loading
+                awaitItem()
+                val result = awaitItem()
+                assertIs<PaymentAvailability.NoProductsFound>(result)
+                awaitComplete()
+            }
         }
-    }
 
     @Test
-    fun testQueryAvailablePaymentBillingUnavailableError() = runTest {
-        // Arrange
-        val mockResult: ProductDetailsResult = mockk()
-        every { mockResult.billingResult.responseCode } returns
-            BillingResponseCode.BILLING_UNAVAILABLE
-        coEvery { mockBillingRepository.queryPurchases() } returns mockk(relaxed = true)
-        coEvery { mockBillingRepository.queryProducts(any()) } returns mockResult
+    fun `queryPaymentAvailability should return BillingUnavailable when billing is Unavailable `() =
+        runTest {
+            // Arrange
+            val mockResult: ProductDetailsResult = mockk()
+            every { mockResult.billingResult.responseCode } returns
+                BillingResponseCode.BILLING_UNAVAILABLE
+            coEvery { mockBillingRepository.queryPurchases() } returns mockk(relaxed = true)
+            coEvery { mockBillingRepository.queryProducts(any()) } returns mockResult
 
-        // Act, Assert
-        paymentRepository.queryPaymentAvailability().test {
-            // Loading
-            awaitItem()
-            val result = awaitItem()
-            assertIs<PaymentAvailability.Error.BillingUnavailable>(result)
-            awaitComplete()
+            // Act, Assert
+            paymentRepository.queryPaymentAvailability().test {
+                // Loading
+                awaitItem()
+                val result = awaitItem()
+                assertIs<PaymentAvailability.Error.BillingUnavailable>(result)
+                awaitComplete()
+            }
         }
-    }
 
     @Test
-    fun testPurchaseBillingProductStartPurchaseFetchProductsError() = runTest {
+    fun `purchaseProduct should return FetchProductsError when billing is Unavailable`() = runTest {
         // Arrange
         val mockProductId = ProductId("MOCK")
         val mockProductDetailsResult = mockk<ProductDetailsResult>()
@@ -134,85 +136,91 @@ class BillingPaymentRepositoryTest {
     }
 
     @Test
-    fun testPurchaseBillingProductStartPurchaseNoProductsFoundError() = runTest {
-        // Arrange
-        val mockProductId = ProductId("MOCK")
-        val mockProductDetailsResult = mockk<ProductDetailsResult>()
-        every { mockProductDetailsResult.billingResult.responseCode } returns BillingResponseCode.OK
-        every { mockProductDetailsResult.productDetailsList } returns emptyList()
-        coEvery { mockBillingRepository.queryProducts(listOf(mockProductId.value)) } returns
-            mockProductDetailsResult
+    fun `purchaseProduct should return NoProductFound when billingRepository does not find any products`() =
+        runTest {
+            // Arrange
+            val mockProductId = ProductId("MOCK")
+            val mockProductDetailsResult = mockk<ProductDetailsResult>()
+            every { mockProductDetailsResult.billingResult.responseCode } returns
+                BillingResponseCode.OK
+            every { mockProductDetailsResult.productDetailsList } returns emptyList()
+            coEvery { mockBillingRepository.queryProducts(listOf(mockProductId.value)) } returns
+                mockProductDetailsResult
 
-        // Act, Assert
-        paymentRepository.purchaseProduct(mockProductId, mockk()).test {
-            assertIs<PurchaseResult.FetchingProducts>(awaitItem())
-            val result = awaitItem()
-            assertIs<PurchaseResult.Error.NoProductFound>(result)
-            awaitComplete()
+            // Act, Assert
+            paymentRepository.purchaseProduct(mockProductId, mockk()).test {
+                assertIs<PurchaseResult.FetchingProducts>(awaitItem())
+                val result = awaitItem()
+                assertIs<PurchaseResult.Error.NoProductFound>(result)
+                awaitComplete()
+            }
         }
-    }
 
     @Test
-    fun testPurchaseBillingProductStartPurchaseTransactionIdError() = runTest {
-        // Arrange
-        val mockProductId = ProductId("MOCK")
-        val mockProductDetailsResult = mockk<ProductDetailsResult>()
-        val mockProductDetails: ProductDetails = mockk()
-        every { mockProductDetails.productId } returns mockProductId.value
-        every { mockProductDetailsResult.billingResult.responseCode } returns BillingResponseCode.OK
-        every { mockProductDetailsResult.productDetailsList } returns listOf(mockProductDetails)
-        coEvery { mockBillingRepository.queryProducts(listOf(mockProductId.value)) } returns
-            mockProductDetailsResult
-        coEvery { mockPlayPurchaseRepository.initializePlayPurchase() } returns
-            PlayPurchaseInitResult.Error(PlayPurchaseInitError.OtherError)
+    fun `purchaseProduct should return TransactionIdError on PlayPurchaseInitError from PlayPurchaseRepository`() =
+        runTest {
+            // Arrange
+            val mockProductId = ProductId("MOCK")
+            val mockProductDetailsResult = mockk<ProductDetailsResult>()
+            val mockProductDetails: ProductDetails = mockk()
+            every { mockProductDetails.productId } returns mockProductId.value
+            every { mockProductDetailsResult.billingResult.responseCode } returns
+                BillingResponseCode.OK
+            every { mockProductDetailsResult.productDetailsList } returns listOf(mockProductDetails)
+            coEvery { mockBillingRepository.queryProducts(listOf(mockProductId.value)) } returns
+                mockProductDetailsResult
+            coEvery { mockPlayPurchaseRepository.initializePlayPurchase() } returns
+                PlayPurchaseInitResult.Error(PlayPurchaseInitError.OtherError)
 
-        // Act, Assert
-        paymentRepository.purchaseProduct(mockProductId, mockk()).test {
-            assertIs<PurchaseResult.FetchingProducts>(awaitItem())
-            assertIs<PurchaseResult.FetchingObfuscationId>(awaitItem())
-            val result = awaitItem()
-            assertIs<PurchaseResult.Error.TransactionIdError>(result)
-            awaitComplete()
+            // Act, Assert
+            paymentRepository.purchaseProduct(mockProductId, mockk()).test {
+                assertIs<PurchaseResult.FetchingProducts>(awaitItem())
+                assertIs<PurchaseResult.FetchingObfuscationId>(awaitItem())
+                val result = awaitItem()
+                assertIs<PurchaseResult.Error.TransactionIdError>(result)
+                awaitComplete()
+            }
         }
-    }
 
     @Test
-    fun testPurchaseBillingProductStartPurchaseFlowBillingError() = runTest {
-        // Arrange
-        val mockProductId = ProductId("MOCK")
-        val mockProductDetailsResult = mockk<ProductDetailsResult>()
-        val mockProductDetails: ProductDetails = mockk()
-        every { mockProductDetails.productId } returns mockProductId.value
-        every { mockProductDetailsResult.billingResult.responseCode } returns BillingResponseCode.OK
-        every { mockProductDetailsResult.productDetailsList } returns listOf(mockProductDetails)
-        coEvery { mockBillingRepository.queryProducts(listOf(mockProductId.value)) } returns
-            mockProductDetailsResult
-        val mockBillingResult: BillingResult = mockk()
-        every { mockBillingResult.responseCode } returns BillingResponseCode.BILLING_UNAVAILABLE
-        every { mockBillingResult.debugMessage } returns "Mock error"
-        coEvery {
-            mockBillingRepository.startPurchaseFlow(
-                productDetails = any(),
-                obfuscatedId = any(),
-                activityProvider = any()
-            )
-        } returns mockBillingResult
-        coEvery { mockPlayPurchaseRepository.initializePlayPurchase() } returns
-            PlayPurchaseInitResult.Ok("MOCK")
+    fun `purchaseProduct should return BillingError on billing unavailable from startPurchaseFlow`() =
+        runTest {
+            // Arrange
+            val mockProductId = ProductId("MOCK")
+            val mockProductDetailsResult = mockk<ProductDetailsResult>()
+            val mockProductDetails: ProductDetails = mockk()
+            every { mockProductDetails.productId } returns mockProductId.value
+            every { mockProductDetailsResult.billingResult.responseCode } returns
+                BillingResponseCode.OK
+            every { mockProductDetailsResult.productDetailsList } returns listOf(mockProductDetails)
+            coEvery { mockBillingRepository.queryProducts(listOf(mockProductId.value)) } returns
+                mockProductDetailsResult
+            val mockBillingResult: BillingResult = mockk()
+            every { mockBillingResult.responseCode } returns BillingResponseCode.BILLING_UNAVAILABLE
+            every { mockBillingResult.debugMessage } returns "Mock error"
+            coEvery {
+                mockBillingRepository.startPurchaseFlow(
+                    productDetails = any(),
+                    obfuscatedId = any(),
+                    activityProvider = any()
+                )
+            } returns mockBillingResult
+            coEvery { mockPlayPurchaseRepository.initializePlayPurchase() } returns
+                PlayPurchaseInitResult.Ok("MOCK")
 
-        // Act, Assert
-        paymentRepository.purchaseProduct(mockProductId, mockk()).test {
-            // Purchase started
-            assertIs<PurchaseResult.FetchingProducts>(awaitItem())
-            assertIs<PurchaseResult.FetchingObfuscationId>(awaitItem())
-            val result = awaitItem()
-            assertIs<PurchaseResult.Error.BillingError>(result)
-            awaitComplete()
+            // Act, Assert
+            paymentRepository.purchaseProduct(mockProductId, mockk()).test {
+                // Purchase started
+                assertIs<PurchaseResult.FetchingProducts>(awaitItem())
+                assertIs<PurchaseResult.FetchingObfuscationId>(awaitItem())
+                val result = awaitItem()
+                assertIs<PurchaseResult.Error.BillingError>(result)
+                awaitComplete()
+            }
         }
-    }
 
     @Test
-    fun testPurchaseBillingProductPurchaseCanceled() = runTest {
+    fun `cancel during purchaseProduct should return in cancelled event`() = runTest {
         // Arrange
         val mockProductId = ProductId("MOCK")
         val mockProductDetailsResult = mockk<ProductDetailsResult>()
@@ -248,50 +256,52 @@ class BillingPaymentRepositoryTest {
     }
 
     @Test
-    fun testPurchaseBillingProductVerificationError() = runTest {
-        // Arrange
-        val mockProductId = ProductId("MOCK")
-        val mockProductDetailsResult = mockk<ProductDetailsResult>()
-        val mockProductDetails: ProductDetails = mockk()
-        every { mockProductDetails.productId } returns mockProductId.value
-        every { mockProductDetailsResult.billingResult.responseCode } returns BillingResponseCode.OK
-        every { mockProductDetailsResult.productDetailsList } returns listOf(mockProductDetails)
-        coEvery { mockBillingRepository.queryProducts(listOf(mockProductId.value)) } returns
-            mockProductDetailsResult
-        val mockPurchaseToken = "TOKEN"
-        val mockBillingPurchase: Purchase = mockk()
-        val mockBillingResult: BillingResult = mockk()
-        every { mockBillingPurchase.purchaseState } returns Purchase.PurchaseState.PURCHASED
-        every { mockBillingResult.responseCode } returns BillingResponseCode.OK
-        every { mockBillingPurchase.products } returns listOf(mockProductId.value)
-        every { mockBillingPurchase.purchaseToken } returns mockPurchaseToken
-        coEvery {
-            mockBillingRepository.startPurchaseFlow(
-                productDetails = any(),
-                obfuscatedId = any(),
-                activityProvider = any()
-            )
-        } returns mockBillingResult
-        coEvery { mockPlayPurchaseRepository.initializePlayPurchase() } returns
-            PlayPurchaseInitResult.Ok("MOCK-ID")
-        coEvery { mockPlayPurchaseRepository.verifyPlayPurchase(any()) } returns
-            PlayPurchaseVerifyResult.Error(PlayPurchaseVerifyError.OtherError)
+    fun `purchaseProduct should emit VerificationError on verify error from playPurchase`() =
+        runTest {
+            // Arrange
+            val mockProductId = ProductId("MOCK")
+            val mockProductDetailsResult = mockk<ProductDetailsResult>()
+            val mockProductDetails: ProductDetails = mockk()
+            every { mockProductDetails.productId } returns mockProductId.value
+            every { mockProductDetailsResult.billingResult.responseCode } returns
+                BillingResponseCode.OK
+            every { mockProductDetailsResult.productDetailsList } returns listOf(mockProductDetails)
+            coEvery { mockBillingRepository.queryProducts(listOf(mockProductId.value)) } returns
+                mockProductDetailsResult
+            val mockPurchaseToken = "TOKEN"
+            val mockBillingPurchase: Purchase = mockk()
+            val mockBillingResult: BillingResult = mockk()
+            every { mockBillingPurchase.purchaseState } returns Purchase.PurchaseState.PURCHASED
+            every { mockBillingResult.responseCode } returns BillingResponseCode.OK
+            every { mockBillingPurchase.products } returns listOf(mockProductId.value)
+            every { mockBillingPurchase.purchaseToken } returns mockPurchaseToken
+            coEvery {
+                mockBillingRepository.startPurchaseFlow(
+                    productDetails = any(),
+                    obfuscatedId = any(),
+                    activityProvider = any()
+                )
+            } returns mockBillingResult
+            coEvery { mockPlayPurchaseRepository.initializePlayPurchase() } returns
+                PlayPurchaseInitResult.Ok("MOCK-ID")
+            coEvery { mockPlayPurchaseRepository.verifyPlayPurchase(any()) } returns
+                PlayPurchaseVerifyResult.Error(PlayPurchaseVerifyError.OtherError)
 
-        // Act, Assert
-        paymentRepository.purchaseProduct(mockProductId, mockk()).test {
-            assertIs<PurchaseResult.FetchingProducts>(awaitItem())
-            assertIs<PurchaseResult.FetchingObfuscationId>(awaitItem())
-            assertIs<PurchaseResult.BillingFlowStarted>(awaitItem())
-            purchaseEventFlow.tryEmit(PurchaseEvent.Completed(listOf(mockBillingPurchase)))
-            assertIs<PurchaseResult.VerificationStarted>(awaitItem())
-            val result = awaitItem()
-            assertIs<PurchaseResult.Error.VerificationError>(result)
-            awaitComplete()
+            // Act, Assert
+            paymentRepository.purchaseProduct(mockProductId, mockk()).test {
+                assertIs<PurchaseResult.FetchingProducts>(awaitItem())
+                assertIs<PurchaseResult.FetchingObfuscationId>(awaitItem())
+                assertIs<PurchaseResult.BillingFlowStarted>(awaitItem())
+                purchaseEventFlow.tryEmit(PurchaseEvent.Completed(listOf(mockBillingPurchase)))
+                assertIs<PurchaseResult.VerificationStarted>(awaitItem())
+                val result = awaitItem()
+                assertIs<PurchaseResult.Error.VerificationError>(result)
+                awaitComplete()
+            }
         }
-    }
 
     @Test
-    fun testPurchaseBillingProductPurchaseCompleted() = runTest {
+    fun `purchaseProduct success should emit all events leading up to success`() = runTest {
         // Arrange
         val mockProductId = ProductId("MOCK")
         val mockProductDetailsResult = mockk<ProductDetailsResult>()
@@ -334,41 +344,43 @@ class BillingPaymentRepositoryTest {
     }
 
     @Test
-    fun testPurchaseBillingProductPurchasePending() = runTest {
-        // Arrange
-        val mockProductId = ProductId("MOCK")
-        val mockProductDetailsResult = mockk<ProductDetailsResult>()
-        val mockProductDetails: ProductDetails = mockk()
-        every { mockProductDetails.productId } returns mockProductId.value
-        every { mockProductDetailsResult.billingResult.responseCode } returns BillingResponseCode.OK
-        every { mockProductDetailsResult.productDetailsList } returns listOf(mockProductDetails)
-        coEvery { mockBillingRepository.queryProducts(listOf(mockProductId.value)) } returns
-            mockProductDetailsResult
-        val mockBillingPurchase: Purchase = mockk()
-        val mockBillingResult: BillingResult = mockk()
-        every { mockBillingPurchase.purchaseState } returns Purchase.PurchaseState.PENDING
-        every { mockBillingResult.responseCode } returns BillingResponseCode.OK
-        coEvery {
-            mockBillingRepository.startPurchaseFlow(
-                productDetails = any(),
-                obfuscatedId = any(),
-                activityProvider = any()
-            )
-        } returns mockBillingResult
-        coEvery { mockPlayPurchaseRepository.initializePlayPurchase() } returns
-            PlayPurchaseInitResult.Ok("MOCK")
+    fun `purchaseProduct where purchase gets stuck in pending should complete with pending`() =
+        runTest {
+            // Arrange
+            val mockProductId = ProductId("MOCK")
+            val mockProductDetailsResult = mockk<ProductDetailsResult>()
+            val mockProductDetails: ProductDetails = mockk()
+            every { mockProductDetails.productId } returns mockProductId.value
+            every { mockProductDetailsResult.billingResult.responseCode } returns
+                BillingResponseCode.OK
+            every { mockProductDetailsResult.productDetailsList } returns listOf(mockProductDetails)
+            coEvery { mockBillingRepository.queryProducts(listOf(mockProductId.value)) } returns
+                mockProductDetailsResult
+            val mockBillingPurchase: Purchase = mockk()
+            val mockBillingResult: BillingResult = mockk()
+            every { mockBillingPurchase.purchaseState } returns Purchase.PurchaseState.PENDING
+            every { mockBillingResult.responseCode } returns BillingResponseCode.OK
+            coEvery {
+                mockBillingRepository.startPurchaseFlow(
+                    productDetails = any(),
+                    obfuscatedId = any(),
+                    activityProvider = any()
+                )
+            } returns mockBillingResult
+            coEvery { mockPlayPurchaseRepository.initializePlayPurchase() } returns
+                PlayPurchaseInitResult.Ok("MOCK")
 
-        // Act, Assert
-        paymentRepository.purchaseProduct(mockProductId, mockk()).test {
-            assertIs<PurchaseResult.FetchingProducts>(awaitItem())
-            assertIs<PurchaseResult.FetchingObfuscationId>(awaitItem())
-            assertIs<PurchaseResult.BillingFlowStarted>(awaitItem())
-            purchaseEventFlow.tryEmit(PurchaseEvent.Completed(listOf(mockBillingPurchase)))
-            val result = awaitItem()
-            assertIs<PurchaseResult.Completed.Pending>(result)
-            awaitComplete()
+            // Act, Assert
+            paymentRepository.purchaseProduct(mockProductId, mockk()).test {
+                assertIs<PurchaseResult.FetchingProducts>(awaitItem())
+                assertIs<PurchaseResult.FetchingObfuscationId>(awaitItem())
+                assertIs<PurchaseResult.BillingFlowStarted>(awaitItem())
+                purchaseEventFlow.tryEmit(PurchaseEvent.Completed(listOf(mockBillingPurchase)))
+                val result = awaitItem()
+                assertIs<PurchaseResult.Completed.Pending>(result)
+                awaitComplete()
+            }
         }
-    }
 
     companion object {
         private const val PRODUCT_DETAILS_TO_PAYMENT_PRODUCT_EXT =
diff --git a/android/lib/model/src/test/kotlin/net/mullvad/mullvadvpn/model/LatitudeTest.kt b/android/lib/model/src/test/kotlin/net/mullvad/mullvadvpn/model/LatitudeTest.kt
index 8788c2123a..c883f20bfc 100644
--- a/android/lib/model/src/test/kotlin/net/mullvad/mullvadvpn/model/LatitudeTest.kt
+++ b/android/lib/model/src/test/kotlin/net/mullvad/mullvadvpn/model/LatitudeTest.kt
@@ -140,7 +140,7 @@ class LatitudeTest {
     }
 
     @Test
-    fun `distanceTo with two positive latitudes`() {
+    fun `distanceTo with two positive latitudes should return distance`() {
         val latFloat1 = 80f
         val latitude1 = Latitude(latFloat1)
         val latFloat2 = 30f
@@ -150,7 +150,7 @@ class LatitudeTest {
     }
 
     @Test
-    fun `distanceTo with two negative latitudes`() {
+    fun `distanceTo with two negative latitudes should return distance`() {
         val latFloat1 = -80f
         val latitude1 = Latitude(latFloat1)
         val latFloat2 = -30f
diff --git a/android/lib/model/src/test/kotlin/net/mullvad/mullvadvpn/model/LongitudeTest.kt b/android/lib/model/src/test/kotlin/net/mullvad/mullvadvpn/model/LongitudeTest.kt
index de94661ad0..69d3445417 100644
--- a/android/lib/model/src/test/kotlin/net/mullvad/mullvadvpn/model/LongitudeTest.kt
+++ b/android/lib/model/src/test/kotlin/net/mullvad/mullvadvpn/model/LongitudeTest.kt
@@ -119,7 +119,7 @@ class LongitudeTest {
     }
 
     @Test
-    fun `distanceTo with two positive longitudes`() {
+    fun `distanceTo with two positive longitudes should return distance`() {
         val longFloat1 = 80f
         val longitude1 = Longitude(longFloat1)
         val longFloat2 = 30f
@@ -129,7 +129,7 @@ class LongitudeTest {
     }
 
     @Test
-    fun `distanceTo with two negative longitudes`() {
+    fun `distanceTo with two negative longitudes should return distance`() {
         val longFloat1 = -80f
         val longitude1 = Longitude(longFloat1)
         val longFloat2 = -30f
@@ -141,7 +141,7 @@ class LongitudeTest {
     }
 
     @Test
-    fun `distanceTo with wrapping value as shortest path`() {
+    fun `distanceTo with wrapping value should return shortest path as distance`() {
         val longFloat1 = -170f
         val longitude1 = Longitude(longFloat1)
         val longFloat2 = 170f
diff --git a/android/lib/payment/src/main/kotlin/net/mullvad/mullvadvpn/lib/payment/model/PaymentAvailability.kt b/android/lib/payment/src/main/kotlin/net/mullvad/mullvadvpn/lib/payment/model/PaymentAvailability.kt
index 012237d825..43caa9d7e2 100644
--- a/android/lib/payment/src/main/kotlin/net/mullvad/mullvadvpn/lib/payment/model/PaymentAvailability.kt
+++ b/android/lib/payment/src/main/kotlin/net/mullvad/mullvadvpn/lib/payment/model/PaymentAvailability.kt
@@ -7,7 +7,7 @@ sealed interface PaymentAvailability {
 
     data object ProductsUnavailable : PaymentAvailability
 
-    data object NoProductsFounds : PaymentAvailability
+    data object NoProductsFound : PaymentAvailability
 
     sealed interface Error : PaymentAvailability {
         data object BillingUnavailable : Error