Skip to content

F
Front-End
Unverified Commit f10965f2 authored by Rydmike's avatar Rydmike Committed by GitHub
Browse files
Options

FIX: UnderlineInputBorder hashCode and equality by including borderRadius (#118284)

parent 957781a1
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 10 deletions
packages/flutter/lib/src/material/input_border.dart
View file @ f10965f2
...@@ -259,12 +259,13 @@ class UnderlineInputBorder extends InputBorder { ...@@ -259,12 +259,13 @@ class UnderlineInputBorder extends InputBorder {
if (other.runtimeType != runtimeType) { if (other.runtimeType != runtimeType) {
return false; return false;
} }
return other is InputBorder return other is UnderlineInputBorder
&& other.borderSide == borderSide; && other.borderSide == borderSide
&& other.borderRadius == borderRadius;
} }
@override @override
int get hashCode => borderSide.hashCode; int get hashCode => Object.hash(borderSide, borderRadius);
} }
/// Draws a rounded rectangle around an [InputDecorator]'s container. /// Draws a rounded rectangle around an [InputDecorator]'s container.
......
packages/flutter/test/material/input_decorator_test.dart
View file @ f10965f2
...@@ -5338,11 +5338,40 @@ void main() { ...@@ -5338,11 +5338,40 @@ void main() {
gapPadding: 32.0, gapPadding: 32.0,
)); ));
expect(outlineInputBorder, isNot(const OutlineInputBorder())); expect(outlineInputBorder, isNot(const OutlineInputBorder()));
expect(outlineInputBorder, isNot(const OutlineInputBorder(
borderSide: BorderSide(color: Colors.red),
borderRadius: BorderRadius.all(Radius.circular(9.0)),
gapPadding: 32.0,
)));
expect(outlineInputBorder, isNot(const OutlineInputBorder(
borderSide: BorderSide(color: Colors.blue),
borderRadius: BorderRadius.all(Radius.circular(10.0)),
gapPadding: 32.0,
)));
expect(outlineInputBorder, isNot(const OutlineInputBorder(
borderSide: BorderSide(color: Colors.blue),
borderRadius: BorderRadius.all(Radius.circular(9.0)),
gapPadding: 33.0,
)));
// UnderlineInputBorder's equality is defined only by the borderSide // UnderlineInputBorder's equality is defined by the borderSide and borderRadius
const UnderlineInputBorder underlineInputBorder = UnderlineInputBorder(borderSide: BorderSide(color: Colors.blue)); const UnderlineInputBorder underlineInputBorder = UnderlineInputBorder(
expect(underlineInputBorder, const UnderlineInputBorder(borderSide: BorderSide(color: Colors.blue))); borderSide: BorderSide(color: Colors.blue),
borderRadius: BorderRadius.only(topLeft: Radius.circular(5.0), topRight: Radius.circular(5.0)),
);
expect(underlineInputBorder, const UnderlineInputBorder(
borderSide: BorderSide(color: Colors.blue),
borderRadius: BorderRadius.only(topLeft: Radius.circular(5.0), topRight: Radius.circular(5.0)),
));
expect(underlineInputBorder, isNot(const UnderlineInputBorder())); expect(underlineInputBorder, isNot(const UnderlineInputBorder()));
expect(underlineInputBorder, isNot(const UnderlineInputBorder(
borderSide: BorderSide(color: Colors.red),
borderRadius: BorderRadius.only(topLeft: Radius.circular(5.0), topRight: Radius.circular(5.0)),
)));
expect(underlineInputBorder, isNot(const UnderlineInputBorder(
borderSide: BorderSide(color: Colors.blue),
borderRadius: BorderRadius.only(topLeft: Radius.circular(6.0), topRight: Radius.circular(6.0)),
)));
}); });
test('InputBorder hashCodes', () { test('InputBorder hashCodes', () {
...@@ -5358,11 +5387,39 @@ void main() { ...@@ -5358,11 +5387,39 @@ void main() {
gapPadding: 32.0, gapPadding: 32.0,
).hashCode); ).hashCode);
expect(outlineInputBorder.hashCode, isNot(const OutlineInputBorder().hashCode)); expect(outlineInputBorder.hashCode, isNot(const OutlineInputBorder().hashCode));
expect(outlineInputBorder.hashCode, isNot(const OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(9.0)),
borderSide: BorderSide(color: Colors.red),
gapPadding: 32.0,
).hashCode));
expect(outlineInputBorder.hashCode, isNot(const OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(10.0)),
borderSide: BorderSide(color: Colors.blue),
gapPadding: 32.0,
).hashCode));
expect(outlineInputBorder.hashCode, isNot(const OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(9.0)),
borderSide: BorderSide(color: Colors.blue),
gapPadding: 33.0,
).hashCode));
// UnderlineInputBorder's hashCode is defined only by the borderSide // UnderlineInputBorder's hashCode is defined by the borderSide and borderRadius
const UnderlineInputBorder underlineInputBorder = UnderlineInputBorder(borderSide: BorderSide(color: Colors.blue)); const UnderlineInputBorder underlineInputBorder = UnderlineInputBorder(
expect(underlineInputBorder.hashCode, const UnderlineInputBorder(borderSide: BorderSide(color: Colors.blue)).hashCode); borderSide: BorderSide(color: Colors.blue),
expect(underlineInputBorder.hashCode, isNot(const UnderlineInputBorder().hashCode)); borderRadius: BorderRadius.only(topLeft: Radius.circular(5.0), topRight: Radius.circular(5.0)),
);
expect(underlineInputBorder.hashCode, const UnderlineInputBorder(
borderSide: BorderSide(color: Colors.blue),
borderRadius: BorderRadius.only(topLeft: Radius.circular(5.0), topRight: Radius.circular(5.0)),
).hashCode);
expect(underlineInputBorder.hashCode, isNot(const UnderlineInputBorder(
borderSide: BorderSide(color: Colors.red),
borderRadius: BorderRadius.only(topLeft: Radius.circular(5.0), topRight: Radius.circular(5.0)),
).hashCode));
expect(underlineInputBorder.hashCode, isNot(const UnderlineInputBorder(
borderSide: BorderSide(color: Colors.blue),
borderRadius: BorderRadius.only(topLeft: Radius.circular(6.0), topRight: Radius.circular(6.0)),
).hashCode));
}); });
testWidgets('InputDecorationTheme implements debugFillDescription', (WidgetTester tester) async { testWidgets('InputDecorationTheme implements debugFillDescription', (WidgetTester tester) async {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab