fix runtime tests

brnkhy · brnkhy · commit b6b0fee69909 · 2025-04-21T16:47:14.000+03:00
fix data fetching manager and cache manager to invoke callbacks in failures to complete the call
change file cache and move file saving call into a try/catch block in case of IO failures
add a basic nullcheck to vector layer module script for missing unity references
fix jump method buttons in debug scene
diff --git a/Runtime/Mapbox/BaseModule/Data/DataFetchers/DataFetchingManager.cs b/Runtime/Mapbox/BaseModule/Data/DataFetchers/DataFetchingManager.cs
@@ -78,6 +78,7 @@ private IEnumerator UpdateTick()
 					{
 						_fetchQueue.Dequeue();
 						FetchCancelled(info);
+						info.Callback(new DataFetchingResult() { State = WebResponseResult.Cancelled });
 						continue;
 					}
 
diff --git a/Runtime/Mapbox/BaseModule/Data/Platform/Cache/FileCache.cs b/Runtime/Mapbox/BaseModule/Data/Platform/Cache/FileCache.cs
@@ -189,12 +189,9 @@ public virtual HashSet<string> GetFileList()
 					}
 				}
 			}
-
 			return pathList;
 		}
 
-		
-
 		protected virtual void SaveInfo(InfoWrapper info)
 		{
 			if (info.TextureCacheItem == null)
@@ -217,19 +214,26 @@ protected virtual void SaveInfo(InfoWrapper info)
 				TilesetId = info.TextureCacheItem.TilesetId,
 				Action = () =>
 				{
-					var fullPath = RelativeFilePathToFileInfoExpects(info.Path);
-					FileStream sourceStream = new FileStream(
-						RelativeFilePathToFileInfoExpects(info.Path),
-						FileMode.Create, FileAccess.Write, FileShare.Read,
-						bufferSize: 4096, useAsync: false);
-
-					sourceStream.Write(info.TextureCacheItem.Data, 0, info.TextureCacheItem.Data.Length);
-					sourceStream.Close();
-
-					var finalRelativePath = FullFilePathToRelativePath(fullPath);
-					info.PostSaveAction(finalRelativePath);
-					//Debug.Log(string.Format("File saved {0} - {1}", info.TextureCacheItem.TileId, info.Path));
-					OnFileSaved(info.TextureCacheItem, finalRelativePath);
+					try
+					{
+						var fullPath = RelativeFilePathToFileInfoExpects(info.Path);
+						FileStream sourceStream = new FileStream(
+							RelativeFilePathToFileInfoExpects(info.Path),
+							FileMode.Create, FileAccess.Write, FileShare.Read,
+							bufferSize: 4096, useAsync: false);
+
+						sourceStream.Write(info.TextureCacheItem.Data, 0, info.TextureCacheItem.Data.Length);
+						sourceStream.Close();
+
+						var finalRelativePath = FullFilePathToRelativePath(fullPath);
+						info.PostSaveAction(finalRelativePath);
+						//Debug.Log(string.Format("File saved {0} - {1}", info.TextureCacheItem.TileId, info.Path));
+						OnFileSaved(info.TextureCacheItem, finalRelativePath);
+					}
+					catch (Exception e)
+					{
+						Debug.LogException(e);
+					}
 				},
 				ContinueWith = (t) =>
 				{
diff --git a/Runtime/Mapbox/BaseModule/Data/Platform/Cache/MapboxCacheManager.cs b/Runtime/Mapbox/BaseModule/Data/Platform/Cache/MapboxCacheManager.cs
@@ -138,6 +138,7 @@ public void SaveImage(RasterData textureCacheItem, bool forceInsert)
             }
             else
             {
+                callback?.Invoke(null);
                 return null;
             }
         }
diff --git a/Runtime/Mapbox/MapDebug/Scenes/LocationGame.unity b/Runtime/Mapbox/MapDebug/Scenes/LocationGame.unity
@@ -373,7 +373,7 @@ MonoBehaviour:
       m_Calls:
       - m_Target: {fileID: 49602455}
         m_TargetAssemblyTypeName: EventTest, Assembly-CSharp
-        m_MethodName: JumpSF
+        m_MethodName: Jump
         m_Mode: 5
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -1517,7 +1517,7 @@ MonoBehaviour:
       m_Calls:
       - m_Target: {fileID: 49602455}
         m_TargetAssemblyTypeName: EventTest, Assembly-CSharp
