Skip to content

Commit 74567ce

Browse files
Fixed all analysis errors
1 parent 14aa242 commit 74567ce

27 files changed

+19
-73
lines changed

doc/marketing_goldens/flutter_test_config.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Future<void> testExecutable(FutureOr<void> Function() testMain) async {
1111
));
1212

1313
// Disable animations in Super Editor.
14+
// ignore: invalid_use_of_visible_for_testing_member
1415
BlinkController.indeterminateAnimationsEnabled = false;
1516

1617
return testMain();

doc/marketing_goldens/gallery/gallery_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ void main() {
9898
]),
9999
shadows: [
100100
BoxShadow(
101-
color: Colors.blue.withOpacity(.4),
101+
color: Colors.blue.withValues(alpha: .4),
102102
spreadRadius: 4,
103103
blurRadius: 10,
104104
offset: const Offset(0, 2),

doc/marketing_goldens/platform_adaptive_gallery/platform_adaptive_gallery_test.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import 'dart:io';
22

3-
import 'package:flutter/foundation.dart';
43
import 'package:flutter/material.dart';
5-
import 'package:flutter/widgets.dart';
64
import 'package:flutter_svg/flutter_svg.dart';
75
import 'package:flutter_test/flutter_test.dart';
86
import 'package:flutter_test_goldens/flutter_test_goldens.dart';
@@ -110,6 +108,7 @@ Widget _itemDecorator(
110108
children: [
111109
SvgPicture.file(
112110
_getIconFileForPlatform(metadata.simulatedPlatform),
111+
// ignore: deprecated_member_use
113112
color: Colors.black,
114113
width: 24,
115114
height: 24,

doc/marketing_goldens/single_shot/single_shot_test.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import 'dart:io';
2-
import 'dart:math';
3-
41
import 'package:flutter/material.dart';
52
import 'package:flutter_test/flutter_test.dart';
63
import 'package:flutter_test_goldens/flutter_test_goldens.dart';

lib/src/flutter/flutter_camera.dart

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'dart:async';
2-
import 'dart:typed_data';
32
import 'dart:ui';
43

54
import 'package:flutter/foundation.dart';
@@ -24,13 +23,11 @@ class FlutterCamera {
2423
/// that the photo captures widgets that sit in the app overlay, such as the mobile drag
2524
/// handles, magnifier, or popover toolbar for a text field.
2625
Future<void> takePhoto(String id, [Finder? finder]) async {
27-
print("takePhoto() - id: $id, finder: $finder");
2826
final fullscreenRenderObject = find
2927
.byElementPredicate((element) => element.renderObject is RenderRepaintBoundary)
3028
.evaluate()
3129
.first
3230
.findRenderObject() as RenderRepaintBoundary?;
33-
print("fullscreenRenderObject: $fullscreenRenderObject");
3431
if (fullscreenRenderObject == null) {
3532
throw Exception(
3633
"Tried to take a photo of a Flutter UI but the widget tree doesn't have any repaint boundaries. Can't take any screenshots.",
@@ -40,36 +37,29 @@ class FlutterCamera {
4037
final pictureRecorder = PictureRecorder();
4138
final canvas = Canvas(pictureRecorder);
4239
final screenSize = fullscreenRenderObject.size;
43-
print("screenSize: $screenSize");
4440

4541
final paintingContext = TestRecordingPaintingContext(canvas);
4642
fullscreenRenderObject.paint(paintingContext, Offset.zero);
4743

48-
print("Finishing picture recording...");
4944
final fullscreenPhoto = await pictureRecorder.endRecording().toImage(
5045
screenSize.width.round(),
5146
screenSize.height.round(),
5247
);
53-
print("Picture is finished");
5448

5549
final contentFinder = finder ?? find.byType(GoldenImageBounds);
5650
expect(finder, findsOne);
57-
print("Found the content");
5851
final contentRenderObject = contentFinder.evaluate().first.findRenderObject();
59-
print("Content render object: $contentRenderObject");
6052
if (contentRenderObject is! RenderBox) {
6153
throw Exception(
6254
"Tried to take screenshot of $contentFinder but its render object is not a RenderBox. Can't take screenshot.",
6355
);
6456
}
65-
print(
66-
"Cropping content out of fullscreen image - offset: ${contentRenderObject.localToGlobal(Offset.zero)}, size: ${contentRenderObject.size}");
57+
6758
final contentPhoto = await _cropImage(
6859
fullscreenPhoto,
6960
contentRenderObject.localToGlobal(Offset.zero),
7061
contentRenderObject.size,
7162
);
72-
print("Done cropping image");
7363

7464
_photos.add(
7565
FlutterScreenshot(id, contentPhoto, defaultTargetPlatform),

lib/src/goldens/golden_collections.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'dart:typed_data';
2-
import 'dart:ui';
32

43
import 'package:flutter/widgets.dart';
54
import 'package:image/image.dart' as img;

lib/src/goldens/golden_scenes.dart

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ ${const JsonEncoder.withIndent(" ").convert(sceneJson)}'''), stackTrace);
5353
}
5454

5555
// Extract the golden images from the scene image.
56-
print("Extracting goldens from file...");
5756
return _extractCollectionFromSceneBitmap(sceneMetadata, sceneImage);
5857
}
5958

@@ -97,13 +96,11 @@ Future<ScreenshotCollection> extractGoldenCollectionFromSceneWidgetTree(
9796
final treeImage = decodePng(treeRawImageData)!;
9897

9998
// Extract the golden images from the scene image.
100-
print("Extracting candidates from widget tree...");
10199
return _extractCollectionFromSceneBitmap(sceneMetadata, treeImage);
102100
}
103101

104102
ScreenshotCollection _extractCollectionFromSceneBitmap(GoldenSceneMetadata sceneMetadata, Image sceneImage) {
105103
// Cut each golden image out of the scene.
106-
print("Extracting screenshots from a scene (maybe goldens, maybe candidates):");
107104
final goldenImages = <String, GoldenSceneScreenshot>{};
108105
for (final golden in sceneMetadata.images) {
109106
final image = copyCrop(
@@ -113,8 +110,6 @@ ScreenshotCollection _extractCollectionFromSceneBitmap(GoldenSceneMetadata scene
113110
width: golden.size.width.round(),
114111
height: golden.size.height.round(),
115112
);
116-
print(
117-
" - ${golden.id} - offset: ${golden.topLeft}, size: ${golden.size}, extracted image size: Size(${image.width}, ${image.height})");
118113

119114
goldenImages[golden.id] = GoldenSceneScreenshot(
120115
golden.id,
@@ -123,7 +118,6 @@ ScreenshotCollection _extractCollectionFromSceneBitmap(GoldenSceneMetadata scene
123118
image.getBytes(),
124119
);
125120
}
126-
print("----");
127121

128122
return ScreenshotCollection(goldenImages);
129123
}

lib/src/scenes/gallery.dart

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ class Gallery {
315315
/// For each scene screenshot request, pumps its widget tree, and then screenshots it with
316316
/// the given [camera].
317317
Future<void> _takeNewScreenshots(WidgetTester tester, FlutterCamera camera) async {
318-
print("Taking screenshots:");
319318
for (final item in _requests.values) {
320319
FtgLog.pipeline.info("Building gallery item: ${item.description}");
321320
final itemScaffold = item.scaffold ?? _itemScaffold ?? GoldenSceneTheme.current.itemScaffold;
@@ -354,8 +353,6 @@ class Gallery {
354353
// Take a screenshot.
355354
expect(item.boundsFinder, findsOne);
356355
final renderObject = item.boundsFinder.evaluate().first.findRenderObject();
357-
print(
358-
" - Taking screenshot. Bounds: ${item.boundsFinder}, Render object size: ${(renderObject as RenderBox?)?.size}");
359356
expect(
360357
renderObject,
361358
isNotNull,
@@ -365,7 +362,6 @@ class Gallery {
365362
await tester.runAsync(() async {
366363
await camera.takePhoto(item.id, item.boundsFinder);
367364
});
368-
print(" - Done taking photo - ${camera.photos.last.id} - size: ${camera.photos.last.size}");
369365

370366
// Revert the simulated platform to whatever it was before this item.
371367
debugDefaultTargetPlatformOverride = previousPlatform;
@@ -374,7 +370,6 @@ class Gallery {
374370

375371
Widget _buildItem(
376372
WidgetTester tester, GoldenSceneItemScaffold itemScaffold, BoxConstraints? constraints, Widget content) {
377-
print("Building with item constraints: $constraints");
378373
return itemScaffold(
379374
tester,
380375
ConstrainedBox(
@@ -388,7 +383,6 @@ class Gallery {
388383
WidgetTester tester,
389384
List<FlutterScreenshot> flutterScreenshots,
390385
) async {
391-
print("Converting Flutter screenshots to golden candidates:");
392386
final candidateScreenshots = <String, GoldenSceneScreenshot>{};
393387
await tester.runAsync(() async {
394388
for (final flutterScreenshot in flutterScreenshots) {
@@ -407,8 +401,6 @@ class Gallery {
407401
);
408402

409403
candidateScreenshots[flutterScreenshot.id] = candidate;
410-
print(
411-
" - ${candidate.id} - size: ${candidate.size}, inner PNG size: ${candidate.image.width}, ${candidate.image.height}");
412404
}
413405
});
414406

@@ -423,12 +415,6 @@ class Gallery {
423415
// Layout candidate screenshots in the gallery so we can lookup their final offsets and sizes.
424416
var sceneMetadata = await _layoutGalleryWithNewGoldens(tester, _layout, newGoldens);
425417

426-
print("Saving new scene metadata. Here are the golden bounds:");
427-
for (final golden in sceneMetadata.images) {
428-
print(" - ${golden.id} - at: ${golden.topLeft}, size: ${golden.size}");
429-
}
430-
print("---");
431-
432418
FtgLog.pipeline.finer("Running momentary delay for render flakiness");
433419
await tester.runAsync(() async {
434420
// Without this delay, the screenshot loading is spotty. However, with
@@ -481,7 +467,6 @@ Image.memory(
481467
SceneLayout layout,
482468
Map<String, GoldenSceneScreenshot> goldenScreenshots,
483469
) async {
484-
print("_layoutGalleryWithNewGoldens()");
485470
final goldensAndGlobalKeys = Map<GoldenSceneScreenshot, GlobalKey>.fromEntries(
486471
goldenScreenshots.entries.map((entry) => MapEntry(entry.value, GlobalKey())),
487472
);
@@ -525,7 +510,6 @@ Image.memory(
525510
}
526511

527512
Widget _buildGalleryLayout(WidgetTester tester, Map<GoldenSceneScreenshot, GlobalKey> candidatesAndGlobalKeys) {
528-
print("Building Gallery scene layout");
529513
return Builder(builder: (context) {
530514
return _layout.build(tester, context, candidatesAndGlobalKeys);
531515
});

lib/src/scenes/layouts/animation_timeline_layout.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter/widgets.dart';
32
import 'package:flutter_test/flutter_test.dart';
43
import 'package:flutter_test_goldens/src/fonts/fonts.dart';
54
import 'package:flutter_test_goldens/src/goldens/golden_collections.dart';

lib/src/scenes/layouts/row_and_column_layout.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
import 'package:flutter/material.dart' show Colors;
21
import 'package:flutter/widgets.dart';
32
import 'package:flutter_test/flutter_test.dart';
4-
import 'package:flutter_test_goldens/src/fonts/fonts.dart';
53
import 'package:flutter_test_goldens/src/goldens/golden_collections.dart';
64
import 'package:flutter_test_goldens/src/goldens/golden_rendering.dart';
75
import 'package:flutter_test_goldens/src/scenes/golden_scene.dart';
@@ -98,7 +96,6 @@ class FlexGoldenScene extends StatelessWidget {
9896

9997
@override
10098
Widget build(BuildContext context) {
101-
print("Building FlexGoldenScene");
10299
return DefaultTextStyle(
103100
style: GoldenSceneTheme.current.defaultTextStyle,
104101
child: GoldenSceneBounds(
@@ -149,8 +146,6 @@ class FlexGoldenScene extends StatelessWidget {
149146
}
150147

151148
Widget _decorator(BuildContext context, GoldenScreenshotMetadata metadata, Widget child) {
152-
print(
153-
"Building _decorator() - itemDecorator: ${this.itemDecorator}, theme item decorator: ${GoldenSceneTheme.current.itemDecorator}");
154149
final itemDecorator = this.itemDecorator ?? GoldenSceneTheme.current.itemDecorator;
155150
return itemDecorator(context, metadata, child);
156151
}

0 commit comments

Comments
 (0)