Skip to content

Update color assertions #154752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gaaclarke merged 22 commits into from
Sep 10, 2024
Merged

Update color assertions #154752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
50bff83
Made assertions around color work with floating point colors.
gaaclarke Sep 6, 2024
a4ed330
expanded on the matcher
gaaclarke Sep 6, 2024
359040d
removed old color matcher
gaaclarke Sep 6, 2024
12f9a73
fixed more tests
gaaclarke Sep 6, 2024
5ccb4b7
updated mock_canvas and some string tests
gaaclarke Sep 6, 2024
db9c55b
fixed more tests
gaaclarke Sep 6, 2024
38e4caa
more test fixes
gaaclarke Sep 6, 2024
5d3f75c
updated more tests
gaaclarke Sep 6, 2024
1a8dc4f
updated more tests
gaaclarke Sep 9, 2024
5b70a1b
more test updates
gaaclarke Sep 9, 2024
0003a39
fixed more tests
gaaclarke Sep 9, 2024
ca5f87a
migrated more tests
gaaclarke Sep 9, 2024
a06bd4e
linear gradient
gaaclarke Sep 9, 2024
dcfff5f
radial gradient
gaaclarke Sep 9, 2024
9a18a45
sweepgradient
gaaclarke Sep 9, 2024
97ef418
migrated more tests
gaaclarke Sep 9, 2024
ec925f8
more test migrated
gaaclarke Sep 9, 2024
f114f93
more tests
gaaclarke Sep 9, 2024
4c4f575
more tests
gaaclarke Sep 9, 2024
526cb10
unused import
gaaclarke Sep 10, 2024
39e9eaa
unified with existing matcher
gaaclarke Sep 10, 2024
ae933e7
goderbauer feedback
gaaclarke Sep 10, 2024
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
15 changes: 12 additions & 3 deletions packages/flutter/lib/src/foundation/diagnostics.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1753,6 +1753,9 @@ abstract class DiagnosticsNode {
/// `minLevel` specifies the minimum [DiagnosticLevel] for properties included
/// in the output.
///
/// `wrapWidth` specifies the column number where word wrapping will be
/// applied.
///
/// The [toStringDeep] method takes other arguments, but those are intended
/// for internal use when recursing to the descendants, and so can be ignored.
///
Expand All @@ -1768,12 +1771,13 @@ abstract class DiagnosticsNode {
String? prefixOtherLines,
TextTreeConfiguration? parentConfiguration,
DiagnosticLevel minLevel = DiagnosticLevel.debug,
int wrapWidth = 65,
}) {
String result = '';
assert(() {
result = TextTreeRenderer(
minLevel: minLevel,
wrapWidth: 65,
wrapWidth: wrapWidth,
).render(
this,
prefixLineOne: prefixLineOne,
Expand Down Expand Up @@ -3315,6 +3319,9 @@ abstract class DiagnosticableTree with Diagnosticable {
/// `minLevel` specifies the minimum [DiagnosticLevel] for properties included
/// in the output.
///
/// `wrapWidth` specifies the column number where word wrapping will be
/// applied.
///
/// The [toStringDeep] method takes other arguments, but those are intended
/// for internal use when recursing to the descendants, and so can be ignored.
///
Expand All @@ -3327,8 +3334,9 @@ abstract class DiagnosticableTree with Diagnosticable {
String prefixLineOne = '',
String? prefixOtherLines,
DiagnosticLevel minLevel = DiagnosticLevel.debug,
int wrapWidth = 65,
}) {
return toDiagnosticsNode().toStringDeep(prefixLineOne: prefixLineOne, prefixOtherLines: prefixOtherLines, minLevel: minLevel);
return toDiagnosticsNode().toStringDeep(prefixLineOne: prefixLineOne, prefixOtherLines: prefixOtherLines, minLevel: minLevel, wrapWidth: wrapWidth);
}

@override
Expand Down Expand Up @@ -3400,8 +3408,9 @@ mixin DiagnosticableTreeMixin implements DiagnosticableTree {
String prefixLineOne = '',
String? prefixOtherLines,
DiagnosticLevel minLevel = DiagnosticLevel.debug,
int wrapWidth = 65,
}) {
return toDiagnosticsNode().toStringDeep(prefixLineOne: prefixLineOne, prefixOtherLines: prefixOtherLines, minLevel: minLevel);
return toDiagnosticsNode().toStringDeep(prefixLineOne: prefixLineOne, prefixOtherLines: prefixOtherLines, minLevel: minLevel, wrapWidth: wrapWidth);
}

@override
Expand Down
2 changes: 2 additions & 0 deletions packages/flutter/lib/src/rendering/object.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4002,11 +4002,13 @@ abstract class RenderObject with DiagnosticableTreeMixin implements HitTestTarge
String prefixLineOne = '',
String? prefixOtherLines = '',
DiagnosticLevel minLevel = DiagnosticLevel.debug,
int wrapWidth = 65,
}) {
return _withDebugActiveLayoutCleared(() => super.toStringDeep(
prefixLineOne: prefixLineOne,
prefixOtherLines: prefixOtherLines,
minLevel: minLevel,
wrapWidth: wrapWidth,
));
}

Expand Down
3 changes: 2 additions & 1 deletion packages/flutter/lib/src/semantics/semantics.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3085,8 +3085,9 @@ class SemanticsNode with DiagnosticableTreeMixin {
String? prefixOtherLines,
DiagnosticLevel minLevel = DiagnosticLevel.debug,
DebugSemanticsDumpOrder childOrder = DebugSemanticsDumpOrder.traversalOrder,
int wrapWidth = 65,
}) {
return toDiagnosticsNode(childOrder: childOrder).toStringDeep(prefixLineOne: prefixLineOne, prefixOtherLines: prefixOtherLines, minLevel: minLevel);
return toDiagnosticsNode(childOrder: childOrder).toStringDeep(prefixLineOne: prefixLineOne, prefixOtherLines: prefixOtherLines, minLevel: minLevel, wrapWidth: wrapWidth);
}

@override
Expand Down
10 changes: 5 additions & 5 deletions packages/flutter/test/animation/tween_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ void main() {
(FlutterError error) => error.diagnostics.map((DiagnosticsNode node) => node.toString()),
'diagnostics',
<String>[
'Cannot lerp between "Color(0xff000000)" and "Color(0xffffffff)".',
'Cannot lerp between "${const Color(0xff000000)}" and "${const Color(0xffffffff)}".',
'The type Color might not fully implement `+`, `-`, and/or `*`. $kApiDocsLink',
'To lerp colors, consider ColorTween instead.',
],
Expand Down Expand Up @@ -194,10 +194,10 @@ void main() {
begin: const Color(0xff000000),
end: const Color(0xffffffff),
);
expect(tween.lerp(0.0), const Color(0xff000000));
expect(tween.lerp(0.5), const Color(0xff7f7f7f));
expect(tween.lerp(0.7), const Color(0xffb2b2b2));
expect(tween.lerp(1.0), const Color(0xffffffff));
expect(tween.lerp(0.0), isSameColorAs(const Color(0xff000000)));
expect(tween.lerp(0.5), isSameColorAs(const Color(0xff7f7f7f)));
expect(tween.lerp(0.7), isSameColorAs(const Color(0xffb2b2b2)));
expect(tween.lerp(1.0), isSameColorAs(const Color(0xffffffff)));
});

