Rendering statistics view (#3322)

Co-authored-by: Bart Louwers <bart@emeel.net>
This commit is contained in:
Adrian Cojocaru
2025-06-03 18:59:51 +03:00
committed by GitHub
parent 3c07cacc4d
commit 2a7249a3b0
81 changed files with 1271 additions and 128 deletions

View File

@@ -122,6 +122,8 @@ add_library(maplibre SHARED
${PROJECT_SOURCE_DIR}/offline/offline_region_error.hpp
${PROJECT_SOURCE_DIR}/offline/offline_region_status.cpp
${PROJECT_SOURCE_DIR}/offline/offline_region_status.hpp
${PROJECT_SOURCE_DIR}/rendering_stats.cpp
${PROJECT_SOURCE_DIR}/rendering_stats.hpp
${PROJECT_SOURCE_DIR}/snapshotter/map_snapshot.cpp
${PROJECT_SOURCE_DIR}/snapshotter/map_snapshot.hpp
${PROJECT_SOURCE_DIR}/snapshotter/map_snapshotter.cpp

View File

@@ -36,11 +36,10 @@ public:
void onDidFinishRenderingFrame(RenderMode mode,
bool repaintNeeded,
bool placementChanged,
double frameEncodingTime,
double frameRenderingTime) override {
const gfx::RenderingStats& stats) override {
void (RendererObserver::*f)(
RenderMode, bool, bool, double, double) = &RendererObserver::onDidFinishRenderingFrame;
delegate.invoke(f, mode, repaintNeeded, placementChanged, frameEncodingTime, frameRenderingTime);
RenderMode, bool, bool, const gfx::RenderingStats&) = &RendererObserver::onDidFinishRenderingFrame;
delegate.invoke(f, mode, repaintNeeded, placementChanged, stats);
}
void onDidFinishRenderingMap() override { delegate.invoke(&RendererObserver::onDidFinishRenderingMap); }

View File

@@ -35,6 +35,7 @@
#include "maplibre.hpp"
#include "native_map_view.hpp"
#include "native_map_options.hpp"
#include "rendering_stats.hpp"
#include "util/tile_server_options.hpp"
#ifndef MBGL_MODULE_OFFLINE_DISABLE
#include "offline/offline_manager.hpp"
@@ -111,6 +112,7 @@ void registerNatives(JavaVM* vm) {
MapRendererRunnable::registerNative(env);
NativeMapView::registerNative(env);
NativeMapOptions::registerNative(env);
RenderingStats::registerNative(env);
// Http
RegisterNativeHTTPRequest(env);

View File

@@ -40,6 +40,7 @@
#include "conversion/collection.hpp"
#include "style/conversion/filter.hpp"
#include "geojson/feature.hpp"
#include "rendering_stats.hpp"
#include "android_renderer_frontend.hpp"
#include "attach_env.hpp"
@@ -187,20 +188,25 @@ void NativeMapView::onWillStartRenderingFrame() {
}
}
void NativeMapView::onDidFinishRenderingFrame(MapObserver::RenderFrameStatus status) {
void NativeMapView::onDidFinishRenderingFrame(const MapObserver::RenderFrameStatus& status) {
assert(vm != nullptr);
android::UniqueEnv _env = android::AttachEnv();
static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
static auto onDidFinishRenderingFrame = javaClass.GetMethod<void(jboolean, jdouble, jdouble)>(
static auto onDidFinishRenderingFrame = javaClass.GetMethod<void(jboolean, jni::Object<RenderingStats>)>(
*_env, "onDidFinishRenderingFrame");
auto weakReference = javaPeer.get(*_env);
if (weakReference) {
if (!renderingStats) {
renderingStats = jni::NewGlobal(*_env, RenderingStats::Create(*_env));
}
RenderingStats::Update(*_env, renderingStats, status.renderingStats);
weakReference.Call(*_env,
onDidFinishRenderingFrame,
(jboolean)(status.mode != MapObserver::RenderMode::Partial),
(jdouble)status.frameEncodingTime,
(jdouble)status.frameRenderingTime);
renderingStats);
}
}
@@ -1272,6 +1278,16 @@ void NativeMapView::triggerRepaint(JNIEnv&) {
map->triggerRepaint();
}
jni::jboolean NativeMapView::isRenderingStatsViewEnabled(JNIEnv&) {
assert(map);
return jni::jboolean(map->isRenderingStatsViewEnabled());
}
void NativeMapView::enableRenderingStatsView(JNIEnv&, jni::jboolean value) {
assert(map);
map->enableRenderingStatsView(value);
}
// Static methods //
void NativeMapView::registerNative(jni::JNIEnv& env) {
@@ -1384,7 +1400,9 @@ void NativeMapView::registerNative(jni::JNIEnv& env) {
METHOD(&NativeMapView::getPrefetchZoomDelta, "nativeGetPrefetchZoomDelta"),
METHOD(&NativeMapView::setTileCacheEnabled, "nativeSetTileCacheEnabled"),
METHOD(&NativeMapView::getTileCacheEnabled, "nativeGetTileCacheEnabled"),
METHOD(&NativeMapView::triggerRepaint, "nativeTriggerRepaint"));
METHOD(&NativeMapView::triggerRepaint, "nativeTriggerRepaint"),
METHOD(&NativeMapView::isRenderingStatsViewEnabled, "nativeIsRenderingStatsViewEnabled"),
METHOD(&NativeMapView::enableRenderingStatsView, "nativeEnableRenderingStatsView"));
}
void NativeMapView::onRegisterShaders(gfx::ShaderRegistry&) {};

View File

@@ -39,6 +39,7 @@ namespace android {
class AndroidRendererFrontend;
class FileSource;
class MapRenderer;
class RenderingStats;
class NativeMapView : public MapObserver {
public:
@@ -62,7 +63,7 @@ public:
void onDidFinishLoadingMap() override;
void onDidFailLoadingMap(MapLoadError, const std::string&) override;
void onWillStartRenderingFrame() override;
void onDidFinishRenderingFrame(MapObserver::RenderFrameStatus) override;
void onDidFinishRenderingFrame(const MapObserver::RenderFrameStatus&) override;
void onWillStartRenderingMap() override;
void onDidFinishRenderingMap(MapObserver::RenderMode) override;
void onDidBecomeIdle() override;
@@ -305,6 +306,9 @@ public:
void triggerRepaint(JNIEnv&);
jni::jboolean isRenderingStatsViewEnabled(JNIEnv&);
void enableRenderingStatsView(JNIEnv&, jni::jboolean);
// Shader compilation
void onRegisterShaders(mbgl::gfx::ShaderRegistry&) override;
void onPreCompileShader(mbgl::shaders::BuiltIn, mbgl::gfx::Backend::Type, const std::string&) override;
@@ -336,6 +340,8 @@ private:
float pixelRatio;
jni::Global<jni::Object<RenderingStats>> renderingStats;
// Minimum texture size according to OpenGL ES 2.0 specification.
int width = 64;
int height = 64;

View File

@@ -0,0 +1,61 @@
#include "rendering_stats.hpp"
namespace mbgl {
namespace android {
void RenderingStats::registerNative(jni::JNIEnv& env) {
jni::Class<RenderingStats>::Singleton(env);
}
jni::Local<jni::Object<RenderingStats>> RenderingStats::Create(jni::JNIEnv& env) {
auto& javaClass = jni::Class<RenderingStats>::Singleton(env);
auto constructor = javaClass.GetConstructor(env);
return javaClass.New(env, constructor);
}
void RenderingStats::Update(jni::JNIEnv& env,
jni::Object<RenderingStats>& javaObject,
const gfx::RenderingStats& stats) {
static auto& javaClass = jni::Class<RenderingStats>::Singleton(env);
#define SetField(name, type) \
static auto name##Field = javaClass.GetField<type>(env, #name); \
javaObject.Set(env, name##Field, static_cast<type>(stats.name));
SetField(encodingTime, jni::jdouble);
SetField(renderingTime, jni::jdouble);
SetField(numFrames, jni::jint);
SetField(numDrawCalls, jni::jint);
SetField(totalDrawCalls, jni::jint);
SetField(numCreatedTextures, jni::jint);
SetField(numActiveTextures, jni::jint);
SetField(numTextureBindings, jni::jint);
SetField(numTextureUpdates, jni::jint);
SetField(textureUpdateBytes, jni::jlong);
SetField(totalBuffers, jni::jlong);
SetField(totalBufferObjs, jni::jlong);
SetField(bufferUpdates, jni::jlong);
SetField(bufferObjUpdates, jni::jlong);
SetField(bufferUpdateBytes, jni::jlong);
SetField(numBuffers, jni::jint);
SetField(numFrameBuffers, jni::jint);
SetField(numIndexBuffers, jni::jint);
SetField(indexUpdateBytes, jni::jlong);
SetField(numVertexBuffers, jni::jint);
SetField(vertexUpdateBytes, jni::jlong);
SetField(numUniformBuffers, jni::jint);
SetField(numUniformUpdates, jni::jint);
SetField(uniformUpdateBytes, jni::jlong);
SetField(memTextures, jni::jint);
SetField(memBuffers, jni::jint);
SetField(memIndexBuffers, jni::jint);
SetField(memVertexBuffers, jni::jint);
SetField(memUniformBuffers, jni::jint);
SetField(stencilClears, jni::jint);
SetField(stencilUpdates, jni::jint);
#undef SetField
}
} // namespace android
} // namespace mbgl

View File

@@ -0,0 +1,22 @@
#pragma once
#include <mbgl/gfx/rendering_stats.hpp>
#include <string>
#include <jni.h>
#include <jni/jni.hpp>
namespace mbgl {
namespace android {
class RenderingStats {
public:
static constexpr auto Name() { return "org/maplibre/android/maps/RenderingStats"; };
static void registerNative(jni::JNIEnv& env);
static jni::Local<jni::Object<RenderingStats>> Create(jni::JNIEnv&);
static void Update(jni::JNIEnv&, jni::Object<RenderingStats>&, const gfx::RenderingStats&);
};
} // namespace android
} // namespace mbgl

View File

@@ -249,6 +249,11 @@ jni::Local<jni::Object<>> SymbolLayer::getTextOptional(jni::JNIEnv& env) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextOptional()));
}
jni::Local<jni::Object<>> SymbolLayer::getSymbolScreenSpace(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getSymbolScreenSpace()));
}
jni::Local<jni::Object<>> SymbolLayer::getIconOpacity(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconOpacity()));
@@ -557,6 +562,7 @@ void SymbolJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
METHOD(&SymbolLayer::getTextAllowOverlap, "nativeGetTextAllowOverlap"),
METHOD(&SymbolLayer::getTextIgnorePlacement, "nativeGetTextIgnorePlacement"),
METHOD(&SymbolLayer::getTextOptional, "nativeGetTextOptional"),
METHOD(&SymbolLayer::getSymbolScreenSpace, "nativeGetSymbolScreenSpace"),
METHOD(&SymbolLayer::getIconOpacityTransition, "nativeGetIconOpacityTransition"),
METHOD(&SymbolLayer::setIconOpacityTransition, "nativeSetIconOpacityTransition"),
METHOD(&SymbolLayer::getIconOpacity, "nativeGetIconOpacity"),

