@@ -492,8 +492,11 @@ Image.memory(
492
492
SceneLayout layout,
493
493
Map <String , GoldenSceneScreenshot > goldenScreenshots,
494
494
) async {
495
- final goldensAndGlobalKeys = Map <GoldenSceneScreenshot , GlobalKey >.fromEntries (
496
- goldenScreenshots.entries.map ((entry) => MapEntry (entry.value, GlobalKey ())),
495
+ final content = SceneLayoutContent (
496
+ description: _sceneDescription,
497
+ goldens: Map <GoldenSceneScreenshot , GlobalKey >.fromEntries (
498
+ goldenScreenshots.entries.map ((entry) => MapEntry (entry.value, GlobalKey ())),
499
+ ),
497
500
);
498
501
499
502
// Layout the gallery scene with the new goldens, check the intrinsic size of the
@@ -503,13 +506,13 @@ Image.memory(
503
506
// a corresponding `GlobalKey` already in the tree. Therefore, this layout pass inserts a
504
507
// `GlobalKey` for every golden screenshot that we want to render.
505
508
await tester.pumpWidgetAndAdjustWindow (
506
- _buildGalleryLayout (tester, goldensAndGlobalKeys ),
509
+ _buildGalleryLayout (tester, content ),
507
510
);
508
511
509
512
// Use Flutter's `precacheImage()` mechanism to get each golden screenshot bitmap to
510
513
// render in this widget test.
511
514
await tester.runAsync (() async {
512
- for (final entry in goldensAndGlobalKeys .entries) {
515
+ for (final entry in content.goldens .entries) {
513
516
await precacheImage (
514
517
MemoryImage (entry.key.pngBytes),
515
518
tester.element (find.byKey (entry.value)),
@@ -522,21 +525,21 @@ Image.memory(
522
525
return GoldenSceneMetadata (
523
526
description: _sceneDescription,
524
527
images: [
525
- for (final golden in goldensAndGlobalKeys .keys)
528
+ for (final golden in content.goldens .keys)
526
529
GoldenImageMetadata (
527
530
id: golden.id,
528
531
metadata: golden.metadata,
529
- topLeft: (goldensAndGlobalKeys[golden] ! .currentContext ! . findRenderObject () as RenderBox )
530
- .localToGlobal (Offset .zero),
531
- size: goldensAndGlobalKeys [golden]! .currentContext! .size! ,
532
+ topLeft:
533
+ (content.goldens[golden] ! .currentContext ! . findRenderObject () as RenderBox ) .localToGlobal (Offset .zero),
534
+ size: content.goldens [golden]! .currentContext! .size! ,
532
535
),
533
536
],
534
537
);
535
538
}
536
539
537
- Widget _buildGalleryLayout (WidgetTester tester, Map < GoldenSceneScreenshot , GlobalKey > candidatesAndGlobalKeys ) {
540
+ Widget _buildGalleryLayout (WidgetTester tester, SceneLayoutContent content ) {
538
541
return Builder (builder: (context) {
539
- return _layout.build (tester, context, candidatesAndGlobalKeys );
542
+ return _layout.build (tester, context, content );
540
543
});
541
544
}
542
545
0 commit comments