Skip to content

Commit c1a3485

Browse files
victoreronmoselevictoreronmosele
committed
Update tests
1 parent 6dc1202 commit c1a3485

7 files changed

+76
-80
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ app.*.map.json
4646
.metals
4747
.fvm/
4848
lib/firebase_options.dart
49-
.vscode/settings.json
49+
.vscode/

‎.vscode/settings.json

-5
This file was deleted.

‎pubspec.lock

+24-16
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ packages:
8585
dependency: "direct main"
8686
description:
8787
name: collection
88-
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
88+
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
8989
url: "https://pub.dev"
9090
source: hosted
91-
version: "1.17.1"
91+
version: "1.17.2"
9292
convert:
9393
dependency: transitive
9494
description:
@@ -317,18 +317,18 @@ packages:
317317
dependency: transitive
318318
description:
319319
name: matcher
320-
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
320+
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
321321
url: "https://pub.dev"
322322
source: hosted
323-
version: "0.12.15"
323+
version: "0.12.16"
324324
material_color_utilities:
325325
dependency: transitive
326326
description:
327327
name: material_color_utilities
328-
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
328+
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
329329
url: "https://pub.dev"
330330
source: hosted
331-
version: "0.2.0"
331+
version: "0.5.0"
332332
meta:
333333
dependency: transitive
334334
description:
@@ -538,10 +538,10 @@ packages:
538538
dependency: transitive
539539
description:
540540
name: source_span
541-
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
541+
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
542542
url: "https://pub.dev"
543543
source: hosted
544-
version: "1.9.1"
544+
version: "1.10.0"
545545
stack_trace:
546546
dependency: transitive
547547
description:
@@ -578,26 +578,26 @@ packages:
578578
dependency: "direct dev"
579579
description:
580580
name: test
581-
sha256: "3dac9aecf2c3991d09b9cdde4f98ded7b30804a88a0d7e4e7e1678e78d6b97f4"
581+
sha256: "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46"
582582
url: "https://pub.dev"
583583
source: hosted
584-
version: "1.24.1"
584+
version: "1.24.3"
585585
test_api:
586586
dependency: transitive
587587
description:
588588
name: test_api
589-
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
589+
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
590590
url: "https://pub.dev"
591591
source: hosted
592-
version: "0.5.1"
592+
version: "0.6.0"
593593
test_core:
594594
dependency: transitive
595595
description:
596596
name: test_core
597-
sha256: "5138dbffb77b2289ecb12b81c11ba46036590b72a64a7a90d6ffb880f1a29e93"
597+
sha256: "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e"
598598
url: "https://pub.dev"
599599
source: hosted
600-
version: "0.5.1"
600+
version: "0.5.3"
601601
typed_data:
602602
dependency: transitive
603603
description:
@@ -702,6 +702,14 @@ packages:
702702
url: "https://pub.dev"
703703
source: hosted
704704
version: "1.0.2"
705+
web:
706+
dependency: transitive
707+
description:
708+
name: web
709+
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
710+
url: "https://pub.dev"
711+
source: hosted
712+
version: "0.1.4-beta"
705713
web_socket_channel:
706714
dependency: transitive
707715
description:
@@ -751,5 +759,5 @@ packages:
751759
source: hosted
752760
version: "3.1.1"
753761
sdks:
754-
dart: ">=3.0.1 <4.0.0"
755-
flutter: ">=3.3.0"
762+
dart: ">=3.1.0 <4.0.0"
763+
flutter: ">=3.13.6"

‎test/unit_test/models/gradient_factory_test.dart

