diff --git a/integration_test/extract_benchmarks.sh b/integration_test/extract_benchmarks.sh index 30b96bf..9adc2ef 100644 --- a/integration_test/extract_benchmarks.sh +++ b/integration_test/extract_benchmarks.sh @@ -3,15 +3,11 @@ timeline_name="$1" if [[ -n "$timeline_name" ]]; then echo "====== Extracting & merging ${timeline_name} timelines ======" - extent_micros="timeExtentMicros" timelines=$(find ./build -maxdepth 1 -name "${timeline_name}*.timeline.json" -print) - for i in "${timelines[@]}"; do - extent_micros+="$(grep -A0 -h '"timeExtentMicros":' $i | grep -o " [0-9]*")" - done - echo $extent_micros | tr ' ' ',' >>${csv_filename}.csv + dart run /Users/vodemn/Documents/GitHub/timeline_compare/bin/merge_timelines.dart $timelines - benchmarks=$(find ./build -maxdepth 1 -name "${timeline_name}*.timeline.benchmark" -print) - benchmerge $benchmarks + summaries=$(find ./build -maxdepth 1 -name "${timeline_name}*.timeline_summary.json" -print) + dart run /Users/vodemn/Documents/GitHub/timeline_compare/bin/merge_timeline_summaries.dart $summaries else echo "Provide the timeline name" fi diff --git a/integration_test/generate_timelines.sh b/integration_test/generate_timelines.sh index 20d19ad..1d36125 100644 --- a/integration_test/generate_timelines.sh +++ b/integration_test/generate_timelines.sh @@ -6,7 +6,7 @@ fvm flutter build apk \ --profile \ --flavor=dev -for n in {1..2}; do +for n in {1..25}; do echo "============ Run number ${n} ============" flutter drive \ @@ -22,4 +22,4 @@ for n in {1..2}; do --use-application-binary=build/app/outputs/flutter-apk/app-dev-profile.apk done -sh integration_test/extract_benchmarks.sh toggle_iso_picker_baseline \ No newline at end of file +sh integration_test/extract_benchmarks.sh toggle_iso_picker \ No newline at end of file diff --git a/integration_test/metering_test.dart b/integration_test/metering_test.dart index ddf7182..dc8448f 100644 --- a/integration_test/metering_test.dart +++ b/integration_test/metering_test.dart @@ -1,4 +1,3 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; import 'package:lightmeter/application.dart'; @@ -14,17 +13,11 @@ import 'package:lightmeter/data/permissions_service.dart'; import 'package:lightmeter/data/shared_prefs_service.dart'; import 'package:lightmeter/data/volume_events_service.dart'; import 'package:lightmeter/environment.dart'; -import 'package:lightmeter/generated/l10n.dart'; import 'package:lightmeter/providers/services_provider.dart'; import 'package:lightmeter/providers/user_preferences_provider.dart'; import 'package:lightmeter/res/dimens.dart'; import 'package:lightmeter/res/theme.dart'; -import 'package:lightmeter/screens/metering/components/bottom_controls/components/measure_button/widget_button_measure.dart'; import 'package:lightmeter/screens/metering/components/shared/readings_container/components/iso_picker/widget_picker_iso.dart'; -import 'package:lightmeter/screens/metering/components/shared/readings_container/components/shared/animated_dialog_picker/components/dialog_picker/widget_picker_dialog.dart'; -import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart'; -import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart'; -import 'package:lightmeter/screens/settings/screen_settings.dart'; import 'package:m3_lightmeter_iap/m3_lightmeter_iap.dart'; import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart'; import 'package:mocktail/mocktail.dart'; @@ -149,12 +142,10 @@ void main() { () async { await tester.tap(find.byType(IsoValuePicker)); await tester.pumpAndSettle(Dimens.durationL); + await tester.tapCancelButton(); }, - "open_iso_picker", + "toggle_iso_picker", ); - expect(find.byType(DialogPicker), findsOneWidget); - await tester.tapCancelButton(); - expect(find.byType(DialogPicker), findsNothing); }); } diff --git a/toggle_iso_picker_baseline_2023-10-02T15-03-50_merged.json b/toggle_iso_picker_baseline_2023-10-02T15-03-50_merged.json new file mode 100644 index 0000000..a5a98b3 --- /dev/null +++ b/toggle_iso_picker_baseline_2023-10-02T15-03-50_merged.json @@ -0,0 +1,3 @@ +{ + "timeExtentMicros": 1201484 +} \ No newline at end of file diff --git a/toggle_iso_picker_baseline_2023-10-02T15-09-53.735523.json b/toggle_iso_picker_baseline_2023-10-02T15-09-53.735523.json new file mode 100644 index 0000000..96638d5 --- /dev/null +++ b/toggle_iso_picker_baseline_2023-10-02T15-09-53.735523.json @@ -0,0 +1,14 @@ +{ + "buildTime": { + "averageFrameTimeMs": 10.006865276698612, + "percentile90FrameTimeMs": 21.645888888888887, + "percentile99FrameTimeMs": 21.645888888888887, + "worstFrameTimeMs": 26.134444444444448 + }, + "rasterizerTime": { + "averageFrameTimeMs": 23.913184792368128, + "percentile90FrameTimeMs": 57.51240740740741, + "percentile99FrameTimeMs": 57.51240740740741, + "worstFrameTimeMs": 78.87037037037038 + } +} \ No newline at end of file