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
88ddde4c
Unverified
Commit
88ddde4c
authored
May 16, 2020
by
liyuqian
Committed by
GitHub
May 16, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove obsolete UpdateCounted prefix (#57167)
parent
631087d8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
44 deletions
+14
-44
clip_test.dart
packages/flutter/test/widgets/clip_test.dart
+10
-30
physical_model_test.dart
packages/flutter/test/widgets/physical_model_test.dart
+4
-14
No files found.
packages/flutter/test/widgets/clip_test.dart
View file @
88ddde4c
...
@@ -52,26 +52,6 @@ class NotifyClipper<T> extends CustomClipper<T> {
...
@@ -52,26 +52,6 @@ class NotifyClipper<T> extends CustomClipper<T> {
bool
shouldReclip
(
NotifyClipper
<
T
>
oldClipper
)
=>
clip
!=
oldClipper
.
clip
;
bool
shouldReclip
(
NotifyClipper
<
T
>
oldClipper
)
=>
clip
!=
oldClipper
.
clip
;
}
}
class
_UpdateCountedClipRect
extends
ClipRect
{
const
_UpdateCountedClipRect
({
Clip
clipBehavior
=
Clip
.
antiAlias
})
:
super
(
clipBehavior:
clipBehavior
);
}
class
_UpdateCountedClipRRect
extends
ClipRRect
{
_UpdateCountedClipRRect
({
Clip
clipBehavior
=
Clip
.
antiAlias
})
:
super
(
clipBehavior:
clipBehavior
,
borderRadius:
BorderRadius
.
circular
(
1.0
));
}
class
_UpdateCountedClipOval
extends
ClipOval
{
const
_UpdateCountedClipOval
({
Clip
clipBehavior
=
Clip
.
antiAlias
})
:
super
(
clipBehavior:
clipBehavior
);
}
class
_UpdateCountedClipPath
extends
ClipPath
{
const
_UpdateCountedClipPath
({
Clip
clipBehavior
=
Clip
.
antiAlias
})
:
super
(
clipBehavior:
clipBehavior
);
}
void
main
(
)
{
void
main
(
)
{
testWidgets
(
'ClipRect with a FittedBox child sized to zero works with semantics'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'ClipRect with a FittedBox child sized to zero works with semantics'
,
(
WidgetTester
tester
)
async
{
await
tester
.
pumpWidget
(
Directionality
(
await
tester
.
pumpWidget
(
Directionality
(
...
@@ -93,15 +73,15 @@ void main() {
...
@@ -93,15 +73,15 @@ void main() {
});
});
testWidgets
(
'ClipRect updates clipBehavior in updateRenderObject'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'ClipRect updates clipBehavior in updateRenderObject'
,
(
WidgetTester
tester
)
async
{
await
tester
.
pumpWidget
(
const
_UpdateCounted
ClipRect
());
await
tester
.
pumpWidget
(
const
ClipRect
());
final
RenderClipRect
renderClip
=
tester
.
allRenderObjects
.
whereType
<
RenderClipRect
>().
first
;
final
RenderClipRect
renderClip
=
tester
.
allRenderObjects
.
whereType
<
RenderClipRect
>().
first
;
expect
(
renderClip
.
clipBehavior
,
equals
(
Clip
.
antiAlias
));
expect
(
renderClip
.
clipBehavior
,
equals
(
Clip
.
hardEdge
));
await
tester
.
pumpWidget
(
const
_UpdateCountedClipRect
(
clipBehavior:
Clip
.
hardEdge
));
await
tester
.
pumpWidget
(
const
ClipRect
(
clipBehavior:
Clip
.
antiAlias
));
expect
(
renderClip
.
clipBehavior
,
equals
(
Clip
.
hardEdge
));
expect
(
renderClip
.
clipBehavior
,
equals
(
Clip
.
antiAlias
));
});
});
test
(
'ClipRRect constructs with the right default values'
,
()
{
test
(
'ClipRRect constructs with the right default values'
,
()
{
...
@@ -111,37 +91,37 @@ void main() {
...
@@ -111,37 +91,37 @@ void main() {
});
});
testWidgets
(
'ClipRRect updates clipBehavior in updateRenderObject'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'ClipRRect updates clipBehavior in updateRenderObject'
,
(
WidgetTester
tester
)
async
{
await
tester
.
pumpWidget
(
_UpdateCounted
ClipRRect
());
await
tester
.
pumpWidget
(
const
ClipRRect
());
final
RenderClipRRect
renderClip
=
tester
.
allRenderObjects
.
whereType
<
RenderClipRRect
>().
first
;
final
RenderClipRRect
renderClip
=
tester
.
allRenderObjects
.
whereType
<
RenderClipRRect
>().
first
;
expect
(
renderClip
.
clipBehavior
,
equals
(
Clip
.
antiAlias
));
expect
(
renderClip
.
clipBehavior
,
equals
(
Clip
.
antiAlias
));
await
tester
.
pumpWidget
(
_UpdateCounted
ClipRRect
(
clipBehavior:
Clip
.
hardEdge
));
await
tester
.
pumpWidget
(
const
ClipRRect
(
clipBehavior:
Clip
.
hardEdge
));
expect
(
renderClip
.
clipBehavior
,
equals
(
Clip
.
hardEdge
));
expect
(
renderClip
.
clipBehavior
,
equals
(
Clip
.
hardEdge
));
});
});
testWidgets
(
'ClipOval updates clipBehavior in updateRenderObject'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'ClipOval updates clipBehavior in updateRenderObject'
,
(
WidgetTester
tester
)
async
{
await
tester
.
pumpWidget
(
const
_UpdateCounted
ClipOval
());
await
tester
.
pumpWidget
(
const
ClipOval
());
final
RenderClipOval
renderClip
=
tester
.
allRenderObjects
.
whereType
<
RenderClipOval
>().
first
;
final
RenderClipOval
renderClip
=
tester
.
allRenderObjects
.
whereType
<
RenderClipOval
>().
first
;
expect
(
renderClip
.
clipBehavior
,
equals
(
Clip
.
antiAlias
));
expect
(
renderClip
.
clipBehavior
,
equals
(
Clip
.
antiAlias
));
await
tester
.
pumpWidget
(
const
_UpdateCounted
ClipOval
(
clipBehavior:
Clip
.
hardEdge
));
await
tester
.
pumpWidget
(
const
ClipOval
(
clipBehavior:
Clip
.
hardEdge
));
expect
(
renderClip
.
clipBehavior
,
equals
(
Clip
.
hardEdge
));
expect
(
renderClip
.
clipBehavior
,
equals
(
Clip
.
hardEdge
));
});
});
testWidgets
(
'ClipPath updates clipBehavior in updateRenderObject'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'ClipPath updates clipBehavior in updateRenderObject'
,
(
WidgetTester
tester
)
async
{
await
tester
.
pumpWidget
(
const
_UpdateCounted
ClipPath
());
await
tester
.
pumpWidget
(
const
ClipPath
());
final
RenderClipPath
renderClip
=
tester
.
allRenderObjects
.
whereType
<
RenderClipPath
>().
first
;
final
RenderClipPath
renderClip
=
tester
.
allRenderObjects
.
whereType
<
RenderClipPath
>().
first
;
expect
(
renderClip
.
clipBehavior
,
equals
(
Clip
.
antiAlias
));
expect
(
renderClip
.
clipBehavior
,
equals
(
Clip
.
antiAlias
));
await
tester
.
pumpWidget
(
const
_UpdateCounted
ClipPath
(
clipBehavior:
Clip
.
hardEdge
));
await
tester
.
pumpWidget
(
const
ClipPath
(
clipBehavior:
Clip
.
hardEdge
));
expect
(
renderClip
.
clipBehavior
,
equals
(
Clip
.
hardEdge
));
expect
(
renderClip
.
clipBehavior
,
equals
(
Clip
.
hardEdge
));
});
});
...
...
packages/flutter/test/widgets/physical_model_test.dart
View file @
88ddde4c
...
@@ -9,20 +9,10 @@ import 'package:flutter/rendering.dart';
...
@@ -9,20 +9,10 @@ import 'package:flutter/rendering.dart';
import
'package:flutter/widgets.dart'
;
import
'package:flutter/widgets.dart'
;
import
'package:flutter_test/flutter_test.dart'
;
import
'package:flutter_test/flutter_test.dart'
;
class
_UpdateCountedPhysicalModel
extends
PhysicalModel
{
const
_UpdateCountedPhysicalModel
({
Clip
clipBehavior
=
Clip
.
none
})
:
super
(
clipBehavior:
clipBehavior
,
color:
Colors
.
red
);
}
class
_UpdateCountedPhysicalShape
extends
PhysicalShape
{
const
_UpdateCountedPhysicalShape
({
Clip
clipBehavior
=
Clip
.
none
})
:
super
(
clipBehavior:
clipBehavior
,
color:
Colors
.
red
,
clipper:
const
ShapeBorderClipper
(
shape:
CircleBorder
()));
}
void
main
(
)
{
void
main
(
)
{
testWidgets
(
'PhysicalModel updates clipBehavior in updateRenderObject'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'PhysicalModel updates clipBehavior in updateRenderObject'
,
(
WidgetTester
tester
)
async
{
await
tester
.
pumpWidget
(
await
tester
.
pumpWidget
(
const
MaterialApp
(
home:
_UpdateCountedPhysicalModel
(
)),
const
MaterialApp
(
home:
PhysicalModel
(
color:
Colors
.
red
)),
);
);
final
RenderPhysicalModel
renderPhysicalModel
=
tester
.
allRenderObjects
.
whereType
<
RenderPhysicalModel
>().
first
;
final
RenderPhysicalModel
renderPhysicalModel
=
tester
.
allRenderObjects
.
whereType
<
RenderPhysicalModel
>().
first
;
...
@@ -30,7 +20,7 @@ void main() {
...
@@ -30,7 +20,7 @@ void main() {
expect
(
renderPhysicalModel
.
clipBehavior
,
equals
(
Clip
.
none
));
expect
(
renderPhysicalModel
.
clipBehavior
,
equals
(
Clip
.
none
));
await
tester
.
pumpWidget
(
await
tester
.
pumpWidget
(
const
MaterialApp
(
home:
_UpdateCountedPhysicalModel
(
clipBehavior:
Clip
.
antiAlias
)),
const
MaterialApp
(
home:
PhysicalModel
(
clipBehavior:
Clip
.
antiAlias
,
color:
Colors
.
red
)),
);
);
expect
(
renderPhysicalModel
.
clipBehavior
,
equals
(
Clip
.
antiAlias
));
expect
(
renderPhysicalModel
.
clipBehavior
,
equals
(
Clip
.
antiAlias
));
...
@@ -38,7 +28,7 @@ void main() {
...
@@ -38,7 +28,7 @@ void main() {
testWidgets
(
'PhysicalShape updates clipBehavior in updateRenderObject'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'PhysicalShape updates clipBehavior in updateRenderObject'
,
(
WidgetTester
tester
)
async
{
await
tester
.
pumpWidget
(
await
tester
.
pumpWidget
(
const
MaterialApp
(
home:
_UpdateCountedPhysicalShape
(
)),
const
MaterialApp
(
home:
PhysicalShape
(
color:
Colors
.
red
,
clipper:
ShapeBorderClipper
(
shape:
CircleBorder
())
)),
);
);
final
RenderPhysicalShape
renderPhysicalShape
=
tester
.
allRenderObjects
.
whereType
<
RenderPhysicalShape
>().
first
;
final
RenderPhysicalShape
renderPhysicalShape
=
tester
.
allRenderObjects
.
whereType
<
RenderPhysicalShape
>().
first
;
...
@@ -46,7 +36,7 @@ void main() {
...
@@ -46,7 +36,7 @@ void main() {
expect
(
renderPhysicalShape
.
clipBehavior
,
equals
(
Clip
.
none
));
expect
(
renderPhysicalShape
.
clipBehavior
,
equals
(
Clip
.
none
));
await
tester
.
pumpWidget
(
await
tester
.
pumpWidget
(
const
MaterialApp
(
home:
_UpdateCountedPhysicalShape
(
clipBehavior:
Clip
.
antiAlias
)),
const
MaterialApp
(
home:
PhysicalShape
(
clipBehavior:
Clip
.
antiAlias
,
color:
Colors
.
red
,
clipper:
ShapeBorderClipper
(
shape:
CircleBorder
())
)),
);
);
expect
(
renderPhysicalShape
.
clipBehavior
,
equals
(
Clip
.
antiAlias
));
expect
(
renderPhysicalShape
.
clipBehavior
,
equals
(
Clip
.
antiAlias
));
...
...
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