+7-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:flutter/material.dart';
2+
import 'package:flutter_gradient_generator/data/app_typedefs.dart';
23
import 'package:flutter_gradient_generator/enums/gradient_direction.dart';
34
import 'package:flutter_gradient_generator/enums/gradient_style.dart';
45
import 'package:flutter_gradient_generator/models/abstract_gradient.dart';
@@ -11,24 +12,20 @@ void main() {
1112
test(
1213
'GradientFactory returns the right AbstractGradient object given a GradientStyle',
1314
() {
14-
final List<Color> colorList = [
15-
const Color(0xFF921E1E),
16-
const Color(0xFF0A951F),
15+
final List<ColorAndStop> colorAndStopList = [
16+
(color: const Color(0xFF921E1E), stop: 0),
17+
(color: const Color(0xFF0A951F), stop: 100),
1718
];
1819

19-
final List<int> stopList = [0, 100];
20-
2120
const GradientDirection gradientDirection = GradientDirection.topLeft;
2221

2322
final Map<GradientStyle, AbstractGradient>
2423
gradientStyleToAbstractGradientMap = {
2524
GradientStyle.linear: LinearStyleGradient(
26-
colorList: colorList,
27-
stopList: stopList,
25+
colorAndStopList: colorAndStopList,
2826
gradientDirection: gradientDirection),
2927
GradientStyle.radial: RadialStyleGradient(
30-
colorList: colorList,
31-
stopList: stopList,
28+
colorAndStopList: colorAndStopList,
3229
gradientDirection: gradientDirection)
3330
};
3431

@@ -37,8 +34,7 @@ void main() {
3734
final AbstractGradient actualAbstractGradient = GradientFactory()
3835
.getGradient(
3936
gradientStyle: gradientStyle,
40-
colorList: colorList,
41-
stopList: stopList,
37+
colorAndStopList: colorAndStopList,
4238
gradientDirection: gradientDirection);
4339
final AbstractGradient expectedAbstractGradient = abstractGradient;
4440

‎test/unit_test/models/linear_style_gradient_test.dart

+16-17
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,31 @@
11
import 'package:flutter/material.dart';
2+
import 'package:flutter_gradient_generator/data/app_typedefs.dart';
23
import 'package:flutter_gradient_generator/enums/gradient_direction.dart';
34
import 'package:flutter_gradient_generator/enums/gradient_style.dart';
45
import 'package:flutter_gradient_generator/models/linear_style_gradient.dart';
56
import 'package:test/test.dart';
67

78
void main() {
89
group('LinearStyleGradient', () {
9-
late final List<Color> colorList;
10-
late final List<int> stopList;
10+
late final List<ColorAndStop> colorAndStopList;
1111
late final LinearStyleGradient linearStyleGradient;
1212

1313
setUpAll(() {
14-
colorList = [
15-
const Color(0xFF921E1E),
16-
const Color(0xFF0A951F),
14+
colorAndStopList = [
15+
(color: const Color(0xFF921E1E), stop: 0),
16+
(color: const Color(0xFF0A951F), stop: 100),
1717
];
1818

19-
stopList = [0, 100];
20-
2119
linearStyleGradient = LinearStyleGradient(
22-
colorList: colorList,
23-
stopList: stopList,
20+
colorAndStopList: colorAndStopList,
2421
gradientDirection: GradientDirection.topLeft);
2522
});
2623

2724
test('.toWidgetString() returns the correct widget string', () {
2825
final actualWidgetString = linearStyleGradient.toWidgetString();
2926
final expectedWidgetString = '''LinearGradient(
30-
colors: $colorList,
31-
stops: ${stopList.map((stop) => stop / 100).toList()},
27+
colors: ${colorAndStopList.map((colorAndStop) => colorAndStop.color).toList()},
28+
stops: ${colorAndStopList.map((colorAndStop) => colorAndStop.stop / 100).toList()},
3229
begin: ${Alignment.topLeft},
3330
end: ${Alignment.bottomRight},
3431
)
@@ -55,8 +52,7 @@ void main() {
5552
gradientDirectionToBeginAlignmentMap
5653
.forEach((GradientDirection gradientDirection, Alignment alignment) {
5754
final LinearStyleGradient testLinearStyleGradient = LinearStyleGradient(
58-
colorList: colorList,
59-
stopList: stopList,
55+
colorAndStopList: colorAndStopList,
6056
gradientDirection: gradientDirection);
6157

6258
final Alignment actualAlignment =
@@ -84,8 +80,7 @@ void main() {
8480
gradientDirectionToEndAlignmentMap
8581
.forEach((GradientDirection gradientDirection, Alignment alignment) {
8682
final LinearStyleGradient testLinearStyleGradient = LinearStyleGradient(
87-
colorList: colorList,
88-
stopList: stopList,
83+
colorAndStopList: colorAndStopList,
8984
gradientDirection: gradientDirection);
9085

9186
final Alignment actualAlignment = testLinearStyleGradient.endAlignment;
@@ -106,10 +101,14 @@ void main() {
106101
test('.toFlutterGradient() returns the right LinearGradient object', () {
107102
final Gradient actualGradient = linearStyleGradient.toFlutterGradient();
108103
final Gradient expectedGradient = LinearGradient(
109-
colors: colorList,
104+
colors: colorAndStopList
105+
.map((colorAndStop) => colorAndStop.color)
106+
.toList(),
110107
begin: Alignment.topLeft,
111108
end: Alignment.bottomRight,
112-
stops: stopList.map((stop) => stop / 100).toList());
109+
stops: colorAndStopList
110+
.map((colorAndStop) => colorAndStop.stop / 100)
111+
.toList());
113112

114113
expect(actualGradient, expectedGradient);
115114
});

‎test/unit_test/models/radial_style_gradient_test.dart

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,31 @@
11
import 'package:flutter/material.dart';
2+
import 'package:flutter_gradient_generator/data/app_typedefs.dart';
23
import 'package:flutter_gradient_generator/enums/gradient_direction.dart';
34
import 'package:flutter_gradient_generator/enums/gradient_style.dart';
45
import 'package:flutter_gradient_generator/models/radial_style_gradient.dart';
56
import 'package:test/test.dart';
67

78
void main() {
89
group('RadialStyleGradient', () {
9-
late final List<Color> colorList;
10-
late final List<int> stopList;
10+
late final List<ColorAndStop> colorAndStopList;
1111
late final RadialStyleGradient radialStyleGradient;
1212

1313
setUpAll(() {
14-
colorList = [
15-
const Color(0xFF921E1E),
16-
const Color(0xFF0A951F),
14+
colorAndStopList = [
15+
(color: const Color(0xFF921E1E), stop: 0),
16+
(color: const Color(0xFF0A951F), stop: 100),
1717
];
1818

19-
stopList = [0, 100];
20-
2119
radialStyleGradient = RadialStyleGradient(
22-
colorList: colorList,
23-
stopList: stopList,
20+
colorAndStopList: colorAndStopList,
2421
gradientDirection: GradientDirection.topLeft);
2522
});
2623

2724
test('.toWidgetString() returns the correct widget string', () {
2825
final actualWidgetString = radialStyleGradient.toWidgetString();
2926
final expectedWidgetString = '''RadialGradient(
30-
colors: $colorList,
31-
stops: ${stopList.map((stop) => stop / 100).toList()},
27+
colors: ${colorAndStopList.map((colorAndStop) => colorAndStop.color).toList()},
28+
stops: ${colorAndStopList.map((colorAndStop) => colorAndStop.stop / 100).toList()},
3229
center: ${Alignment.topLeft},
3330
)
3431
''';
@@ -54,8 +51,7 @@ void main() {
5451
gradientDirectionToCenterAlignmentMap
5552
.forEach((GradientDirection gradientDirection, Alignment alignment) {
5653
final RadialStyleGradient testRadialStyleGradient = RadialStyleGradient(
57-
colorList: colorList,
58-
stopList: stopList,
54+
colorAndStopList: colorAndStopList,
5955
gradientDirection: gradientDirection);
6056

6157
final Alignment actualAlignment =
@@ -77,9 +73,12 @@ void main() {
7773
test('.toFlutterGradient() returns the right RadialGradient object', () {
7874
final Gradient actualGradient = radialStyleGradient.toFlutterGradient();
7975
final Gradient expectedGradient = RadialGradient(
80-
colors: colorList,
76+
colors:
77+
colorAndStopList.map((colorAndStop) => colorAndStop.color).toList(),
8178
center: Alignment.topLeft,
82-
stops: stopList.map((stop) => stop / 100).toList(),
79+
stops: colorAndStopList
80+
.map((colorAndStop) => colorAndStop.stop / 100)
81+
.toList(),
8382
);
8483

8584
expect(actualGradient, expectedGradient);

‎test/unit_test/models/sweep_style_gradient_test.dart

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,31 @@
11
import 'package:flutter/material.dart';
2+
import 'package:flutter_gradient_generator/data/app_typedefs.dart';
23
import 'package:flutter_gradient_generator/enums/gradient_direction.dart';
34
import 'package:flutter_gradient_generator/enums/gradient_style.dart';
45
import 'package:flutter_gradient_generator/models/sweep_style_gradient.dart';
56
import 'package:test/test.dart';
67

78
void main() {
89
group('SweepStyleGradient', () {
9-
late final List<Color> colorList;
10-
late final List<int> stopList;
10+
late final List<ColorAndStop> colorAndStopList;
1111
late final SweepStyleGradient sweepStyleGradient;
1212

1313
setUpAll(() {
14-
colorList = [
15-
const Color(0xFF921E1E),
16-
const Color(0xFF0A951F),
14+
colorAndStopList = [
15+
(color: const Color(0xFF921E1E), stop: 0),
16+
(color: const Color(0xFF0A951F), stop: 100),
1717
];
1818

19-
stopList = [0, 100];
20-
2119
sweepStyleGradient = SweepStyleGradient(
22-
colorList: colorList,
23-
stopList: stopList,
20+
colorAndStopList: colorAndStopList,
2421
gradientDirection: GradientDirection.topLeft);
2522
});
2623

2724
test('.toWidgetString() returns the correct widget string', () {
2825
final actualWidgetString = sweepStyleGradient.toWidgetString();
2926
final expectedWidgetString = '''SweepGradient(
30-
colors: $colorList,
31-
stops: ${stopList.map((stop) => stop / 100).toList()},
27+
colors: ${colorAndStopList.map((colorAndStop) => colorAndStop.color).toList()},
28+
stops: ${colorAndStopList.map((colorAndStop) => colorAndStop.stop / 100).toList()},
3229
center: ${Alignment.topLeft},
3330
)
3431
''';
@@ -54,8 +51,7 @@ void main() {
5451
gradientDirectionToCenterAlignmentMap
5552
.forEach((GradientDirection gradientDirection, Alignment alignment) {
5653
final SweepStyleGradient testSweepStyleGradient = SweepStyleGradient(
57-
colorList: colorList,
58-
stopList: stopList,
54+
colorAndStopList: colorAndStopList,
5955
gradientDirection: gradientDirection);
6056

6157
final Alignment actualCenterAlignment =
@@ -78,9 +74,12 @@ void main() {
7874
final Gradient actualSweepGradient =
7975
sweepStyleGradient.toFlutterGradient();
8076
final Gradient expectedSweepGradient = SweepGradient(
81-
colors: colorList,
77+
colors:
78+
colorAndStopList.map((colorAndStop) => colorAndStop.color).toList(),
8279
center: Alignment.topLeft,
83-
stops: stopList.map((stop) => stop / 100).toList(),
80+
stops: colorAndStopList
81+
.map((colorAndStop) => colorAndStop.stop / 100)
82+
.toList(),
8483
);
8584

8685
expect(actualSweepGradient, expectedSweepGradient);

0 commit comments

Comments
 (0)