Skip to content

Commit 609a980

Browse files
chinmaygardechinmaygarde
authored
Fix uninitialized variables and put tests in flutter namespace. (#9613)
Also enabled the tests previously disabled due to flakiness caused by these uninitialized variables. Fixes #35338
1 parent 9807894 commit 609a980

1 file changed

Lines changed: 65 additions & 52 deletions

File tree

‎flow/mutators_stack_unittests.cc‎

Lines changed: 65 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -5,79 +5,85 @@
55
#include "flutter/flow/embedded_views.h"
66
#include "gtest/gtest.h"
77

8+
namespace flutter {
9+
namespace testing {
10+
811
TEST(MutatorsStack, Initialization) {
9-
flutter::MutatorsStack stack;
12+
MutatorsStack stack;
1013
ASSERT_TRUE(true);
1114
}
1215

13-
TEST(MutatorsStack, DISABLED_CopyConstructor) {
14-
flutter::MutatorsStack stack;
15-
SkRRect rrect;
16-
SkRect rect;
16+
TEST(MutatorsStack, CopyConstructor) {
17+
MutatorsStack stack;
18+
auto rrect = SkRRect::MakeEmpty();
19+
auto rect = SkRect::MakeEmpty();
1720
stack.pushClipRect(rect);
1821
stack.pushClipRRect(rrect);
19-
flutter::MutatorsStack copy = flutter::MutatorsStack(stack);
22+
MutatorsStack copy = MutatorsStack(stack);
2023
ASSERT_TRUE(copy == stack);
2124
}
2225

23-
TEST(MutatorsStack, DISABLED_PushClipRect) {
24-
flutter::MutatorsStack stack;
25-
SkRect rect;
26+
TEST(MutatorsStack, PushClipRect) {
27+
MutatorsStack stack;
28+
auto rect = SkRect::MakeEmpty();
2629
stack.pushClipRect(rect);
2730
auto iter = stack.bottom();
28-
ASSERT_TRUE(iter->get()->type() == flutter::MutatorType::clip_rect);
31+
ASSERT_TRUE(iter->get()->type() == MutatorType::clip_rect);
2932
ASSERT_TRUE(iter->get()->rect() == rect);
3033
}
3134

3235
TEST(MutatorsStack, PushClipRRect) {
33-
flutter::MutatorsStack stack;
34-
SkRRect rrect;
36+
MutatorsStack stack;
37+
auto rrect = SkRRect::MakeEmpty();
3538
stack.pushClipRRect(rrect);
3639
auto iter = stack.bottom();
37-
ASSERT_TRUE(iter->get()->type() == flutter::MutatorType::clip_rrect);
40+
ASSERT_TRUE(iter->get()->type() == MutatorType::clip_rrect);
3841
ASSERT_TRUE(iter->get()->rrect() == rrect);
3942
}
4043

4144
TEST(MutatorsStack, PushTransform) {
42-
flutter::MutatorsStack stack;
45+
MutatorsStack stack;
4346
SkMatrix matrix;
47+
matrix.setIdentity();
4448
stack.pushTransform(matrix);
4549
auto iter = stack.bottom();
46-
ASSERT_TRUE(iter->get()->type() == flutter::MutatorType::transform);
50+
ASSERT_TRUE(iter->get()->type() == MutatorType::transform);
4751
ASSERT_TRUE(iter->get()->matrix() == matrix);
4852
}
4953

5054
TEST(MutatorsStack, Pop) {
51-
flutter::MutatorsStack stack;
55+
MutatorsStack stack;
5256
SkMatrix matrix;
57+
matrix.setIdentity();
5358
stack.pushTransform(matrix);
5459
stack.pop();
5560
auto iter = stack.bottom();
5661
ASSERT_TRUE(iter == stack.top());
5762
}
5863

59-
TEST(MutatorsStack, DISABLED_Traversal) {
60-
flutter::MutatorsStack stack;
64+
TEST(MutatorsStack, Traversal) {
65+
MutatorsStack stack;
6166
SkMatrix matrix;
67+
matrix.setIdentity();
6268
stack.pushTransform(matrix);
63-
SkRect rect;
69+
auto rect = SkRect::MakeEmpty();
6470
stack.pushClipRect(rect);
65-
SkRRect rrect;
71+
auto rrect = SkRRect::MakeEmpty();
6672
stack.pushClipRRect(rrect);
6773
auto iter = stack.bottom();
6874
int index = 0;
6975
while (iter != stack.top()) {
7076
switch (index) {
7177
case 0:
72-
ASSERT_TRUE(iter->get()->type() == flutter::MutatorType::clip_rrect);
78+
ASSERT_TRUE(iter->get()->type() == MutatorType::clip_rrect);
7379
ASSERT_TRUE(iter->get()->rrect() == rrect);
7480
break;
7581
case 1:
76-
ASSERT_TRUE(iter->get()->type() == flutter::MutatorType::clip_rect);
82+
ASSERT_TRUE(iter->get()->type() == MutatorType::clip_rect);
7783
ASSERT_TRUE(iter->get()->rect() == rect);
7884
break;
7985
case 2:
80-
ASSERT_TRUE(iter->get()->type() == flutter::MutatorType::transform);
86+
ASSERT_TRUE(iter->get()->type() == MutatorType::transform);
8187
ASSERT_TRUE(iter->get()->matrix() == matrix);
8288
break;
8389
default:
@@ -89,15 +95,15 @@ TEST(MutatorsStack, DISABLED_Traversal) {
8995
}
9096

9197
TEST(MutatorsStack, Equality) {
92-
flutter::MutatorsStack stack;
98+
MutatorsStack stack;
9399
SkMatrix matrix = SkMatrix::MakeScale(1, 1);
94100
stack.pushTransform(matrix);
95101
SkRect rect = SkRect::MakeEmpty();
96102
stack.pushClipRect(rect);
97103
SkRRect rrect = SkRRect::MakeEmpty();
98104
stack.pushClipRRect(rrect);
99105

100-
flutter::MutatorsStack stackOther;
106+
MutatorsStack stackOther;
101107
SkMatrix matrixOther = SkMatrix::MakeScale(1, 1);
102108
stackOther.pushTransform(matrixOther);
103109
SkRect rectOther = SkRect::MakeEmpty();
@@ -110,71 +116,78 @@ TEST(MutatorsStack, Equality) {
110116

111117
TEST(Mutator, Initialization) {
112118
SkRect rect = SkRect::MakeEmpty();
113-
flutter::Mutator mutator = flutter::Mutator(rect);
114-
ASSERT_TRUE(mutator.type() == flutter::MutatorType::clip_rect);
119+
Mutator mutator = Mutator(rect);
120+
ASSERT_TRUE(mutator.type() == MutatorType::clip_rect);
115121
ASSERT_TRUE(mutator.rect() == rect);
116122

117-
SkRRect rrect;
118-
flutter::Mutator mutator2 = flutter::Mutator(rrect);
119-
ASSERT_TRUE(mutator2.type() == flutter::MutatorType::clip_rrect);
123+
SkRRect rrect = SkRRect::MakeEmpty();
124+
Mutator mutator2 = Mutator(rrect);
125+
ASSERT_TRUE(mutator2.type() == MutatorType::clip_rrect);
120126
ASSERT_TRUE(mutator2.rrect() == rrect);
121127

122128
SkPath path;
123-
flutter::Mutator mutator3 = flutter::Mutator(path);
124-
ASSERT_TRUE(mutator3.type() == flutter::MutatorType::clip_path);
129+
Mutator mutator3 = Mutator(path);
130+
ASSERT_TRUE(mutator3.type() == MutatorType::clip_path);
125131
ASSERT_TRUE(mutator3.path() == path);
126132

127133
SkMatrix matrix;
128-
flutter::Mutator mutator4 = flutter::Mutator(matrix);
129-
ASSERT_TRUE(mutator4.type() == flutter::MutatorType::transform);
134+
matrix.setIdentity();
135+
Mutator mutator4 = Mutator(matrix);
136+
ASSERT_TRUE(mutator4.type() == MutatorType::transform);
130137
ASSERT_TRUE(mutator4.matrix() == matrix);
131138
}
132139

133140
TEST(Mutator, CopyConstructor) {
134141
SkRect rect = SkRect::MakeEmpty();
135-
flutter::Mutator mutator = flutter::Mutator(rect);
136-
flutter::Mutator copy = flutter::Mutator(mutator);
142+
Mutator mutator = Mutator(rect);
143+
Mutator copy = Mutator(mutator);
137144
ASSERT_TRUE(mutator == copy);
138145

139-
SkRRect rrect;
140-
flutter::Mutator mutator2 = flutter::Mutator(rrect);
141-
flutter::Mutator copy2 = flutter::Mutator(mutator2);
146+
SkRRect rrect = SkRRect::MakeEmpty();
147+
Mutator mutator2 = Mutator(rrect);
148+
Mutator copy2 = Mutator(mutator2);
142149
ASSERT_TRUE(mutator2 == copy2);
143150

144151
SkPath path;
145-
flutter::Mutator mutator3 = flutter::Mutator(path);
146-
flutter::Mutator copy3 = flutter::Mutator(mutator3);
152+
Mutator mutator3 = Mutator(path);
153+
Mutator copy3 = Mutator(mutator3);
147154
ASSERT_TRUE(mutator3 == copy3);
148155

149156
SkMatrix matrix;
150-
flutter::Mutator mutator4 = flutter::Mutator(matrix);
151-
flutter::Mutator copy4 = flutter::Mutator(mutator4);
157+
matrix.setIdentity();
158+
Mutator mutator4 = Mutator(matrix);
159+
Mutator copy4 = Mutator(mutator4);
152160
ASSERT_TRUE(mutator4 == copy4);
153161
}
154162

155163
TEST(Mutator, Equality) {
156164
SkMatrix matrix;
157-
flutter::Mutator mutator = flutter::Mutator(matrix);
158-
flutter::Mutator otherMutator = flutter::Mutator(matrix);
165+
matrix.setIdentity();
166+
Mutator mutator = Mutator(matrix);
167+
Mutator otherMutator = Mutator(matrix);
159168
ASSERT_TRUE(mutator == otherMutator);
160169

161170
SkRect rect = SkRect::MakeEmpty();
162-
flutter::Mutator mutator2 = flutter::Mutator(rect);
163-
flutter::Mutator otherMutator2 = flutter::Mutator(rect);
171+
Mutator mutator2 = Mutator(rect);
172+
Mutator otherMutator2 = Mutator(rect);
164173
ASSERT_TRUE(mutator2 == otherMutator2);
165174

166-
SkRRect rrect;
167-
flutter::Mutator mutator3 = flutter::Mutator(rrect);
168-
flutter::Mutator otherMutator3 = flutter::Mutator(rrect);
175+
SkRRect rrect = SkRRect::MakeEmpty();
176+
Mutator mutator3 = Mutator(rrect);
177+
Mutator otherMutator3 = Mutator(rrect);
169178
ASSERT_TRUE(mutator3 == otherMutator3);
170179

171180
ASSERT_FALSE(mutator2 == mutator);
172181
}
173182

174183
TEST(Mutator, UnEquality) {
175184
SkRect rect = SkRect::MakeEmpty();
176-
flutter::Mutator mutator = flutter::Mutator(rect);
185+
Mutator mutator = Mutator(rect);
177186
SkMatrix matrix;
178-
flutter::Mutator notEqualMutator = flutter::Mutator(matrix);
187+
matrix.setIdentity();
188+
Mutator notEqualMutator = Mutator(matrix);
179189
ASSERT_TRUE(notEqualMutator != mutator);
180190
}
191+
192+
} // namespace testing
193+
} // namespace flutter

0 commit comments

Comments
 (0)