Fix ChoreographerCallbacksTest
The execute method in ChoreographerCallbacks has been modified to take a
time in nanoseconds as argument and not in milliseconds as before. This
updates the relevant tests.
This also add ChoreographerCallbacksTest and HandlerMessageQueueTest to
the list of tests run after builds on ab/.
Flag: NONE layoutlib for host
Bug: N/A
Test: layoutlib tests
Change-Id: Icdc64ed1906e1f5e0471ba3e07c288a2a4afe517
diff --git a/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java b/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
index 95ec97d..062a274 100644
--- a/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
+++ b/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
@@ -25,6 +25,8 @@
import com.android.layoutlib.bridge.android.DynamicRenderResourcesTest;
import com.android.layoutlib.bridge.impl.LayoutParserWrapperTest;
import com.android.layoutlib.bridge.impl.ResourceHelperTest;
+import com.android.layoutlib.bridge.util.ChoreographerCallbacksTest;
+import com.android.layoutlib.bridge.util.HandlerMessageQueueTest;
import com.android.tools.idea.validator.LayoutValidatorTests;
import com.android.tools.idea.validator.ValidatorResultTests;
import com.android.tools.idea.validator.AccessibilityValidatorTests;
@@ -48,7 +50,7 @@
BridgeContextTest.class, Resources_DelegateTest.class, ShadowsRenderTests.class,
LayoutValidatorTests.class, AccessibilityValidatorTests.class, BridgeTypedArrayTest.class,
ValidatorResultTests.class, BitmapTest.class, DynamicRenderResourcesTest.class,
- AccessibilityTest.class
+ AccessibilityTest.class, ChoreographerCallbacksTest.class, HandlerMessageQueueTest.class
})
public class Main {
}
diff --git a/bridge/tests/src/com/android/layoutlib/bridge/util/ChoreographerCallbacksTest.java b/bridge/tests/src/com/android/layoutlib/bridge/util/ChoreographerCallbacksTest.java
index c0c7ec2..8ee5c31 100644
--- a/bridge/tests/src/com/android/layoutlib/bridge/util/ChoreographerCallbacksTest.java
+++ b/bridge/tests/src/com/android/layoutlib/bridge/util/ChoreographerCallbacksTest.java
@@ -24,6 +24,7 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.util.TimeUtils;
import android.view.Choreographer.FrameCallback;
import java.util.ArrayList;
@@ -60,7 +61,7 @@
callbacks.add((Runnable) () -> order.add(2), null, 200);
callbacks.add((FrameCallback) frameTimeNanos -> order.add(1), null, 100);
- callbacks.execute(200, logger);
+ callbacks.execute(200 * TimeUtils.NANOS_PER_MS, logger);
Assert.assertArrayEquals(order.toArray(), new Object[] { 1, 2 });
Assert.assertTrue(logger.errorMessages.isEmpty());
@@ -73,7 +74,7 @@
callbacks.add((Runnable) () -> order.add(2), null, 200);
callbacks.add((FrameCallback) frameTimeNanos -> order.add(1), null, 100);
- callbacks.execute(100, logger);
+ callbacks.execute(100 * TimeUtils.NANOS_PER_MS, logger);
Assert.assertArrayEquals(order.toArray(), new Object[] { 1 });
Assert.assertTrue(logger.errorMessages.isEmpty());
@@ -88,7 +89,7 @@
callbacks.add(runnable, null, 200);
callbacks.add((FrameCallback) frameTimeNanos -> order.add(1), null, 100);
callbacks.remove(runnable, null);
- callbacks.execute(200, logger);
+ callbacks.execute(200 * TimeUtils.NANOS_PER_MS, logger);
Assert.assertArrayEquals(order.toArray(), new Object[] { 1 });
Assert.assertTrue(logger.errorMessages.isEmpty());
@@ -99,7 +100,7 @@
ChoreographerCallbacks callbacks = new ChoreographerCallbacks();
callbacks.add(new Object(), null, 100);
- callbacks.execute(200, logger);
+ callbacks.execute(200 * TimeUtils.NANOS_PER_MS, logger);
Assert.assertFalse(logger.errorMessages.isEmpty());
Assert.assertEquals(logger.errorMessages.get(0), "Unexpected action as Choreographer callback");
@@ -117,7 +118,7 @@
callbacks.add((Runnable) () -> order.add(3), token2, 100);
callbacks.add((Runnable) () -> order.add(4), null, 200);
callbacks.remove(null, token1);
- callbacks.execute(200, logger);
+ callbacks.execute(200 * TimeUtils.NANOS_PER_MS, logger);
Assert.assertArrayEquals(order.toArray(), new Object[] { 3, 4 });
Assert.assertTrue(logger.errorMessages.isEmpty());
