From 55a20600efcad7f14a4208be9069839314324b92 Mon Sep 17 00:00:00 2001 From: Valentin Schneeberger Date: Wed, 29 May 2024 13:22:07 +0200 Subject: [PATCH 1/3] Try to not unmock to remove bs error on CI --- .../java/com/android/partagix/BarcodeAnalyzerTest.kt | 2 +- .../java/com/android/partagix/model/BarecodeAnalyzer.kt | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/androidTest/java/com/android/partagix/BarcodeAnalyzerTest.kt b/app/src/androidTest/java/com/android/partagix/BarcodeAnalyzerTest.kt index d4d8cbb8..0d72f116 100644 --- a/app/src/androidTest/java/com/android/partagix/BarcodeAnalyzerTest.kt +++ b/app/src/androidTest/java/com/android/partagix/BarcodeAnalyzerTest.kt @@ -54,6 +54,6 @@ class BarcodeAnalyzerTest { verify { onQrScanned(itemId, userUid) } // Unmock all - unmockkAll() + //unmockkAll() } } diff --git a/app/src/main/java/com/android/partagix/model/BarecodeAnalyzer.kt b/app/src/main/java/com/android/partagix/model/BarecodeAnalyzer.kt index e7590195..75de596e 100644 --- a/app/src/main/java/com/android/partagix/model/BarecodeAnalyzer.kt +++ b/app/src/main/java/com/android/partagix/model/BarecodeAnalyzer.kt @@ -1,5 +1,8 @@ import android.content.Context import android.net.Uri +import android.os.Handler +import android.os.Looper +import android.widget.Toast import androidx.annotation.OptIn import androidx.camera.core.ExperimentalGetImage import androidx.camera.core.ImageAnalysis @@ -40,6 +43,12 @@ class BarcodeAnalyzer( if (user != null) { val uri = Uri.parse(it) val itemId = uri.getQueryParameter("itemId") + val text = "Qr code scanned successfully" + val toast = Toast.makeText(context, text, Toast.LENGTH_SHORT) + toast.show() + + // Cancel the toast after the specified duration + Handler(Looper.getMainLooper()).postDelayed({ toast.cancel() }, 1000) if (itemId != null) { onQrScanned(itemId, user.uid) From 9cb9f3f2a5390bb6362aee3d9905b93ce4b7f7c0 Mon Sep 17 00:00:00 2001 From: Valentin Schneeberger Date: Wed, 29 May 2024 13:23:14 +0200 Subject: [PATCH 2/3] Format --- .../java/com/android/partagix/BarcodeAnalyzerTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/androidTest/java/com/android/partagix/BarcodeAnalyzerTest.kt b/app/src/androidTest/java/com/android/partagix/BarcodeAnalyzerTest.kt index 0d72f116..7d6c1179 100644 --- a/app/src/androidTest/java/com/android/partagix/BarcodeAnalyzerTest.kt +++ b/app/src/androidTest/java/com/android/partagix/BarcodeAnalyzerTest.kt @@ -54,6 +54,6 @@ class BarcodeAnalyzerTest { verify { onQrScanned(itemId, userUid) } // Unmock all - //unmockkAll() + // unmockkAll() } } From dbae21b4071b1cbaee069c4ca5f9ea3f57bce871 Mon Sep 17 00:00:00 2001 From: Patrick-Pataky Date: Wed, 29 May 2024 17:58:55 +0200 Subject: [PATCH 3/3] Fixing Toast error on the CI --- .../java/com/android/partagix/BarcodeAnalyzerTest.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/androidTest/java/com/android/partagix/BarcodeAnalyzerTest.kt b/app/src/androidTest/java/com/android/partagix/BarcodeAnalyzerTest.kt index 7d6c1179..60114afb 100644 --- a/app/src/androidTest/java/com/android/partagix/BarcodeAnalyzerTest.kt +++ b/app/src/androidTest/java/com/android/partagix/BarcodeAnalyzerTest.kt @@ -43,6 +43,8 @@ class BarcodeAnalyzerTest { val toast = mockk() every { toast.show() } just Runs + every { toast.cancel() } just Runs + // Mock Toast mockkStatic(Toast::class) every { Toast.makeText(context, any(), any()) } returns toast