-        m_MethodName: JumpSF
+        m_MethodName: Jump
         m_Mode: 5
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
diff --git a/Runtime/Mapbox/VectorModule/Unity/VectorLayerModuleScript.cs b/Runtime/Mapbox/VectorModule/Unity/VectorLayerModuleScript.cs
@@ -26,6 +26,7 @@ public override ILayerModule ConstructModule(MapService service, IMapInformation
 			var dictionary = new Dictionary<string, IVectorLayerVisualizer>();
 			foreach (var visualizerObject in _layerVisualizers)
 			{
+				if(visualizerObject == null) continue;
 				var visualizer = visualizerObject.ConstructLayerVisualizer(mapInformation, unityContext);
 				dictionary.Add(visualizer.VectorLayerName, visualizer);
 			}
diff --git a/Tests/Runtime/BaseModule/LocationGamePrefabTests.cs b/Tests/Runtime/BaseModule/LocationGamePrefabTests.cs
@@ -36,7 +36,7 @@ public IEnumerator FindAndRegisterToMapNoInitialize()
             void OnMapCoreInitialized(MapboxMap mapboxMap)
             {
                 _map = mapboxMap;
-                _map.OnFirstViewCompleted += () => _firstViewLoaded = true;
+                _map.LoadViewCompleted += () => _firstViewLoaded = true;
                 Assert.IsNotNull(mapboxMap);
             }
 
@@ -58,15 +58,15 @@ void OnMapCoreInitialized(MapboxMap mapboxMap)
             {
                 if (mapboxMap == null) throw new ArgumentNullException(nameof(mapboxMap));
                 _map = mapboxMap;
-                _map.OnFirstViewCompleted += () => _firstViewLoaded = true;
+                _map.LoadViewCompleted += () => _firstViewLoaded = true;
                 Assert.IsNotNull(mapboxMap);
             }
 
             _mapCore.Initialized += OnMapCoreInitialized;
 
             _mapCore.Initialize();
         
-            while(_mapCore.InitializationStatus < InitializationStatus.ViewLoaded) yield return null;
+            while(_mapCore.InitializationStatus < InitializationStatus.ReadyForUpdates) yield return null;
         
             Assert.IsNotNull(_map);
             Assert.IsTrue(_map.Status > InitializationStatus.Initialized);
diff --git a/Tests/Runtime/BaseModule/MapboxMapTests.cs b/Tests/Runtime/BaseModule/MapboxMapTests.cs
@@ -118,22 +118,16 @@ public IEnumerator TileJson()
         }
 
         [UnityTest]
-        public IEnumerator LoadMapView()
+        public IEnumerator LoadMapIntoMemory()
         {
             var mapLoaded = false;
-            var firstViewCompletedEventFired = false;
-            _map.OnFirstViewCompleted += () => { firstViewCompletedEventFired = true; };
-            
             var coroutine = Runnable.Instance.StartCoroutine(_map.LoadMapViewCoroutine(() =>
             {
                 mapLoaded = true;
             }));
             while(mapLoaded == false) yield return null;
             
             Assert.IsTrue(mapLoaded);
-            Assert.IsTrue(firstViewCompletedEventFired);
-            Assert.IsTrue(_map.Status > InitializationStatus.Initialized);
-            Assert.IsNotEmpty(_map.TileCover.Tiles);
         }
 
         [Test]
@@ -188,7 +182,6 @@ public IEnumerator VectorFetching()
             Assert.NotNull(tile);
             Assert.NotNull(tile.ByteData);
             Assert.IsNotEmpty(tile.ByteData);
-            Assert.AreEqual(_datafetcher.TotalRequestCount, 0);
         }
         
         
@@ -201,13 +194,11 @@ public IEnumerator VectorFetchingCancelled()
             {
                 isDone = true;
             }));
-            Assert.AreEqual(_datafetcher.TotalRequestCount, 1);
-            _datafetcher.CancelFetching(tile, _tilesetId);
+            tile.Cancel();
             while (isDone == false) yield return null;
             
             Assert.NotNull(tile);
             Assert.AreEqual(tile.CurrentTileState, TileState.Canceled);
-            Assert.AreEqual(_datafetcher.TotalRequestCount, 0);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ private IEnumerator UpdateTick()`
`78`	`78`	`{`
`79`	`79`	`_fetchQueue.Dequeue();`
`80`	`80`	`FetchCancelled(info);`
	`81`	`+ info.Callback(new DataFetchingResult() { State = WebResponseResult.Cancelled });`
`81`	`82`	`continue;`
`82`	`83`	`}`
`83`	`84`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,7 @@ public void SaveImage(RasterData textureCacheItem, bool forceInsert)`
`138`	`138`	`}`
`139`	`139`	`else`
`140`	`140`	`{`
	`141`	`+ callback?.Invoke(null);`
