Skip to content

Commit 6101d46

Browse files
committed
Update parabank leafWidgetsOverlapping
1 parent 9484c6a commit 6101d46

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

testar/resources/settings/02_webdriver_parabank/Protocol_02_webdriver_parabank.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,8 @@ private boolean containsVerdictInfo(List<String> listOfDetectedErroneousVerdicts
227227
}
228228

229229
public Verdict leafWidgetsOverlapping(State state) {
230+
Verdict finalVerdict = Verdict.OK;
231+
230232
// Prepare a list that contains all the Rectangles from the leaf widgets
231233
List<Pair<Widget, Rect>> leafWidgetsRects = new ArrayList<>();
232234
for (Widget w : state) {
@@ -242,7 +244,7 @@ public Verdict leafWidgetsOverlapping(State state) {
242244
Rect rectOne = leafWidgetsRects.get(i).right();
243245
Rect rectTwo = leafWidgetsRects.get(j).right();
244246

245-
if (Rect.intersect(rectOne, rectTwo)) {
247+
if (Rect.overlap(rectOne, rectTwo)) {
246248

247249
Widget firstWidget = leafWidgetsRects.get(i).left();
248250
Widget secondWidget = leafWidgetsRects.get(j).left();
@@ -259,12 +261,16 @@ public Verdict leafWidgetsOverlapping(State state) {
259261
"Invariant Fault",
260262
0.5, 0.5);
261263

262-
return new Verdict(Verdict.Severity.WARNING_UI_VISUAL_OR_RENDERING_FAULT, verdictMsg, visualizer);
264+
Verdict clashVerdict = new Verdict(
265+
Verdict.Severity.WARNING_UI_VISUAL_OR_RENDERING_FAULT,
266+
verdictMsg,
267+
visualizer);
268+
finalVerdict = finalVerdict.join(clashVerdict);
263269
}
264270
}
265271
}
266272

267-
return Verdict.OK;
273+
return finalVerdict;
268274
}
269275

270276
private Pen getRedPen() {

0 commit comments

Comments
 (0)