From 11867dd74f7455d20d0f8db3b0da66f125bd6bc8 Mon Sep 17 00:00:00 2001 From: Thomas Farstrike Date: Mon, 8 Dec 2025 11:52:27 +0100 Subject: [PATCH] Rework tests --- internal_filesystem/lib/mpos/ui/testing.py | 40 ++++ tests/test_graphical_imu_calibration.py | 43 ++-- tests/test_imu_calibration_ui_bug.py | 230 --------------------- 3 files changed, 54 insertions(+), 259 deletions(-) delete mode 100755 tests/test_imu_calibration_ui_bug.py diff --git a/internal_filesystem/lib/mpos/ui/testing.py b/internal_filesystem/lib/mpos/ui/testing.py index dc3fa063..df061f7e 100644 --- a/internal_filesystem/lib/mpos/ui/testing.py +++ b/internal_filesystem/lib/mpos/ui/testing.py @@ -41,6 +41,7 @@ Usage in apps: """ import lvgl as lv +import time # Simulation globals for touch input _touch_x = 0 @@ -579,3 +580,42 @@ def simulate_click(x, y, press_duration_ms=50): # 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 index be761b35..3eb84a3f 100644 --- a/tests/test_graphical_imu_calibration.py +++ b/tests/test_graphical_imu_calibration.py @@ -24,7 +24,10 @@ from mpos.ui.testing import ( 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 @@ class TestIMUCalibration(unittest.TestCase): 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 @@ class TestIMUCalibration(unittest.TestCase): 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 @@ class TestIMUCalibration(unittest.TestCase): 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 deleted file mode 100755 index 59e55d70..00000000 --- a/tests/test_imu_calibration_ui_bug.py +++ /dev/null @@ -1,230 +0,0 @@ -#!/usr/bin/env python3 -"""Automated UI test for IMU calibration bug. - -Tests the complete flow: -1. Open Settings → IMU → Check Calibration -2. Verify values are shown -3. Click "Calibrate" → Calibrate IMU -4. Click "Calibrate Now" -5. Go back to Check Calibration -6. BUG: Verify values are shown (not "--") -""" - -import sys -import time - -# Import graphical test infrastructure -import lvgl as lv -from mpos.ui.testing import ( - wait_for_render, - simulate_click, - find_button_with_text, - find_label_with_text, - get_widget_coords, - print_screen_labels, - capture_screenshot -) - -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: - 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 - -def main(): - print("=== IMU Calibration UI Bug Test ===\n") - - # Initialize the OS (boot.py and main.py) - print("Step 1: Initializing MicroPythonOS...") - import mpos.main - wait_for_render(iterations=30) - print("OS initialized\n") - - # Step 2: Open Settings app - print("Step 2: Opening Settings app...") - import mpos.apps - - # Start Settings app by name - mpos.apps.start_app("com.micropythonos.settings") - wait_for_render(iterations=30) - print("Settings app opened\n") - - print("Current screen content:") - print_screen_labels(lv.screen_active()) - print() - - # Check if we're on the main Settings screen (should see multiple settings options) - # The Settings app shows a list with items like "Calibrate IMU", "Check IMU Calibration", "Theme Color", etc. - on_settings_main = (find_text_on_screen("Calibrate IMU") and - find_text_on_screen("Check IMU Calibration") and - find_text_on_screen("Theme Color")) - - # If we're on a sub-screen (like Calibrate IMU or Check IMU Calibration screens), - # we need to go back to Settings main. We can detect this by looking for screen titles. - if not on_settings_main: - print("Step 3: Not on Settings main screen, clicking Back to return...") - if not click_button("Back"): - print("WARNING: Could not find Back button, trying Cancel...") - if not click_button("Cancel"): - print("FAILED: Could not navigate back to Settings main") - return False - wait_for_render(iterations=20) - print("Current screen content:") - print_screen_labels(lv.screen_active()) - print() - - # Step 4: Click "Check IMU Calibration" (it's a clickable label/container, not a button) - print("Step 4: Clicking 'Check IMU Calibration' menu item...") - if not click_label("Check IMU Calibration"): - print("FAILED: Could not find Check IMU Calibration menu item") - return False - print("Check IMU Calibration opened\n") - - # Wait for quality check to complete - time.sleep(0.5) - wait_for_render(iterations=30) - - print("Step 5: Checking BEFORE calibration...") - print("Current screen content:") - print_screen_labels(lv.screen_active()) - print() - - # Capture screenshot before - capture_screenshot("../tests/screenshots/check_imu_before_calib.raw") - - # Look for actual values (not "--") - has_values_before = False - widgets = [] - from mpos.ui.testing import get_all_widgets_with_text - for widget in get_all_widgets_with_text(lv.screen_active()): - text = widget.get_text() - # Look for patterns like "X: 0.00" or "Quality: Good" - if ":" in text and "--" not in text: - if any(char.isdigit() for char in text): - print(f"Found value: {text}") - has_values_before = True - - if not has_values_before: - print("WARNING: No values found before calibration (all showing '--')") - else: - print("GOOD: Values are showing before calibration") - print() - - # Step 6: Click "Calibrate" button to go to calibration screen - print("Step 6: Finding 'Calibrate' button...") - calibrate_btn = find_button_with_text(lv.screen_active(), "Calibrate") - if not calibrate_btn: - print("FAILED: Could not find Calibrate button") - return False - - print(f"Found Calibrate button: {calibrate_btn}") - print("Manually sending CLICKED event to button...") - # Instead of using simulate_click, manually send the event - calibrate_btn.send_event(lv.EVENT.CLICKED, None) - wait_for_render(iterations=20) - - # Wait for navigation to complete (activity transition can take some time) - time.sleep(0.5) - wait_for_render(iterations=50) - print("Calibrate IMU screen should be open now\n") - - print("Current screen content:") - print_screen_labels(lv.screen_active()) - print() - - # Step 7: Click "Calibrate Now" button - print("Step 7: Clicking 'Calibrate Now' button...") - if not click_button("Calibrate Now"): - print("FAILED: Could not find 'Calibrate Now' button") - return False - print("Calibration started...\n") - - # Wait for calibration to complete (~2 seconds + UI updates) - time.sleep(3) - wait_for_render(iterations=50) - - print("Current screen content after calibration:") - print_screen_labels(lv.screen_active()) - print() - - # Step 8: Click "Done" to go back - print("Step 8: Clicking 'Done' button...") - if not click_button("Done"): - print("FAILED: Could not find Done button") - return False - print("Going back to Check Calibration\n") - - # Wait for screen to load - time.sleep(0.5) - wait_for_render(iterations=30) - - # Step 9: Check AFTER calibration (BUG: should show values, not "--") - print("Step 9: Checking AFTER calibration (testing for bug)...") - print("Current screen content:") - print_screen_labels(lv.screen_active()) - print() - - # Capture screenshot after - capture_screenshot("../tests/screenshots/check_imu_after_calib.raw") - - # Look for actual values (not "--") - has_values_after = False - for widget in get_all_widgets_with_text(lv.screen_active()): - text = widget.get_text() - # Look for patterns like "X: 0.00" or "Quality: Good" - if ":" in text and "--" not in text: - if any(char.isdigit() for char in text): - print(f"Found value: {text}") - has_values_after = True - - print() - print("="*60) - print("TEST RESULTS:") - print(f" Values shown BEFORE calibration: {has_values_before}") - print(f" Values shown AFTER calibration: {has_values_after}") - - if has_values_before and not has_values_after: - print("\n ❌ BUG REPRODUCED: Values disappeared after calibration!") - print(" Expected: Values should still be shown") - print(" Actual: All showing '--'") - return False - elif has_values_after: - print("\n ✅ PASS: Values are showing correctly after calibration") - return True - else: - print("\n ⚠️ WARNING: No values shown before or after (might be desktop mock issue)") - return True - -if __name__ == '__main__': - success = main() - sys.exit(0 if success else 1)