test('StepTween', () {
Expand Down
32 changes: 16 additions & 16 deletions packages/flutter/test/cupertino/colors_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,20 +130,20 @@ void main() {
expect(
dynamicColor.toString(),
contains(
'CupertinoDynamicColor(*color = Color(0xff000000)*, '
'darkColor = Color(0xff000001), '
'highContrastColor = Color(0xff000003), '
'darkHighContrastColor = Color(0xff000005), '
'elevatedColor = Color(0xff000002), '
'darkElevatedColor = Color(0xff000004), '
'highContrastElevatedColor = Color(0xff000006), '
'darkHighContrastElevatedColor = Color(0xff000007)',
'CupertinoDynamicColor(*color = ${const Color(0xff000000)}*, '
'darkColor = ${const Color(0xff000001)}, '
'highContrastColor = ${const Color(0xff000003)}, '
'darkHighContrastColor = ${const Color(0xff000005)}, '
'elevatedColor = ${const Color(0xff000002)}, '
'darkElevatedColor = ${const Color(0xff000004)}, '
'highContrastElevatedColor = ${const Color(0xff000006)}, '
'darkHighContrastElevatedColor = ${const Color(0xff000007)}',
),
);
expect(notSoDynamicColor1.toString(), contains('CupertinoDynamicColor(*color = Color(0xff000000)*'));
expect(vibrancyDependentColor1.toString(), contains('CupertinoDynamicColor(*color = Color(0xff000001)*, darkColor = Color(0xff000000)'));
expect(contrastDependentColor1.toString(), contains('CupertinoDynamicColor(*color = Color(0xff000001)*, highContrastColor = Color(0xff000000)'));
expect(elevationDependentColor1.toString(), contains('CupertinoDynamicColor(*color = Color(0xff000001)*, elevatedColor = Color(0xff000000)'));
expect(notSoDynamicColor1.toString(), contains('CupertinoDynamicColor(*color = ${const Color(0xff000000)}*'));
expect(vibrancyDependentColor1.toString(), contains('CupertinoDynamicColor(*color = ${const Color(0xff000001)}*, darkColor = ${const Color(0xff000000)}'));
expect(contrastDependentColor1.toString(), contains('CupertinoDynamicColor(*color = ${const Color(0xff000001)}*, highContrastColor = ${const Color(0xff000000)}'));
expect(elevationDependentColor1.toString(), contains('CupertinoDynamicColor(*color = ${const Color(0xff000001)}*, elevatedColor = ${const Color(0xff000000)}'));

expect(
const CupertinoDynamicColor.withBrightnessAndContrast(
Expand All @@ -153,10 +153,10 @@ void main() {
darkHighContrastColor: color3,
).toString(),
contains(
'CupertinoDynamicColor(*color = Color(0xff000000)*, '
'darkColor = Color(0xff000001), '
'highContrastColor = Color(0xff000002), '
'darkHighContrastColor = Color(0xff000003)',
'CupertinoDynamicColor(*color = ${const Color(0xff000000)}*, '
'darkColor = ${const Color(0xff000001)}, '
'highContrastColor = ${const Color(0xff000002)}, '
'darkHighContrastColor = ${const Color(0xff000003)}',
),
);
});
Expand Down
32 changes: 16 additions & 16 deletions packages/flutter/test/cupertino/nav_bar_transition_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ void main() {
// The transition's stack is ordered. The bottom middle is inserted first.
final RenderParagraph bottomMiddle =
tester.renderObject(flying(tester, find.text('Page 1')).first);
expect(bottomMiddle.text.style!.color, const Color(0xff000306));
expect(bottomMiddle.text.style!.color, isSameColorAs(const Color(0xff000306)));
expect(bottomMiddle.text.style!.fontWeight, FontWeight.w600);
expect(bottomMiddle.text.style!.fontFamily, 'CupertinoSystemText');
expect(bottomMiddle.text.style!.letterSpacing, -0.41);
Expand All @@ -225,7 +225,7 @@ void main() {
// are flipped.
final RenderParagraph topBackLabel =
tester.renderObject(flying(tester, find.text('Page 1')).last);
expect(topBackLabel.text.style!.color, const Color(0xff000306));
expect(topBackLabel.text.style!.color, isSameColorAs(const Color(0xff000306)));
expect(topBackLabel.text.style!.fontWeight, FontWeight.w600);
expect(topBackLabel.text.style!.fontFamily, 'CupertinoSystemText');
expect(topBackLabel.text.style!.letterSpacing, -0.41);
Expand All @@ -234,14 +234,14 @@ void main() {

// Move animation further a bit.
await tester.pump(const Duration(milliseconds: 200));
expect(bottomMiddle.text.style!.color, const Color(0xff005ec5));
expect(bottomMiddle.text.style!.color, isSameColorAs(const Color(0xff005ec5)));
expect(bottomMiddle.text.style!.fontWeight, FontWeight.w400);
expect(bottomMiddle.text.style!.fontFamily, 'CupertinoSystemText');
expect(bottomMiddle.text.style!.letterSpacing, -0.41);

checkOpacity(tester, flying(tester, find.text('Page 1')).first, 0.0);

expect(topBackLabel.text.style!.color, const Color(0xff005ec5));
expect(topBackLabel.text.style!.color, isSameColorAs(const Color(0xff005ec5)));
expect(topBackLabel.text.style!.fontWeight, FontWeight.w400);
expect(topBackLabel.text.style!.fontFamily, 'CupertinoSystemText');
expect(topBackLabel.text.style!.letterSpacing, -0.41);
Expand All @@ -262,7 +262,7 @@ void main() {
// The transition's stack is ordered. The bottom middle is inserted first.
final RenderParagraph bottomMiddle =
tester.renderObject(flying(tester, find.text('Page 1')).first);
expect(bottomMiddle.text.style!.color, const Color(0xfff8fbff));
expect(bottomMiddle.text.style!.color, isSameColorAs(const Color(0xfff8fbff)));
expect(bottomMiddle.text.style!.fontWeight, FontWeight.w600);
expect(bottomMiddle.text.style!.fontFamily, 'CupertinoSystemText');
expect(bottomMiddle.text.style!.letterSpacing, -0.41);
Expand All @@ -273,7 +273,7 @@ void main() {
// are flipped.
final RenderParagraph topBackLabel =
tester.renderObject(flying(tester, find.text('Page 1')).last);
expect(topBackLabel.text.style!.color, const Color(0xfff8fbff));
expect(topBackLabel.text.style!.color, isSameColorAs(const Color(0xfff8fbff)));
expect(topBackLabel.text.style!.fontWeight, FontWeight.w600);
expect(topBackLabel.text.style!.fontFamily, 'CupertinoSystemText');
expect(topBackLabel.text.style!.letterSpacing, -0.41);
Expand All @@ -282,14 +282,14 @@ void main() {

// Move animation further a bit.
await tester.pump(const Duration(milliseconds: 200));
expect(bottomMiddle.text.style!.color, const Color(0xff409fff));
expect(bottomMiddle.text.style!.color, isSameColorAs(const Color(0xff409fff)));
expect(bottomMiddle.text.style!.fontWeight, FontWeight.w400);
expect(bottomMiddle.text.style!.fontFamily, 'CupertinoSystemText');
expect(bottomMiddle.text.style!.letterSpacing, -0.41);

checkOpacity(tester, flying(tester, find.text('Page 1')).first, 0.0);

expect(topBackLabel.text.style!.color, const Color(0xff409fff));
expect(topBackLabel.text.style!.color, isSameColorAs(const Color(0xff409fff)));
expect(topBackLabel.text.style!.fontWeight, FontWeight.w400);
expect(topBackLabel.text.style!.fontFamily, 'CupertinoSystemText');
expect(topBackLabel.text.style!.letterSpacing, -0.41);
Expand Down Expand Up @@ -365,7 +365,7 @@ void main() {
// The transition's stack is ordered. The bottom middle is inserted first.
final RenderParagraph bottomMiddle =
tester.renderObject(flying(tester, find.text('Page 1')).first);
expect(bottomMiddle.text.style!.color, const Color(0xff000306));
expect(bottomMiddle.text.style!.color, isSameColorAs(const Color(0xff000306)));

expect(
tester.getTopLeft(flying(tester, find.text('Page 1')).first),
Expand All @@ -379,7 +379,7 @@ void main() {
// are flipped.
final RenderParagraph topBackLabel =
tester.renderObject(flying(tester, find.text('Page 1')).last);
expect(topBackLabel.text.style!.color, const Color(0xff000306));
expect(topBackLabel.text.style!.color, isSameColorAs(const Color(0xff000306)));
expect(
tester.getTopLeft(flying(tester, find.text('Page 1')).last),
const Offset(
Expand Down Expand Up @@ -417,7 +417,7 @@ void main() {
// The transition's stack is ordered. The bottom middle is inserted first.
final RenderParagraph bottomMiddle =
tester.renderObject(flying(tester, find.text('Page 1')).first);
expect(bottomMiddle.text.style!.color, const Color(0xff000306));
expect(bottomMiddle.text.style!.color, isSameColorAs(const Color(0xff000306)));
expect(
tester.getTopLeft(flying(tester, find.text('Page 1')).first),
const Offset(
Expand All @@ -430,7 +430,7 @@ void main() {
// are flipped.
final RenderParagraph topBackLabel =
tester.renderObject(flying(tester, find.text('Page 1')).last);
expect(topBackLabel.text.style!.color, const Color(0xff000306));
expect(topBackLabel.text.style!.color, isSameColorAs(const Color(0xff000306)));
expect(
tester.getTopLeft(flying(tester, find.text('Page 1')).last),
const Offset(
Expand Down Expand Up @@ -1116,27 +1116,27 @@ void main() {
// The transition's stack is ordered. The bottom large title is inserted first.
final RenderParagraph bottomLargeTitle =
tester.renderObject(flying(tester, find.text('Page 1')).first);
expect(bottomLargeTitle.text.style!.color, const Color(0xff000306));
expect(bottomLargeTitle.text.style!.color, isSameColorAs(const Color(0xff000306)));
expect(bottomLargeTitle.text.style!.fontWeight, FontWeight.w700);
expect(bottomLargeTitle.text.style!.fontFamily, 'CupertinoSystemDisplay');
expect(bottomLargeTitle.text.style!.letterSpacing, moreOrLessEquals(0.35967791542410854));

// The top back label is styled exactly the same way.
final RenderParagraph topBackLabel =
tester.renderObject(flying(tester, find.text('Page 1')).last);
expect(topBackLabel.text.style!.color, const Color(0xff000306));
expect(topBackLabel.text.style!.color, isSameColorAs(const Color(0xff000306)));
expect(topBackLabel.text.style!.fontWeight, FontWeight.w700);
expect(topBackLabel.text.style!.fontFamily, 'CupertinoSystemDisplay');
expect(topBackLabel.text.style!.letterSpacing, moreOrLessEquals(0.35967791542410854));

// Move animation further a bit.
await tester.pump(const Duration(milliseconds: 200));
expect(bottomLargeTitle.text.style!.color, const Color(0xff005ec5));
expect(bottomLargeTitle.text.style!.color, isSameColorAs(const Color(0xff005ec5)));
expect(bottomLargeTitle.text.style!.fontWeight, FontWeight.w500);
expect(bottomLargeTitle.text.style!.fontFamily, 'CupertinoSystemText');
expect(bottomLargeTitle.text.style!.letterSpacing, moreOrLessEquals(-0.23270857974886894));

expect(topBackLabel.text.style!.color, const Color(0xff005ec5));
expect(topBackLabel.text.style!.color, isSameColorAs(const Color(0xff005ec5)));
expect(topBackLabel.text.style!.fontWeight, FontWeight.w500);
expect(topBackLabel.text.style!.fontFamily, 'CupertinoSystemText');
expect(topBackLabel.text.style!.letterSpacing, moreOrLessEquals(-0.23270857974886894));
Expand Down
Loading