Skip to content

Commit 1d94562

Browse files
mateoguzmanafacebook-github-bot
authored andcommitted
Clean up incorrect @VisibleForTesting annotation usages (#52025)
Summary: Static code analysis reports 18 warnings for incorrect usages of the `VisibleForTesting` annotation as some of the classes/functions/properties that are annotated are not used only in tests but also in other non-test files across the codebase. This PR cleans that up to fix those warnings. ## Changelog: [INTERNAL] - Clean up incorrect VisibleForTesting annotation usages Pull Request resolved: #52025 Test Plan: ```sh yarn test-android yarn android ``` Reviewed By: rshest Differential Revision: D76745241 Pulled By: sbuggay fbshipit-source-id: 4702a7258002916cc95c178dc8931c8bb471f7bc
1 parent 7885508 commit 1d94562

5 files changed

Lines changed: 5 additions & 8 deletions

File tree

packages/react-native/ReactAndroid/api/ReactAndroid.api

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ public class com/facebook/react/ReactInstanceManager {
259259
public fun createViewManager (Ljava/lang/String;)Lcom/facebook/react/uimanager/ViewManager;
260260
public fun destroy ()V
261261
public fun detachRootView (Lcom/facebook/react/uimanager/ReactRoot;)V
262+
public fun getCurrentReactContext ()Lcom/facebook/react/bridge/ReactContext;
262263
public fun getDevSupportManager ()Lcom/facebook/react/devsupport/interfaces/DevSupportManager;
263264
public fun getJsExecutorName ()Ljava/lang/String;
264265
public fun getLifecycleState ()Lcom/facebook/react/common/LifecycleState;
@@ -600,12 +601,14 @@ public abstract interface class com/facebook/react/bridge/CatalystInstance : com
600601
public abstract fun getSourceURL ()Ljava/lang/String;
601602
public abstract fun hasNativeModule (Ljava/lang/Class;)Z
602603
public abstract fun hasRunJSBundle ()Z
604+
public abstract fun initialize ()V
603605
public abstract fun invokeCallback (ILcom/facebook/react/bridge/NativeArrayInterface;)V
604606
public abstract fun isDestroyed ()Z
605607
public abstract fun registerSegment (ILjava/lang/String;)V
606608
public abstract fun removeBridgeIdleDebugListener (Lcom/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener;)V
607609
public abstract fun runJSBundle ()V
608610
public abstract fun setFabricUIManager (Lcom/facebook/react/bridge/UIManager;)V
611+
public abstract fun setGlobalVariable (Ljava/lang/String;Ljava/lang/String;)V
609612
public abstract fun setTurboModuleRegistry (Lcom/facebook/react/internal/turbomodule/core/interfaces/TurboModuleRegistry;)V
610613
}
611614

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
import com.facebook.react.common.LifecycleState;
7575
import com.facebook.react.common.ReactConstants;
7676
import com.facebook.react.common.SurfaceDelegateFactory;
77-
import com.facebook.react.common.annotations.VisibleForTesting;
7877
import com.facebook.react.common.annotations.internal.LegacyArchitecture;
7978
import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel;
8079
import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger;
@@ -1119,7 +1118,6 @@ public void removeReactInstanceEventListener(
11191118
/**
11201119
* @return current ReactApplicationContext
11211120
*/
1122-
@VisibleForTesting
11231121
public @Nullable ReactContext getCurrentReactContext() {
11241122
synchronized (mReactContextLock) {
11251123
return mCurrentReactContext;

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ package com.facebook.react.bridge
99

1010
import com.facebook.proguard.annotations.DoNotStrip
1111
import com.facebook.react.bridge.queue.ReactQueueConfiguration
12-
import com.facebook.react.common.annotations.VisibleForTesting
1312
import com.facebook.react.common.annotations.internal.LegacyArchitecture
1413
import com.facebook.react.internal.turbomodule.core.interfaces.TurboModuleRegistry
1514
import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder
@@ -53,7 +52,7 @@ public interface CatalystInstance : MemoryPressureListener, JSInstance, JSBundle
5352
public val isDestroyed: Boolean
5453

5554
/** Initialize all the native modules */
56-
@VisibleForTesting public fun initialize()
55+
public fun initialize()
5756

5857
public val reactQueueConfiguration: ReactQueueConfiguration
5958

@@ -90,7 +89,7 @@ public interface CatalystInstance : MemoryPressureListener, JSInstance, JSBundle
9089
/** This method registers the file path of an additional JS segment by its ID. */
9190
public fun registerSegment(segmentId: Int, path: String)
9291

93-
@VisibleForTesting public fun setGlobalVariable(propName: String, jsonValue: String)
92+
public fun setGlobalVariable(propName: String, jsonValue: String)
9493

9594
/**
9695
* Do not use this anymore. Use [runtimeExecutor] instead. Get the C pointer (as a long) to the

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceImpl.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ internal constructor(
188188
internal val eventDispatcher: EventDispatcher?
189189
get() = reactHost?.eventDispatcher
190190

191-
@get:VisibleForTesting
192191
internal val isAttached: Boolean
193192
get() = reactHost != null
194193

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/CSSBackgroundDrawable.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import androidx.core.util.Preconditions;
3333
import com.facebook.infer.annotation.Nullsafe;
3434
import com.facebook.react.common.annotations.UnstableReactNativeAPI;
35-
import com.facebook.react.common.annotations.VisibleForTesting;
3635
import com.facebook.react.modules.i18nmanager.I18nUtil;
3736
import com.facebook.react.uimanager.FloatUtil;
3837
import com.facebook.react.uimanager.LengthPercentage;
@@ -346,7 +345,6 @@ public void setBackgroundImage(@Nullable List<BackgroundImageLayer> backgroundIm
346345
invalidateSelf();
347346
}
348347

349-
@VisibleForTesting
350348
public int getColor() {
351349
return mColor;
352350
}

0 commit comments

Comments
 (0)