Rework tests

ThomasFarstrike · ThomasFarstrike · commit 11867dd74f74 · 2025-12-08T11:52:27.000+01:00
diff --git a/internal_filesystem/lib/mpos/ui/testing.py b/internal_filesystem/lib/mpos/ui/testing.py
@@ -41,6 +41,7 @@
 """
 
 import lvgl as lv
+import time
 
 # Simulation globals for touch input
 _touch_x = 0
@@ -579,3 +580,42 @@ def release_timer_cb(timer):
     # Schedule the release
     timer = lv.timer_create(release_timer_cb, press_duration_ms, None)
     timer.set_repeat_count(1)
+
+def click_button(button_text, timeout=5):
+    """Find and click a button with given text."""
+    start = time.time()
+    while time.time() - start < timeout:
+        button = find_button_with_text(lv.screen_active(), button_text)
+        if button:
+            coords = get_widget_coords(button)
+            if coords:
+                print(f"Clicking button '{button_text}' at ({coords['center_x']}, {coords['center_y']})")
+                simulate_click(coords['center_x'], coords['center_y'])
+                wait_for_render(iterations=20)
+                return True
+        wait_for_render(iterations=5)
+    print(f"ERROR: Button '{button_text}' not found after {timeout}s")
+    return False
+
+def click_label(label_text, timeout=5):
+    """Find a label with given text and click on it (or its clickable parent)."""
+    start = time.time()
+    while time.time() - start < timeout:
+        label = find_label_with_text(lv.screen_active(), label_text)
+        if label:
+            print("Scrolling label to view...")
+            label.scroll_to_view_recursive(True)
+            wait_for_render(iterations=50) # needs quite a bit of time
+            coords = get_widget_coords(label)
+            if coords:
+                print(f"Clicking label '{label_text}' at ({coords['center_x']}, {coords['center_y']})")
+                simulate_click(coords['center_x'], coords['center_y'])
+                wait_for_render(iterations=20)
+                return True
+        wait_for_render(iterations=5)
+    print(f"ERROR: Label '{label_text}' not found after {timeout}s")
+    return False
+
+def find_text_on_screen(text):
+    """Check if text is present on screen."""
+    return find_label_with_text(lv.screen_active(), text) is not None
diff --git a/tests/test_graphical_imu_calibration.py b/tests/test_graphical_imu_calibration.py
@@ -24,7 +24,10 @@
     print_screen_labels,
     simulate_click,
     get_widget_coords,
-    find_button_with_text
+    find_button_with_text,
+    click_label,
+    click_button,
+    find_text_on_screen
 )
 
 
@@ -68,16 +71,9 @@ def test_check_calibration_activity_loads(self):
         simulate_click(10, 10)
         wait_for_render(10)
 
-        # Find and click "Check IMU Calibration" setting
-        screen = lv.screen_active()
-        check_cal_label = find_label_with_text(screen, "Check IMU Calibration")
-        self.assertIsNotNone(check_cal_label, "Could not find 'Check IMU Calibration' setting")
-
-        # Click on the setting container
-        coords = get_widget_coords(check_cal_label.get_parent())
-        self.assertIsNotNone(coords, "Could not get coordinates of setting")
-        simulate_click(coords['center_x'], coords['center_y'])
-        wait_for_render(30)
+        print("Clicking 'Check IMU Calibration' menu item...")
+        self.assertTrue(click_label("Check IMU Calibration"), "Could not find Check IMU Calibration menu item")
+        wait_for_render(iterations=20)
 
         # Verify key elements are present
         screen = lv.screen_active()
@@ -110,15 +106,9 @@ def test_calibrate_activity_flow(self):
         simulate_click(10, 10)
         wait_for_render(10)
 
-        # Find and click "Calibrate IMU" setting
-        screen = lv.screen_active()
-        calibrate_label = find_label_with_text(screen, "Calibrate IMU")
-        self.assertIsNotNone(calibrate_label, "Could not find 'Calibrate IMU' setting")
-
-        coords = get_widget_coords(calibrate_label.get_parent())
-        self.assertIsNotNone(coords)
-        simulate_click(coords['center_x'], coords['center_y'])
-        wait_for_render(30)
+        print("Clicking 'Calibrate IMU' menu item...")
+        self.assertTrue(click_label("Calibrate IMU"), "Could not find Calibrate IMU item")
+        wait_for_render(iterations=20)
 
         # Verify activity loaded and shows instructions
         screen = lv.screen_active()
@@ -173,17 +163,12 @@ def test_navigation_from_check_to_calibrate(self):
         simulate_click(10, 10)
         wait_for_render(10)
 
-        screen = lv.screen_active()
-        check_cal_label = find_label_with_text(screen, "Check IMU Calibration")
-        coords = get_widget_coords(check_cal_label.get_parent())
-        simulate_click(coords['center_x'], coords['center_y'])
-        wait_for_render(30)  # Wait for real-time updates
-
-        # Verify Check activity loaded
-        screen = lv.screen_active()
-        self.assertTrue(verify_text_present(screen, "on flat surface"), "Check activity did not load")
+        print("Clicking 'Check IMU Calibration' menu item...")
+        self.assertTrue(click_label("Check IMU Calibration"), "Could not find Check IMU Calibration menu item")
+        wait_for_render(iterations=20)
 
         # Click "Calibrate" button to navigate to Calibrate activity
+        screen = lv.screen_active()
         calibrate_btn = find_button_with_text(screen, "Calibrate")
         self.assertIsNotNone(calibrate_btn, "Could not find 'Calibrate' button")
 
diff --git a/tests/test_imu_calibration_ui_bug.py b/tests/test_imu_calibration_ui_bug.py