`141`	`142`	`return null;`
`142`	`143`	`}`
`143`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public override ILayerModule ConstructModule(MapService service, IMapInformation`
`26`	`26`	`var dictionary = new Dictionary<string, IVectorLayerVisualizer>();`
`27`	`27`	`foreach (var visualizerObject in _layerVisualizers)`
`28`	`28`	`{`
	`29`	`+ if(visualizerObject == null) continue;`
`29`	`30`	`var visualizer = visualizerObject.ConstructLayerVisualizer(mapInformation, unityContext);`
`30`	`31`	`dictionary.Add(visualizer.VectorLayerName, visualizer);`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public IEnumerator FindAndRegisterToMapNoInitialize()`
`36`	`36`	`void OnMapCoreInitialized(MapboxMap mapboxMap)`
`37`	`37`	`{`
`38`	`38`	`_map = mapboxMap;`
`39`		`- _map.OnFirstViewCompleted += () => _firstViewLoaded = true;`
	`39`	`+ _map.LoadViewCompleted += () => _firstViewLoaded = true;`
`40`	`40`	`Assert.IsNotNull(mapboxMap);`
`41`	`41`	`}`
`42`	`42`
`@@ -58,15 +58,15 @@ void OnMapCoreInitialized(MapboxMap mapboxMap)`
`58`	`58`	`{`
`59`	`59`	`if (mapboxMap == null) throw new ArgumentNullException(nameof(mapboxMap));`
`60`	`60`	`_map = mapboxMap;`
`61`		`- _map.OnFirstViewCompleted += () => _firstViewLoaded = true;`
	`61`	`+ _map.LoadViewCompleted += () => _firstViewLoaded = true;`
`62`	`62`	`Assert.IsNotNull(mapboxMap);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`_mapCore.Initialized += OnMapCoreInitialized;`
`66`	`66`
`67`	`67`	`_mapCore.Initialize();`
`68`	`68`
`69`		`- while(_mapCore.InitializationStatus < InitializationStatus.ViewLoaded) yield return null;`
	`69`	`+ while(_mapCore.InitializationStatus < InitializationStatus.ReadyForUpdates) yield return null;`
`70`	`70`
`71`	`71`	`Assert.IsNotNull(_map);`
`72`	`72`	`Assert.IsTrue(_map.Status > InitializationStatus.Initialized);`
Original file line number	Diff line number	Diff line change
`@@ -118,22 +118,16 @@ public IEnumerator TileJson()`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`[UnityTest]`
`121`		`- public IEnumerator LoadMapView()`
	`121`	`+ public IEnumerator LoadMapIntoMemory()`
`122`	`122`	`{`
`123`	`123`	`var mapLoaded = false;`
`124`		`- var firstViewCompletedEventFired = false;`
`125`		`- _map.OnFirstViewCompleted += () => { firstViewCompletedEventFired = true; };`
`126`		`-`
`127`	`124`	`var coroutine = Runnable.Instance.StartCoroutine(_map.LoadMapViewCoroutine(() =>`
`128`	`125`	`{`
`129`	`126`	`mapLoaded = true;`
`130`	`127`	`}));`
`131`	`128`	`while(mapLoaded == false) yield return null;`
`132`	`129`
`133`	`130`	`Assert.IsTrue(mapLoaded);`
`134`		`- Assert.IsTrue(firstViewCompletedEventFired);`
`135`		`- Assert.IsTrue(_map.Status > InitializationStatus.Initialized);`
`136`		`- Assert.IsNotEmpty(_map.TileCover.Tiles);`
`137`	`131`	`}`
`138`	`132`
`139`	`133`	`[Test]`
`@@ -188,7 +182,6 @@ public IEnumerator VectorFetching()`
`188`	`182`	`Assert.NotNull(tile);`
`189`	`183`	`Assert.NotNull(tile.ByteData);`
`190`	`184`	`Assert.IsNotEmpty(tile.ByteData);`
`191`		`- Assert.AreEqual(_datafetcher.TotalRequestCount, 0);`
`192`	`185`	`}`
`193`	`186`
`194`	`187`
`@@ -201,13 +194,11 @@ public IEnumerator VectorFetchingCancelled()`
`201`	`194`	`{`
`202`	`195`	`isDone = true;`
`203`	`196`	`}));`
`204`		`- Assert.AreEqual(_datafetcher.TotalRequestCount, 1);`
`205`		`- _datafetcher.CancelFetching(tile, _tilesetId);`
	`197`	`+ tile.Cancel();`
`206`	`198`	`while (isDone == false) yield return null;`
`207`	`199`
`208`	`200`	`Assert.NotNull(tile);`
`209`	`201`	`Assert.AreEqual(tile.CurrentTileState, TileState.Canceled);`
`210`		`- Assert.AreEqual(_datafetcher.TotalRequestCount, 0);`
`211`	`202`	`}`
`212`	`203`	`}`
`213`	`204`	`}`