Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
f477c8b1
Unverified
Commit
f477c8b1
authored
Aug 25, 2022
by
Ankur Jain
Committed by
GitHub
Aug 25, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update accessibility contrast test coverage (#109784)
parent
fa2deadd
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
123 additions
and
51 deletions
+123
-51
accessibility.dart
packages/flutter_test/lib/src/accessibility.dart
+68
-51
accessibility_test.dart
packages/flutter_test/test/accessibility_test.dart
+55
-0
No files found.
packages/flutter_test/lib/src/accessibility.dart
View file @
f477c8b1
...
...
@@ -331,27 +331,54 @@ class MinimumTextContrastGuideline extends AccessibilityGuideline {
if
(
shouldSkipNode
(
data
))
{
return
result
;
}
final
String
text
=
data
.
label
.
isEmpty
?
data
.
value
:
data
.
label
;
final
Iterable
<
Element
>
elements
=
find
.
text
(
text
).
hitTestable
().
evaluate
();
for
(
final
Element
element
in
elements
)
{
result
+=
await
_evaluateElement
(
node
,
element
,
tester
,
image
,
byteData
);
}
return
result
;
}
Future
<
Evaluation
>
_evaluateElement
(
SemanticsNode
node
,
Element
element
,
WidgetTester
tester
,
ui
.
Image
image
,
ByteData
byteData
,
)
async
{
// Look up inherited text properties to determine text size and weight.
late
bool
isBold
;
double
?
fontSize
;
final
String
text
=
data
.
label
.
isEmpty
?
data
.
value
:
data
.
label
;
final
List
<
Element
>
elements
=
find
.
text
(
text
).
hitTestable
().
evaluate
().
toList
();
late
final
Rect
paintBounds
;
late
final
Rect
paintBoundsWithOffset
;
if
(
elements
.
length
==
1
)
{
final
Element
element
=
elements
.
single
;
final
RenderObject
?
renderBox
=
element
.
renderObject
;
if
(
renderBox
is
!
RenderBox
)
{
throw
StateError
(
'Unexpected renderObject type:
$renderBox
'
);
}
const
Offset
offset
=
Offset
(
4.0
,
4.0
);
paintBounds
=
Rect
.
fromPoints
(
paintBoundsWithOffset
=
Rect
.
fromPoints
(
renderBox
.
localToGlobal
(
renderBox
.
paintBounds
.
topLeft
-
offset
),
renderBox
.
localToGlobal
(
renderBox
.
paintBounds
.
bottomRight
+
offset
),
);
paintBounds
=
Rect
.
fromPoints
(
renderBox
.
localToGlobal
(
renderBox
.
paintBounds
.
topLeft
),
renderBox
.
localToGlobal
(
renderBox
.
paintBounds
.
bottomRight
),
);
final
Offset
?
nodeOffset
=
node
.
transform
!=
null
?
MatrixUtils
.
getAsTranslation
(
node
.
transform
!)
:
null
;
final
Rect
nodeBounds
=
node
.
rect
.
shift
(
nodeOffset
??
Offset
.
zero
);
final
Rect
intersection
=
nodeBounds
.
intersect
(
paintBounds
);
if
(
intersection
.
width
<=
0
||
intersection
.
height
<=
0
)
{
// Skip this element since it doesn't correspond to the given semantic
// node.
return
const
Evaluation
.
pass
();
}
final
Widget
widget
=
element
.
widget
;
final
DefaultTextStyle
defaultTextStyle
=
DefaultTextStyle
.
of
(
element
);
if
(
widget
is
Text
)
{
...
...
@@ -367,25 +394,16 @@ class MinimumTextContrastGuideline extends AccessibilityGuideline {
}
else
{
throw
StateError
(
'Unexpected widget type:
${widget.runtimeType}
'
);
}
}
else
if
(
elements
.
length
>
1
)
{
return
Evaluation
.
fail
(
'Multiple nodes with the same label:
${data.label}
\n
'
,
);
}
else
{
// If we can't find the text node then assume the label does not
// correspond to actual text.
return
result
;
}
if
(
isNodeOffScreen
(
paintBounds
,
tester
.
binding
.
window
))
{
return
result
;
if
(
isNodeOffScreen
(
paintBounds
WithOffset
,
tester
.
binding
.
window
))
{
return
const
Evaluation
.
pass
()
;
}
final
Map
<
Color
,
int
>
colorHistogram
=
_colorsWithinRect
(
byteData
,
paintBounds
,
image
.
width
,
image
.
height
);
final
Map
<
Color
,
int
>
colorHistogram
=
_colorsWithinRect
(
byteData
,
paintBounds
WithOffset
,
image
.
width
,
image
.
height
);
// Node was too far off screen.
if
(
colorHistogram
.
isEmpty
)
{
return
result
;
return
const
Evaluation
.
pass
()
;
}
final
_ContrastReport
report
=
_ContrastReport
(
colorHistogram
);
...
...
@@ -394,10 +412,9 @@ class MinimumTextContrastGuideline extends AccessibilityGuideline {
final
double
targetContrastRatio
=
this
.
targetContrastRatio
(
fontSize
,
bold:
isBold
);
if
(
contrastRatio
-
targetContrastRatio
>=
_tolerance
)
{
return
result
+
const
Evaluation
.
pass
();
return
const
Evaluation
.
pass
();
}
return
result
+
Evaluation
.
fail
(
return
Evaluation
.
fail
(
'
$node
:
\n
'
'Expected contrast ratio of at least
$targetContrastRatio
'
'but found
${contrastRatio.toStringAsFixed(2)}
'
...
...
packages/flutter_test/test/accessibility_test.dart
View file @
f477c8b1
...
...
@@ -23,6 +23,61 @@ void main() {
handle
.
dispose
();
});
testWidgets
(
'Multiple text with same label'
,
(
WidgetTester
tester
)
async
{
final
SemanticsHandle
handle
=
tester
.
ensureSemantics
();
await
tester
.
pumpWidget
(
_boilerplate
(
Column
(
children:
const
<
Widget
>[
Text
(
'this is a test'
,
style:
TextStyle
(
fontSize:
14.0
,
color:
Colors
.
black
),
),
Text
(
'this is a test'
,
style:
TextStyle
(
fontSize:
14.0
,
color:
Colors
.
black
),
),
],
),
),
);
await
expectLater
(
tester
,
meetsGuideline
(
textContrastGuideline
));
handle
.
dispose
();
});
testWidgets
(
'Multiple text with same label but Nodes excluded from '
'semantic tree have failing contrast should pass a11y guideline '
,
(
WidgetTester
tester
)
async
{
final
SemanticsHandle
handle
=
tester
.
ensureSemantics
();
await
tester
.
pumpWidget
(
_boilerplate
(
Column
(
children:
const
<
Widget
>[
Text
(
'this is a test'
,
style:
TextStyle
(
fontSize:
14.0
,
color:
Colors
.
black
),
),
SizedBox
(
height:
50
),
Text
(
'this is a test'
,
style:
TextStyle
(
fontSize:
14.0
,
color:
Colors
.
black
),
),
SizedBox
(
height:
50
),
ExcludeSemantics
(
child:
Text
(
'this is a test'
,
style:
TextStyle
(
fontSize:
14.0
,
color:
Colors
.
white
),
),
),
],
),
),
);
await
expectLater
(
tester
,
meetsGuideline
(
textContrastGuideline
));
handle
.
dispose
();
});
testWidgets
(
'white text on black background - Text Widget - direct style'
,
(
WidgetTester
tester
)
async
{
final
SemanticsHandle
handle
=
tester
.
ensureSemantics
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment