Skip to content

Commit 8f033a2

Browse files
committed
test: fix tests
1 parent 1d4097c commit 8f033a2

File tree

6 files changed

+25
-20
lines changed

6 files changed

+25
-20
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ dependencies = [
5151
"rio-tiler<7",
5252
"solara",
5353
"ee-client>=1.1.1", # to handle multiple gee user sessions
54-
"colorlog"
54+
"colorlog",
5555
"reactivex"
5656
]
5757

sepal_ui/mapping/sepal_map.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ def get_viz_params(self, image: ee.Image) -> dict:
675675
Returns:
676676
The dictionary of the find properties
677677
"""
678-
678+
679679
# the constant prefix for SEPAL visualization parameters
680680
PREFIX = "visualization"
681681

@@ -818,7 +818,7 @@ def add_basemap(self, basemap: str = "HYBRID") -> None:
818818
msg = f"Basemap can only be one of the following:\n{keys}"
819819
raise ValueError(msg)
820820

821-
self.add(eval(str(basemap_tiles[basemap])))
821+
self.add_layer(eval(str(basemap_tiles[basemap])))
822822

823823
return
824824

sepal_ui/sepalwidgets/app.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,11 @@ def vue_on_click_python(self, data=None) -> Self:
424424

425425
return self
426426

427+
def _on_click(self, *args) -> Self:
428+
"""Display the appropriate tiles when the item is clicked."""
429+
self.vue_on_click_python()
430+
return self
431+
427432

428433
class NavDrawer(v.NavigationDrawer, SepalWidget):
429434
items: List[DrawerItem] = []

sepal_ui/sepalwidgets/inputs.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
from typing_extensions import Self
3131

3232
from sepal_ui.frontend import styles as ss
33-
from sepal_ui.logger.logger import logger
3433
from sepal_ui.message import ms
3534
from sepal_ui.scripts import decorator as sd
3635
from sepal_ui.scripts import utils as su
@@ -689,7 +688,6 @@ def __init__(
689688
"""
690689
self._loaded = False
691690
self.valid = False
692-
logger.debug(f"AssetSelect")
693691
self.gee_interface = GEEInterface(session=gee_session)
694692
# self.asset_info = {}
695693

tests/test_mapping/test_SepalMap.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ def test_add_ee_layer(image_id: str) -> None:
208208
m = sm.SepalMap()
209209

210210
# display all the viz available in the image
211-
for viz in sm.SepalMap.get_viz_params(image).values():
211+
for viz in sm.SepalMap().get_viz_params(image).values():
212212
m.addLayer(image, {}, viz["name"], viz_name=viz["name"])
213213

214214
assert len(m.layers) == 6
@@ -271,7 +271,7 @@ def test_get_viz_params(image_id: str) -> None:
271271
image_id: the AssetId of the GEE image
272272
"""
273273
image = ee.Image(image_id)
274-
res = sm.SepalMap.get_viz_params(image)
274+
res = sm.SepalMap().get_viz_params(image)
275275

276276
expected = {
277277
"1": {
@@ -548,7 +548,7 @@ def ee_map_with_layers(image_id: str) -> sm.SepalMap:
548548
m = sm.SepalMap()
549549

550550
# display all the viz available in the image
551-
for viz in sm.SepalMap.get_viz_params(image).values():
551+
for viz in sm.SepalMap().get_viz_params(image).values():
552552
m.addLayer(image, {}, viz["name"], viz_name=viz["name"])
553553

554554
return m

tests/test_sepalwidgets/test_AssetSelect.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
"""Test the AssetSelect widget."""
22

3+
from datetime import time
34
from pathlib import Path
45
from typing import List
6+
import time
57

68
import ee
79
import pytest
@@ -11,15 +13,14 @@
1113

1214

1315
@pytest.mark.skipif(not ee.data._credentials, reason="GEE is not set")
14-
def test_init(gee_dir: Path, gee_user_dir: Path) -> None:
16+
def test_init(gee_dir: Path, gee_user_dir: Path, asset_select: sw.AssetSelect) -> None:
1517
"""Init the widget.
1618
1719
Args:
1820
gee_dir: the session defined GEE directory
1921
gee_user_dir: the gee_dir without the project information
2022
"""
21-
# create an asset select that points to the folder I created for testing
22-
asset_select = sw.AssetSelect(folder=str(gee_dir))
23+
# Test the fixture
2324
assert isinstance(asset_select, sw.AssetSelect)
2425
assert str(gee_user_dir / "image") in asset_select.items
2526

@@ -156,12 +157,13 @@ def default_items() -> List[str]:
156157

157158
@pytest.fixture(scope="function")
158159
def asset_select(gee_dir: Path) -> sw.AssetSelect:
159-
"""Create a default assetSelect.
160-
161-
Args:
162-
gee_dir: the path to the session defined GEE directory
163-
164-
Returns:
165-
The assertSelected wired to the session folder
166-
"""
167-
return sw.AssetSelect(folder=str(gee_dir))
160+
asset_select = sw.AssetSelect(folder=str(gee_dir))
161+
# Wait for the asset select to finish loading
162+
timeout = 5
163+
start_time = time.time()
164+
while not getattr(asset_select, "_loaded", False):
165+
if time.time() - start_time > timeout:
166+
raise TimeoutError("AssetSelect did not finish loading in time.")
167+
time.sleep(0.1)
168+
169+
return asset_select

0 commit comments

Comments
 (0)