Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ on:
- master

# Declare default permissions as read only.
permissions: read-all
permissions:
contents: read

defaults:
run:
Expand Down Expand Up @@ -74,7 +75,7 @@ jobs:
wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg
echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list
sudo apt-get update
sudo apt-get install dcm=1.38.1-1 # To avoid errors add `-1` (build number) to the version
sudo apt-get install dcm=1.38.3-1 # To avoid errors add `-1` (build number) to the version
sudo chmod +x /usr/bin/dcm
echo "$(dcm --version)"
- name: Setup Dart SDK
Expand Down Expand Up @@ -190,7 +191,7 @@ jobs:
run: ./tool/ci/bots.sh

- name: Upload Golden Failure Artifacts
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
if: failure()
with:
name: golden_image_failures.${{ matrix.bot }}
Expand Down Expand Up @@ -263,7 +264,7 @@ jobs:
run: ./tool/ci/bots.sh

- name: Upload Golden Failure Artifacts
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
if: failure()
with:
name: golden_image_failures.${{ matrix.bot }}
Expand Down
4 changes: 2 additions & 2 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ dart_code_metrics:
- lib/src/screens/inspector/**_controller.dart
- lib/src/shared/diagnostics/inspector_service.dart
- lib/src/shared/diagnostics/diagnostics_node.dart

- test/**
# This fixture has unused code for testing the debugger.
- test/test_infra/fixtures/flutter_app/**
rules:
# - arguments-ordering Too strict
# - avoid-banned-imports # TODO(polina-c): add configuration
Expand Down
2 changes: 1 addition & 1 deletion flutter-candidate.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ad80825c24d770a19e33f67800fc0338a3b89ec7
0f0246377b1c9d8bc365a439c520a7de6c3f590b
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,10 @@ class PerformanceController extends DevToolsScreenController
@override
final screenId = ScreenMetaData.performance.id;

// ignore: dispose-class-fields, false positive. See `applyToFeatureControllers` in the dispose() method.
late final FlutterFramesController flutterFramesController;

// ignore: dispose-class-fields, false positive. See `applyToFeatureControllers` in the dispose() method.
late final TimelineEventsController timelineEventsController;

// ignore: dispose-class-fields, false positive. See `applyToFeatureControllers` in the dispose() method.
late final RebuildStatsController rebuildStatsController;

// ignore: dispose-class-fields, false positive. See `applyToFeatureControllers` in the dispose() method.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ void main() {
final score = await benchmark.measure();
expect(
score,
lessThan(110000),
lessThan(120000),
reason: 'Exceeded benchmark for run $i: $score',
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,39 @@ import '../../test_infra/matchers/matchers.dart';
// reduced to under 1 second without introducing flakes.
const inspectorChangeSettleTime = Duration(seconds: 2);

void _copyDirectorySync(Directory source, Directory destination) {
if (!destination.existsSync()) {
destination.createSync(recursive: true);
}
for (final entity in source.listSync()) {
final newPath = p.join(destination.path, p.basename(entity.path));
if (entity is Directory) {
_copyDirectorySync(entity, Directory(newPath));
} else if (entity is File) {
entity.copySync(newPath);
}
}
}

void main() {
// We need to use real async in this test so we need to use this binding.
initializeLiveTestWidgetsFlutterBindingWithAssets();
const windowSize = Size(2600.0, 1200.0);

// We copy the fixture app to a temporary directory because the
// auto-refresh tests modify lib/main.dart in-place. If this used the shared
// 'inspector_app' fixture, it could cause flaky test failures in other tests
// (like inspector_service_test.dart) that run in parallel.
final tempAppDir =
'test/test_infra/fixtures/inspector_app_temp_${DateTime.now().millisecondsSinceEpoch}';
_copyDirectorySync(
Directory('test/test_infra/fixtures/inspector_app'),
Directory(tempAppDir),
);

final env = FlutterTestEnvironment(
const FlutterRunConfiguration(withDebugger: true),
testAppDirectory: 'test/test_infra/fixtures/inspector_app',
testAppDirectory: tempAppDir,
);

env.afterEverySetup = () async {
Expand Down Expand Up @@ -67,6 +92,10 @@ void main() {

tearDownAll(() {
env.finalTeardown();
final dir = Directory(tempAppDir);
if (dir.existsSync()) {
dir.deleteSync(recursive: true);
}
});

group('screenshot tests', () {
Expand Down Expand Up @@ -653,17 +682,6 @@ void verifyPropertyIsVisible({
expect(propertyNameCenter.dy, equals(propertyValueCenter.dy));
}

bool areHorizontallyAligned(
Finder widgetAFinder,
Finder widgetBFinder, {
required WidgetTester tester,
}) {
final widgetACenter = tester.getCenter(widgetAFinder);
final widgetBCenter = tester.getCenter(widgetBFinder);

return widgetACenter.dy == widgetBCenter.dy;
}

bool _treeRowsAreInOrder({
required List<String> treeRowDescriptions,
required int startingAtIndex,
Expand Down

This file was deleted.

132 changes: 0 additions & 132 deletions packages/devtools_app/test/shared/primitives/utils_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -704,135 +704,3 @@ class _SubtractionResult {
@override
String toString() => '$from - $subtract';
}

// This was generated from a canvas with font size 14.0.
const asciiMeasurements = [
0,
4.6619873046875,
4.6619873046875,
4.6619873046875,
4.6619873046875,
4.6619873046875,
4.6619873046875,
4.6619873046875,
0,
3.8896484375,
3.8896484375,
3.8896484375,
3.8896484375,
3.8896484375,
4.6619873046875,
4.6619873046875,
4.6619873046875,
4.6619873046875,
4.6619873046875,
4.6619873046875,
4.6619873046875,
4.6619873046875,
4.6619873046875,
4.6619873046875,
4.6619873046875,
4.6619873046875,
4.6619873046875,
4.6619873046875,
4.6619873046875,
0,
4.6619873046875,
4.6619873046875,
3.8896484375,
3.8896484375,
4.9697265625,
7.7861328125,
7.7861328125,
12.4482421875,
9.337890625,
2.6728515625,
4.662109375,
4.662109375,
5.4482421875,
8.17578125,
3.8896484375,
4.662109375,
3.8896484375,
3.8896484375,
7.7861328125,
7.7861328125,
7.7861328125,
7.7861328125,
7.7861328125,
7.7861328125,
7.7861328125,
7.7861328125,
7.7861328125,
7.7861328125,
3.8896484375,
3.8896484375,
8.17578125,
8.17578125,
8.17578125,
7.7861328125,
14.2119140625,
9.337890625,
9.337890625,
10.1103515625,
10.1103515625,
9.337890625,
8.5517578125,
10.8896484375,
10.1103515625,
3.8896484375,
7,
9.337890625,
7.7861328125,
11.662109375,
10.1103515625,
10.8896484375,
9.337890625,
10.8896484375,
10.1103515625,
9.337890625,
8.5517578125,
10.1103515625,
9.337890625,
13.2138671875,
9.337890625,
9.337890625,
8.5517578125,
3.8896484375,
3.8896484375,
3.8896484375,
6.5693359375,
7.7861328125,
4.662109375,
7.7861328125,
7.7861328125,
7,
7.7861328125,
7.7861328125,
3.8896484375,
7.7861328125,
7.7861328125,
3.1103515625,
3.1103515625,
7,
3.1103515625,
11.662109375,
7.7861328125,
7.7861328125,
7.7861328125,
7.7861328125,
4.662109375,
7,
3.8896484375,
7.7861328125,
7,
10.1103515625,
7,
7,
7,
4.67578125,
3.63671875,
4.67578125,
8.17578125,
0,
];

This file was deleted.

Loading
Loading