From 8ec13c306c155d9320221d34309f08c2baf507bf Mon Sep 17 00:00:00 2001 From: Spencer Ahrens Date: Mon, 8 Apr 2019 23:03:26 -0700 Subject: [PATCH] Fix tests with JavaOnlyMap Summary: Need to force the double thing in more places. Reviewed By: cpojer Differential Revision: D14835792 fbshipit-source-id: fb7a5435675b322d5fbbe9858e08804e9abe65db --- .../facebook/react/bridge/JavaOnlyArray.java | 2 +- .../facebook/react/bridge/JavaOnlyMap.java | 2 +- .../modules/timing/TimingModuleTest.java | 24 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java index 0c98a91d7..1b3774d7f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java @@ -156,7 +156,7 @@ public class JavaOnlyArray implements ReadableArray, WritableArray { @Override public void pushInt(int value) { - mBackingList.add(value); + mBackingList.add(new Double(value)); } @Override diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java index 119890a20..139f82461 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java @@ -183,7 +183,7 @@ public class JavaOnlyMap implements ReadableMap, WritableMap { @Override public void putInt(@Nonnull String key, int value) { - mBackingMap.put(key, value); + mBackingMap.put(key, new Double(value)); } @Override diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java index a7a18cde6..ef4c60fa0 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java +++ b/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java @@ -129,7 +129,7 @@ public class TimingModuleTest { mTiming.onHostResume(); mTiming.createTimer(1, 1, 0, false); stepChoreographerFrame(); - verify(mJSTimersMock).callTimers(JavaOnlyArray.of(1)); + verify(mJSTimersMock).callTimers(JavaOnlyArray.of(1.0)); reset(mJSTimersMock); stepChoreographerFrame(); verifyNoMoreInteractions(mJSTimersMock); @@ -140,11 +140,11 @@ public class TimingModuleTest { mTiming.createTimer(100, 1, 0, true); mTiming.onHostResume(); stepChoreographerFrame(); - verify(mJSTimersMock).callTimers(JavaOnlyArray.of(100)); + verify(mJSTimersMock).callTimers(JavaOnlyArray.of(100.0)); reset(mJSTimersMock); stepChoreographerFrame(); - verify(mJSTimersMock).callTimers(JavaOnlyArray.of(100)); + verify(mJSTimersMock).callTimers(JavaOnlyArray.of(100.0)); } @Test @@ -153,7 +153,7 @@ public class TimingModuleTest { mTiming.createTimer(105, 1, 0, true); stepChoreographerFrame(); - verify(mJSTimersMock).callTimers(JavaOnlyArray.of(105)); + verify(mJSTimersMock).callTimers(JavaOnlyArray.of(105.0)); reset(mJSTimersMock); mTiming.deleteTimer(105); @@ -167,7 +167,7 @@ public class TimingModuleTest { mTiming.createTimer(41, 1, 0, true); stepChoreographerFrame(); - verify(mJSTimersMock).callTimers(JavaOnlyArray.of(41)); + verify(mJSTimersMock).callTimers(JavaOnlyArray.of(41.0)); reset(mJSTimersMock); mTiming.onHostPause(); @@ -177,7 +177,7 @@ public class TimingModuleTest { reset(mJSTimersMock); mTiming.onHostResume(); stepChoreographerFrame(); - verify(mJSTimersMock).callTimers(JavaOnlyArray.of(41)); + verify(mJSTimersMock).callTimers(JavaOnlyArray.of(41.0)); } @Test @@ -187,7 +187,7 @@ public class TimingModuleTest { mTiming.createTimer(41, 1, 0, true); stepChoreographerFrame(); - verify(mJSTimersMock).callTimers(JavaOnlyArray.of(41)); + verify(mJSTimersMock).callTimers(JavaOnlyArray.of(41.0)); reset(mJSTimersMock); mTiming.onHeadlessJsTaskFinish(42); @@ -202,12 +202,12 @@ public class TimingModuleTest { mTiming.createTimer(41, 1, 0, true); stepChoreographerFrame(); - verify(mJSTimersMock).callTimers(JavaOnlyArray.of(41)); + verify(mJSTimersMock).callTimers(JavaOnlyArray.of(41.0)); reset(mJSTimersMock); mTiming.onHeadlessJsTaskFinish(42); stepChoreographerFrame(); - verify(mJSTimersMock).callTimers(JavaOnlyArray.of(41)); + verify(mJSTimersMock).callTimers(JavaOnlyArray.of(41.0)); reset(mJSTimersMock); mTiming.onHostPause(); @@ -222,13 +222,13 @@ public class TimingModuleTest { mTiming.onHostPause(); stepChoreographerFrame(); - verify(mJSTimersMock).callTimers(JavaOnlyArray.of(41)); + verify(mJSTimersMock).callTimers(JavaOnlyArray.of(41.0)); reset(mJSTimersMock); mTiming.onHostResume(); mTiming.onHeadlessJsTaskFinish(42); stepChoreographerFrame(); - verify(mJSTimersMock).callTimers(JavaOnlyArray.of(41)); + verify(mJSTimersMock).callTimers(JavaOnlyArray.of(41.0)); reset(mJSTimersMock); mTiming.onHostPause(); @@ -239,7 +239,7 @@ public class TimingModuleTest { @Test public void testSetTimeoutZero() { mTiming.createTimer(100, 0, 0, false); - verify(mJSTimersMock).callTimers(JavaOnlyArray.of(100)); + verify(mJSTimersMock).callTimers(JavaOnlyArray.of(100.0)); } @Test