View File

@@ -110,6 +110,8 @@ public:
jni::Local<jni::Object<jni::ObjectTag>> getTextOptional(jni::JNIEnv&);
jni::Local<jni::Object<jni::ObjectTag>> getSymbolScreenSpace(jni::JNIEnv&);
jni::Local<jni::Object<jni::ObjectTag>> getIconOpacity(jni::JNIEnv&);
void setIconOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay);
jni::Local<jni::Object<TransitionOptions>> getIconOpacityTransition(jni::JNIEnv&);

View File

@@ -23,6 +23,8 @@ class MapChangeReceiver implements NativeMapView.StateCallback {
= new CopyOnWriteArrayList<>();
private final List<MapView.OnDidFinishRenderingFrameListener> onDidFinishRenderingFrameList
= new CopyOnWriteArrayList<>();
private final List<MapView.OnDidFinishRenderingFrameWithStatsListener> onDidFinishRenderingFrameWithStatsList
= new CopyOnWriteArrayList<>();
private final List<MapView.OnWillStartRenderingMapListener> onWillStartRenderingMapListenerList
= new CopyOnWriteArrayList<>();
private final List<MapView.OnDidFinishRenderingMapListener> onDidFinishRenderingMapListenerList
@@ -156,11 +158,17 @@ class MapChangeReceiver implements NativeMapView.StateCallback {
}
@Override
public void onDidFinishRenderingFrame(boolean fully, double frameEncodingTime, double frameRenderingTime) {
public void onDidFinishRenderingFrame(boolean fully, RenderingStats stats) {
try {
if (!onDidFinishRenderingFrameList.isEmpty()) {
for (MapView.OnDidFinishRenderingFrameListener listener : onDidFinishRenderingFrameList) {
listener.onDidFinishRenderingFrame(fully, frameEncodingTime, frameRenderingTime);
listener.onDidFinishRenderingFrame(fully, stats.encodingTime, stats.renderingTime);
}
}
if (!onDidFinishRenderingFrameWithStatsList.isEmpty()) {
for (MapView.OnDidFinishRenderingFrameWithStatsListener listener : onDidFinishRenderingFrameWithStatsList) {
listener.onDidFinishRenderingFrame(fully, stats);
}
}
} catch (Throwable err) {
@@ -480,6 +488,14 @@ class MapChangeReceiver implements NativeMapView.StateCallback {
onDidFinishRenderingFrameList.remove(listener);
}
void addOnDidFinishRenderingFrameListener(MapView.OnDidFinishRenderingFrameWithStatsListener listener) {
onDidFinishRenderingFrameWithStatsList.add(listener);
}
void removeOnDidFinishRenderingFrameListener(MapView.OnDidFinishRenderingFrameWithStatsListener listener) {
onDidFinishRenderingFrameWithStatsList.remove(listener);
}
void addOnWillStartRenderingMapListener(MapView.OnWillStartRenderingMapListener listener) {
onWillStartRenderingMapListenerList.add(listener);
}

View File

@@ -103,6 +103,20 @@ public final class MapLibreMap {
nativeMapView.triggerRepaint();
}
/**
* Query rendering statistics overlay status.
*/
public boolean isRenderingStatsViewEnabled() {
return nativeMapView.isRenderingStatsViewEnabled();
}
/**
* Enable rendering statistics overlay with {@link RenderingStats} values.
*/
public void enableRenderingStatsView(boolean value) {
nativeMapView.enableRenderingStatsView(value);
}
public void setSwapBehaviorFlush(boolean flush) {
nativeMapView.setSwapBehaviorFlush(flush);
}

View File

@@ -763,6 +763,24 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
mapChangeReceiver.removeOnDidFinishRenderingFrameListener(listener);
}
/**
* Set a callback that's invoked when the map has finished rendering a frame.
*
* @param listener The callback that's invoked when the map has finished rendering a frame
*/
public void addOnDidFinishRenderingFrameListener(@NonNull OnDidFinishRenderingFrameWithStatsListener listener) {
mapChangeReceiver.addOnDidFinishRenderingFrameListener(listener);
}
/**
* Set a callback that's invoked when the map has finished rendering a frame.
*
* @param listener The callback that's invoked when the map has finished rendering a frame
*/
public void removeOnDidFinishRenderingFrameListener(@NonNull OnDidFinishRenderingFrameWithStatsListener listener) {
mapChangeReceiver.removeOnDidFinishRenderingFrameListener(listener);
}
/**
* Set a callback that's invoked when the map will start rendering.
*
@@ -1182,14 +1200,34 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
* </p>
*/
public interface OnDidFinishRenderingFrameListener {
/**
* Called when the map has finished rendering a frame
*
* @param fully true if all frames have been rendered, false if partially rendered
* @param frameEncodingTime CPU encoding time
* @param frameRenderingTime CPU rendering time
*/
void onDidFinishRenderingFrame(boolean fully, double frameEncodingTime, double frameRenderingTime);
}
/**
* Interface definition for a callback to be invoked when the map finished rendering a frame.
* <p>
* {@link MapView#addOnDidFinishRenderingFrameListener(OnDidFinishRenderingFrameListener)}
* </p>
*/
public interface OnDidFinishRenderingFrameWithStatsListener {
/**
* Called when the map has finished rendering a frame
*
* @param fully true if all frames have been rendered, false if partially rendered
* @param stats rendering statistics
*/
void onDidFinishRenderingFrame(boolean fully, RenderingStats stats);
}
/**
* Interface definition for a callback to be invoked when the map will start rendering the map.
* <p>
@@ -1528,7 +1566,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
* The initial render callback waits for rendering to happen before making the map visible for end-users.
* We wait for the second DID_FINISH_RENDERING_FRAME map change event as the first will still show a black surface.
*/
private class InitialRenderCallback implements OnDidFinishRenderingFrameListener {
private class InitialRenderCallback implements OnDidFinishRenderingFrameWithStatsListener {
private int renderCount;
@@ -1537,7 +1575,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
}
@Override
public void onDidFinishRenderingFrame(boolean fully, double frameEncodingTime, double frameRenderingTime) {
public void onDidFinishRenderingFrame(boolean fully, RenderingStats stats) {
if (maplibreMap != null && maplibreMap.getStyle() != null && maplibreMap.getStyle().isFullyLoaded()) {
renderCount++;
if (renderCount == 3) {
@@ -1643,7 +1681,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
}
private class MapCallback implements OnDidFinishLoadingStyleListener,
OnDidFinishRenderingFrameListener, OnDidFinishLoadingMapListener,
OnDidFinishRenderingFrameWithStatsListener, OnDidFinishLoadingMapListener,
OnCameraIsChangingListener, OnCameraDidChangeListener, OnDidFailLoadingMapListener {
private final List<OnMapReadyCallback> onMapReadyCallbackList = new ArrayList<>();
@@ -1709,7 +1747,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
}
@Override
public void onDidFinishRenderingFrame(boolean fully, double frameEncodingTime, double frameRenderingTime) {
public void onDidFinishRenderingFrame(boolean fully, RenderingStats stats) {
if (maplibreMap != null) {
maplibreMap.onUpdateFullyRendered();
}

View File

@@ -250,6 +250,10 @@ interface NativeMap {
void triggerRepaint();
boolean isRenderingStatsViewEnabled();
void enableRenderingStatsView(boolean value);
void setSwapBehaviorFlush(boolean flush);
//

View File

@@ -1075,6 +1075,16 @@ final class NativeMapView implements NativeMap {
nativeTriggerRepaint();
}
@Override
public boolean isRenderingStatsViewEnabled() {
return nativeIsRenderingStatsViewEnabled();
}
@Override
public void enableRenderingStatsView(boolean value) {
nativeEnableRenderingStatsView(value);
}
@Override
public void setSwapBehaviorFlush(boolean flush) {
mapRenderer.setSwapBehaviorFlush(flush);
@@ -1145,9 +1155,9 @@ final class NativeMapView implements NativeMap {
}
@Keep
private void onDidFinishRenderingFrame(boolean fully, double frameEncodingTime, double frameRenderingTime) {
private void onDidFinishRenderingFrame(boolean fully, RenderingStats stats) {
if (stateCallback != null) {
stateCallback.onDidFinishRenderingFrame(fully, frameEncodingTime, frameRenderingTime);
stateCallback.onDidFinishRenderingFrame(fully, stats);
}
}
@@ -1642,6 +1652,12 @@ final class NativeMapView implements NativeMap {
@Keep
private native void nativeTriggerRepaint();
@Keep
private native boolean nativeIsRenderingStatsViewEnabled();
@Keep
private native void nativeEnableRenderingStatsView(boolean enabled);
//
// Snapshot
//
@@ -1719,7 +1735,7 @@ final class NativeMapView implements NativeMap {
void onWillStartRenderingFrame();
void onDidFinishRenderingFrame(boolean fully, double frameEncodingTime, double frameRenderingTime);
void onDidFinishRenderingFrame(boolean fully, RenderingStats stats);
void onWillStartRenderingMap();

View File

@@ -0,0 +1,75 @@
package org.maplibre.android.maps;
public class RenderingStats {
/// Frame CPU encoding time (milliseconds)
public double encodingTime = 0.0;
/// Frame CPU rendering time (milliseconds)
public double renderingTime = 0.0;
/// Number of frames rendered
public int numFrames = 0;
/// Number of draw calls (`glDrawElements`, `drawIndexedPrimitives`, etc.) executed during the most recent frame
public int numDrawCalls = 0;
/// Total number of draw calls executed during all the frames
public int totalDrawCalls = 0;
/// Total number of textures created
public int numCreatedTextures = 0;
/// Net textures
public int numActiveTextures = 0;
/// Net texture bindings
public int numTextureBindings = 0;
/// Number of times a texture was updated
public int numTextureUpdates = 0;
/// Number of bytes used in texture updates
public long textureUpdateBytes = 0;
/// Number of buffers created
public long totalBuffers = 0;
/// Number of SDK-specific buffers created
public long totalBufferObjs = 0;
/// Number of times a buffer is updated
public long bufferUpdates = 0;
/// Number of times an SDK-specific buffer is updated
public long bufferObjUpdates = 0;
/// Sum of update sizes
public long bufferUpdateBytes = 0;
/// Number of active buffers
public int numBuffers = 0;
/// Number of active offscreen frame buffers
public int numFrameBuffers = 0;
/// Number of active index buffers
public int numIndexBuffers = 0;
/// Sum of index buffers update sizes
public long indexUpdateBytes = 0;
/// Number of active vertex buffers
public int numVertexBuffers = 0;
/// Sum of vertex buffers update sizes
public long vertexUpdateBytes = 0;
/// Number of active uniform buffers
public int numUniformBuffers = 0;
/// Number of times a uniform buffer is updated
public int numUniformUpdates = 0;
/// Sum of uniform buffers update sizes
public long uniformUpdateBytes = 0;
/// Total texture memory
public int memTextures = 0;
/// Total buffer memory
public int memBuffers = 0;
/// Total index buffer memory
public int memIndexBuffers = 0;
/// Total vertex buffer memory
public int memVertexBuffers = 0;
/// Total uniform buffer memory
public int memUniformBuffers = 0;
/// Number of stencil buffer clears
public int stencilClears = 0;
/// Number of stencil buffer updates
public int stencilUpdates = 0;
}

View File

@@ -2651,6 +2651,26 @@ The unit is in density-independent pixels only for SDF sprites that were created
return new LayoutPropertyValue<>("text-optional", value);
}
/**
* Internal use only
*
* @param value a Boolean value
* @return property wrapper around Boolean
*/
public static PropertyValue<Boolean> symbolScreenSpace(Boolean value) {
return new LayoutPropertyValue<>("symbol-screen-space", value);
}
/**
* Internal use only
*
* @param value a Boolean value
* @return property wrapper around Boolean
*/
public static PropertyValue<Expression> symbolScreenSpace(Expression value) {
return new LayoutPropertyValue<>("symbol-screen-space", value);
}
/**
* Sorts features in ascending order based on this value. Features with a higher sort key will appear above features with a lower sort key.
*

View File

@@ -649,6 +649,18 @@ public class SymbolLayer extends Layer {
return (PropertyValue<Boolean>) new PropertyValue("text-optional", nativeGetTextOptional());
}
/**
* Get the SymbolScreenSpace property
*
* @return property wrapper value around Boolean
*/
@NonNull
@SuppressWarnings("unchecked")
public PropertyValue<Boolean> getSymbolScreenSpace() {
checkThread();
return (PropertyValue<Boolean>) new PropertyValue("symbol-screen-space", nativeGetSymbolScreenSpace());
}
/**
* Get the IconOpacity property
*
@@ -1305,6 +1317,10 @@ public class SymbolLayer extends Layer {
@Keep
private native Object nativeGetTextOptional();
@NonNull
@Keep
private native Object nativeGetSymbolScreenSpace();
@NonNull
@Keep
private native Object nativeGetIconOpacity();

View File

@@ -42,6 +42,9 @@ class MapChangeReceiverTest {
@Mock
private val onDidFinishRenderingFrameListener: OnDidFinishRenderingFrameListener? = null
@Mock
private val onDidFinishRenderingFrameWithStatsListener: OnDidFinishRenderingFrameWithStatsListener? = null
@Mock
private val onWillStartRenderingMapListener: OnWillStartRenderingMapListener? = null
@@ -401,13 +404,13 @@ class MapChangeReceiverTest {
mapChangeEventManager!!.addOnDidFinishRenderingFrameListener(
onDidFinishRenderingFrameListener
)
mapChangeEventManager!!?.onDidFinishRenderingFrame(true, .0, .0)
mapChangeEventManager!!?.onDidFinishRenderingFrame(true, TEST_RENDERING_STATS)
Mockito.verify(onDidFinishRenderingFrameListener)?.onDidFinishRenderingFrame(true, .0, .0)
mapChangeEventManager!!.removeOnDidFinishRenderingFrameListener(
onDidFinishRenderingFrameListener
)
mapChangeEventManager!!?.onDidFinishRenderingFrame(true, .0, .0)
Mockito.verify(onDidFinishRenderingFrameListener)?.onDidFinishRenderingFrame(true,.0, .0)
mapChangeEventManager!!?.onDidFinishRenderingFrame(true, TEST_RENDERING_STATS)
Mockito.verify(onDidFinishRenderingFrameListener)?.onDidFinishRenderingFrame(true, .0, .0)
mapChangeEventManager!!.addOnDidFinishRenderingFrameListener(
onDidFinishRenderingFrameListener
)
@@ -416,7 +419,7 @@ class MapChangeReceiverTest {
Mockito.doThrow(exc).`when`(onDidFinishRenderingFrameListener)
?.onDidFinishRenderingFrame(true, .0, .0)
try {
mapChangeEventManager!!?.onDidFinishRenderingFrame(true, .0, .0)
mapChangeEventManager!!?.onDidFinishRenderingFrame(true, TEST_RENDERING_STATS)
Assert.fail("The exception should've been re-thrown.")
} catch (throwable: RuntimeException) {
Mockito.verify(loggerDefinition)?.e(
@@ -429,7 +432,51 @@ class MapChangeReceiverTest {
Mockito.doThrow(err).`when`(onDidFinishRenderingFrameListener)
?.onDidFinishRenderingFrame(true, .0, .0)
try {
mapChangeEventManager!!?.onDidFinishRenderingFrame(true, .0, .0)
mapChangeEventManager!!?.onDidFinishRenderingFrame(true, TEST_RENDERING_STATS)
Assert.fail("The exception should've been re-thrown.")
} catch (throwable: ExecutionError) {
Mockito.verify(loggerDefinition)?.e(
ArgumentMatchers.anyString(),
ArgumentMatchers.anyString(),
ArgumentMatchers.eq(err)
)
}
}
@Test
fun testOnDidFinishRenderingFrameWithStatsListener() {
mapChangeEventManager!!.addOnDidFinishRenderingFrameListener(
onDidFinishRenderingFrameWithStatsListener
)
mapChangeEventManager!!?.onDidFinishRenderingFrame(true, TEST_RENDERING_STATS)
Mockito.verify(onDidFinishRenderingFrameWithStatsListener)?.onDidFinishRenderingFrame(true, TEST_RENDERING_STATS)
mapChangeEventManager!!.removeOnDidFinishRenderingFrameListener(
onDidFinishRenderingFrameWithStatsListener
)
mapChangeEventManager!!?.onDidFinishRenderingFrame(true, TEST_RENDERING_STATS)
Mockito.verify(onDidFinishRenderingFrameWithStatsListener)?.onDidFinishRenderingFrame(true, TEST_RENDERING_STATS)
mapChangeEventManager!!.addOnDidFinishRenderingFrameListener(
onDidFinishRenderingFrameWithStatsListener
)
Logger.setLoggerDefinition(loggerDefinition)
val exc: Exception = RuntimeException()
Mockito.doThrow(exc).`when`(onDidFinishRenderingFrameWithStatsListener)
?.onDidFinishRenderingFrame(true, TEST_RENDERING_STATS)
try {
mapChangeEventManager!!?.onDidFinishRenderingFrame(true, TEST_RENDERING_STATS)
Assert.fail("The exception should've been re-thrown.")
} catch (throwable: RuntimeException) {
Mockito.verify(loggerDefinition)?.e(
ArgumentMatchers.anyString(),
ArgumentMatchers.anyString(),
ArgumentMatchers.eq(exc)
)
}
val err: Error = ExecutionError("", Error())
Mockito.doThrow(err).`when`(onDidFinishRenderingFrameWithStatsListener)
?.onDidFinishRenderingFrame(true, TEST_RENDERING_STATS)
try {
mapChangeEventManager!!?.onDidFinishRenderingFrame(true, TEST_RENDERING_STATS)
Assert.fail("The exception should've been re-thrown.")
} catch (throwable: ExecutionError) {
Mockito.verify(loggerDefinition)?.e(
@@ -445,12 +492,12 @@ class MapChangeReceiverTest {
mapChangeEventManager!!.addOnDidFinishRenderingFrameListener(
onDidFinishRenderingFrameListener
)
mapChangeEventManager!!?.onDidFinishRenderingFrame(false, .0, .0)
mapChangeEventManager!!?.onDidFinishRenderingFrame(false, TEST_RENDERING_STATS)
Mockito.verify(onDidFinishRenderingFrameListener)?.onDidFinishRenderingFrame(false, .0, .0)
mapChangeEventManager!!.removeOnDidFinishRenderingFrameListener(
onDidFinishRenderingFrameListener
)
mapChangeEventManager!!?.onDidFinishRenderingFrame(false, .0, .0)
mapChangeEventManager!!?.onDidFinishRenderingFrame(false, TEST_RENDERING_STATS)
Mockito.verify(onDidFinishRenderingFrameListener)?.onDidFinishRenderingFrame(false, .0, .0)
mapChangeEventManager!!.addOnDidFinishRenderingFrameListener(
onDidFinishRenderingFrameListener
@@ -460,7 +507,7 @@ class MapChangeReceiverTest {
Mockito.doThrow(exc).`when`(onDidFinishRenderingFrameListener)
?.onDidFinishRenderingFrame(false, .0, .0)
try {
mapChangeEventManager!!?.onDidFinishRenderingFrame(false, .0, .0)
mapChangeEventManager!!?.onDidFinishRenderingFrame(false, TEST_RENDERING_STATS)
Assert.fail("The exception should've been re-thrown.")
} catch (throwable: RuntimeException) {
Mockito.verify(loggerDefinition)?.e(
@@ -473,7 +520,7 @@ class MapChangeReceiverTest {
Mockito.doThrow(err).`when`(onDidFinishRenderingFrameListener)
?.onDidFinishRenderingFrame(false, .0, .0)
try {
mapChangeEventManager!!?.onDidFinishRenderingFrame(false, .0, .0)
mapChangeEventManager!!?.onDidFinishRenderingFrame(false, TEST_RENDERING_STATS)
Assert.fail("The exception should've been re-thrown.")
} catch (throwable: ExecutionError) {
Mockito.verify(loggerDefinition)?.e(
@@ -710,5 +757,6 @@ class MapChangeReceiverTest {
companion object {
private const val TEST_STRING = "mapChangeRandom"
private val TEST_RENDERING_STATS = RenderingStats();
}
}