Merge pull request #4663 from wix/feat/4175-idling-resource-refactoring

feat(android): idling resource refactoring
wix · Dec 24, 2024 · 9272553 · 9272553
2 parents d04cfef + c0e1723
commit 9272553
Show file tree

Hide file tree

Showing 34 changed files with 1,074 additions and 1,390 deletions.
diff --git a/detox/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java b/detox/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java
@@ -13,7 +13,7 @@
 import com.facebook.react.ReactApplication;
 import com.wix.detox.common.UIThread;
 import com.wix.detox.reactnative.ReactNativeExtension;
-import com.wix.detox.reactnative.idlingresources.NetworkIdlingResource;
+import com.wix.detox.reactnative.idlingresources.network.NetworkIdlingResource;
 
 import org.hamcrest.Matcher;
 

diff --git a/detox/android/detox/src/full/java/com/wix/detox/reactnative/ReactNativeExtension.kt b/detox/android/detox/src/full/java/com/wix/detox/reactnative/ReactNativeExtension.kt
@@ -8,6 +8,7 @@ import com.facebook.react.ReactApplication
 import com.facebook.react.ReactInstanceManager
 import com.facebook.react.bridge.ReactContext
 import com.wix.detox.LaunchArgs
+import com.wix.detox.reactnative.idlingresources.ReactNativeIdlingResources
 
 private const val LOG_TAG = "DetoxRNExt"
 
@@ -56,15 +57,14 @@ object ReactNativeExtension {
         Log.i(LOG_TAG, "Reloading React Native")
 
         (applicationContext as ReactApplication).let {
-            val networkSyncEnabled = rnIdlingResources?.networkSyncEnabled ?: true
             clearIdlingResources()
 
             val previousReactContext = getCurrentReactContextSafe(it)
 
             reloadReactNativeInBackground(it)
             val reactContext = awaitNewReactNativeContext(it, previousReactContext)
 
-            enableOrDisableSynchronization(reactContext, networkSyncEnabled)
+            enableOrDisableSynchronization(reactContext)
         }
     }
 
@@ -93,11 +93,6 @@ object ReactNativeExtension {
         return null
     }
 
-    @JvmStatic
-    fun setNetworkSynchronization(enable: Boolean) {
-        rnIdlingResources?.setNetworkSynchronization(enable)
-    }
-
     @JvmStatic
     fun toggleNetworkSynchronization(enable: Boolean) {
         rnIdlingResources?.let {
@@ -129,11 +124,11 @@ object ReactNativeExtension {
         return rnLoadingMonitor.getNewContext()!!
     }
 
-    private fun enableOrDisableSynchronization(reactContext: ReactContext, networkSyncEnabled: Boolean = true) {
+    private fun enableOrDisableSynchronization(reactContext: ReactContext) {
         if (shouldDisableSynchronization()) {
             clearAllSynchronization()
         } else {
-            setupIdlingResources(reactContext, networkSyncEnabled)
+            setupIdlingResources(reactContext)
         }
     }
 
@@ -142,10 +137,10 @@ object ReactNativeExtension {
         return launchArgs.hasEnableSynchronization() && launchArgs.enableSynchronization.equals("0")
     }
 
-    private fun setupIdlingResources(reactContext: ReactContext, networkSyncEnabled: Boolean = true) {
+    private fun setupIdlingResources(reactContext: ReactContext) {
         val launchArgs = LaunchArgs()
 
-        rnIdlingResources = ReactNativeIdlingResources(reactContext, launchArgs, networkSyncEnabled).apply {
+        rnIdlingResources = ReactNativeIdlingResources(reactContext, launchArgs).apply {
             registerAll()
         }
     }

diff --git a/detox/android/detox/src/full/java/com/wix/detox/reactnative/ReactNativeIdlingResources.kt b/detox/android/detox/src/full/java/com/wix/detox/reactnative/ReactNativeIdlingResources.kt