fix: adapt tests to refactor and explicit module names

src/apptest/demo_whale_viewer.py

@@ -17,14 +17,14 @@ src_dir = path.dirname( path.dirname( path.abspath(__file__) ) )
 sys.path.append(src_dir)
 
 
-import whale_viewer as sw_wv
+import whale_viewer as whale_viewer
 
 # a menu to pick one of the images 
 title = st.title("Whale Viewer testing")
-species = st.selectbox("Species", sw_wv.WHALE_CLASSES) 
+species = st.selectbox("Species", whale_viewer.WHALE_CLASSES) 
 
 if species is not None:
     # and display the image + reference
     st.write(f"Selected species: {species}")
-    sw_wv.display_whale([species], 0, st)
+    whale_viewer.display_whale([species], 0, st)
     

tests/test_demo_whale_viewer.py

@@ -1,7 +1,7 @@
 from streamlit.testing.v1 import AppTest
 import pytest # for the exception testing
 
-import whale_viewer as sw_wv # for data
+import whale_viewer as whale_viewer # for data
 
 
 def test_selectbox_ok():
@@ -45,10 +45,10 @@ def test_selectbox_ok():
     print("PROPS=> ", dir(at.selectbox[0])) # no length unfortunately,
     # test it dynamically intead.
     # should be fine
-    at.selectbox[0].select_index(len(sw_wv.WHALE_CLASSES)-1).run()
+    at.selectbox[0].select_index(len(whale_viewer.WHALE_CLASSES)-1).run()
     # should fail
     with pytest.raises(Exception):
-        at.selectbox[0].select_index(len(sw_wv.WHALE_CLASSES)).run()
+        at.selectbox[0].select_index(len(whale_viewer.WHALE_CLASSES)).run()
     
 def test_img_props():
     '''
@@ -95,15 +95,15 @@ def test_img_props():
     # we're expecting the caption to be WHALE_REFERENCES[ix]
     print(parsed_proto)
     assert "caption" in parsed_proto
-    assert parsed_proto["caption"] == sw_wv.WHALE_REFERENCES[ix]
+    assert parsed_proto["caption"] == whale_viewer.WHALE_REFERENCES[ix]
     assert "url" in parsed_proto
     assert parsed_proto["url"].startswith("/mock/media")
     
-    print(sw_wv.WHALE_REFERENCES[ix])
+    print(whale_viewer.WHALE_REFERENCES[ix])
 
     # now let's switch to another index
     ix = 15
-    v15 = sw_wv.WHALE_CLASSES[ix]
+    v15 = whale_viewer.WHALE_CLASSES[ix]
     v15_str = v15.replace("_", " ").title()
     at.selectbox[0].set_value(v15).run()
     
@@ -118,7 +118,7 @@ def test_img_props():
     # we're expecting the caption to be WHALE_REFERENCES[ix]
     print(parsed_proto)
     assert "caption" in parsed_proto
-    assert parsed_proto["caption"] == sw_wv.WHALE_REFERENCES[ix]
+    assert parsed_proto["caption"] == whale_viewer.WHALE_REFERENCES[ix]
     assert "url" in parsed_proto
     assert parsed_proto["url"].startswith("/mock/media")
     

tests/test_input_handling.py

@@ -1,7 +1,7 @@
 import pytest
 from pathlib import Path
 
-from input_handling import is_valid_email, is_valid_number
+from input.input_validator import is_valid_email, is_valid_number
 from input.input_validator import get_image_latlon, decimal_coords, get_image_datetime
 
 # generate tests for is_valid_email