From 546e88016e1af5287b404ee8ee0aad5e21a8cac3 Mon Sep 17 00:00:00 2001
From: tusharpingale <tushar@insider.in>
Date: Thu, 6 Oct 2022 22:27:40 +0530
Subject: [PATCH] - fixed failing test cases due to jacoco - replaced
 AppCompatActivity with ComponentActivity

---
 noty-android/app/composeapp/build.gradle                      | 2 +-
 .../java/dev/shreyaspatil/noty/composeapp/NotyScreenTest.kt   | 3 ++-
 .../noty/composeapp/ui/screens/NotesScreenTest.kt             | 4 ++--
 .../java/dev/shreyaspatil/noty/composeapp/ui/MainActivity.kt  | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/noty-android/app/composeapp/build.gradle b/noty-android/app/composeapp/build.gradle
index 97e9956d..39d079d2 100644
--- a/noty-android/app/composeapp/build.gradle
+++ b/noty-android/app/composeapp/build.gradle
@@ -42,7 +42,7 @@ android {
 
     buildTypes {
         debug {
-            testCoverageEnabled true
+            testCoverageEnabled false
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
diff --git a/noty-android/app/composeapp/src/androidTest/java/dev/shreyaspatil/noty/composeapp/NotyScreenTest.kt b/noty-android/app/composeapp/src/androidTest/java/dev/shreyaspatil/noty/composeapp/NotyScreenTest.kt
index f3d83649..106e5c95 100644
--- a/noty-android/app/composeapp/src/androidTest/java/dev/shreyaspatil/noty/composeapp/NotyScreenTest.kt
+++ b/noty-android/app/composeapp/src/androidTest/java/dev/shreyaspatil/noty/composeapp/NotyScreenTest.kt
@@ -16,6 +16,7 @@
 
 package dev.shreyaspatil.noty.composeapp
 
+import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
@@ -57,7 +58,7 @@ abstract class NotyScreenTest {
         body: AndroidComposeTestRule<ActivityScenarioRule<MainActivity>, MainActivity>.() -> Unit
     ) = composeTestRule.run(body)
 
-    fun setNotyContent(content: @Composable () -> Unit) = composeTestRule.setContent {
+    fun setNotyContent(content: @Composable () -> Unit) = composeTestRule.activity.setContent {
         NotyTheme {
             content()
         }
diff --git a/noty-android/app/composeapp/src/androidTest/java/dev/shreyaspatil/noty/composeapp/ui/screens/NotesScreenTest.kt b/noty-android/app/composeapp/src/androidTest/java/dev/shreyaspatil/noty/composeapp/ui/screens/NotesScreenTest.kt
index add0c674..ad08d506 100644
--- a/noty-android/app/composeapp/src/androidTest/java/dev/shreyaspatil/noty/composeapp/ui/screens/NotesScreenTest.kt
+++ b/noty-android/app/composeapp/src/androidTest/java/dev/shreyaspatil/noty/composeapp/ui/screens/NotesScreenTest.kt
@@ -196,11 +196,11 @@ class NotesScreenTest : NotyScreenTest() {
         setNotyContent { NotesScreen(onNavigateToNoteDetail = { navigateToNoteId = it }) }
         registerIdlingResource(prefillNotes())
 
-        onNodeWithText("Lorem Ipsum 1").performClick()
+        onNodeWithText("Lorem Ipsum 1", useUnmergedTree = true).performClick()
         waitForIdle()
         assertEquals("1", navigateToNoteId)
 
-        onNodeWithText("Hello World 2").performClick()
+        onNodeWithText("Hello World 2", useUnmergedTree = true).performClick()
         waitForIdle()
         assertEquals("2", navigateToNoteId)
     }
diff --git a/noty-android/app/composeapp/src/main/java/dev/shreyaspatil/noty/composeapp/ui/MainActivity.kt b/noty-android/app/composeapp/src/main/java/dev/shreyaspatil/noty/composeapp/ui/MainActivity.kt
index 972bdf01..0c31d71d 100644
--- a/noty-android/app/composeapp/src/main/java/dev/shreyaspatil/noty/composeapp/ui/MainActivity.kt
+++ b/noty-android/app/composeapp/src/main/java/dev/shreyaspatil/noty/composeapp/ui/MainActivity.kt
@@ -17,8 +17,8 @@
 package dev.shreyaspatil.noty.composeapp.ui
 
 import android.os.Bundle
+import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.Surface
@@ -38,7 +38,7 @@ import dev.shreyaspatil.noty.view.viewmodel.NoteDetailViewModel
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class MainActivity : AppCompatActivity() {
+class MainActivity : ComponentActivity() {
 
     @Inject
     lateinit var preferenceManager: PreferenceManager