Ensure tests are running on the correct thread
Summary: This diff re-enables commented code during the AndroidX migration Reviewed By: PeteTheHeat Differential Revision: D15758382 fbshipit-source-id: 95106cc2e3faccbd632d773ee58091c7bf8ea063
This commit is contained in:
Родитель
b5ea49f132
Коммит
3b51499fc2
|
@ -12,6 +12,7 @@ import android.test.AndroidTestCase;
|
|||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.test.InstrumentationRegistry;
|
||||
import com.facebook.infer.annotation.Assertions;
|
||||
import com.facebook.react.bridge.BaseJavaModule;
|
||||
import com.facebook.react.bridge.CatalystInstance;
|
||||
|
@ -163,9 +164,7 @@ public abstract class ReactIntegrationTestCase extends AndroidTestCase {
|
|||
}
|
||||
|
||||
public void waitForIdleSync() {
|
||||
return;
|
||||
// TODO: re-enable after cleanup of android-x migration
|
||||
// InstrumentationRegistry.getInstrumentation().waitForIdleSync();
|
||||
InstrumentationRegistry.getInstrumentation().waitForIdleSync();
|
||||
}
|
||||
|
||||
public void waitForBridgeAndUIIdle() {
|
||||
|
|
|
@ -6,10 +6,12 @@
|
|||
*/
|
||||
package com.facebook.react.testing;
|
||||
|
||||
import android.app.Instrumentation;
|
||||
import android.content.Context;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.test.InstrumentationRegistry;
|
||||
import com.android.internal.util.Predicate;
|
||||
import com.facebook.infer.annotation.Assertions;
|
||||
import com.facebook.react.NativeModuleRegistryBuilder;
|
||||
|
@ -110,13 +112,11 @@ public class ReactTestHelper {
|
|||
}
|
||||
|
||||
public static ReactTestFactory getReactTestFactory() {
|
||||
// TODO: re-enable after cleanup of android-x migration
|
||||
// Instrumentation inst = InstrumentationRegistry.getInstrumentation();
|
||||
// if (!(inst instanceof ReactTestFactory)) {
|
||||
return new DefaultReactTestFactory();
|
||||
// }
|
||||
//
|
||||
// return (ReactTestFactory) inst;
|
||||
Instrumentation inst = InstrumentationRegistry.getInstrumentation();
|
||||
if (!(inst instanceof ReactTestFactory)) {
|
||||
return new DefaultReactTestFactory();
|
||||
}
|
||||
return (ReactTestFactory) inst;
|
||||
}
|
||||
|
||||
public static ReactTestFactory.ReactInstanceEasyBuilder catalystInstanceBuilder(
|
||||
|
@ -142,14 +142,15 @@ public class ReactTestHelper {
|
|||
final CatalystInstance instance = builder.build();
|
||||
testCase.initializeWithInstance(instance);
|
||||
instance.runJSBundle();
|
||||
// TODO: re-enable after cleanup of android-x migration
|
||||
// InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
|
||||
// @Override
|
||||
// public void run() {
|
||||
ReactChoreographer.initialize();
|
||||
instance.initialize();
|
||||
// }
|
||||
// });
|
||||
InstrumentationRegistry.getInstrumentation()
|
||||
.runOnMainSync(
|
||||
new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
ReactChoreographer.initialize();
|
||||
instance.initialize();
|
||||
}
|
||||
});
|
||||
testCase.waitForBridgeAndUIIdle();
|
||||
return instance;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче