Skip to content

Commit cae1e26

Browse files
committed
removed duplicated messages
1 parent 6ea7e97 commit cae1e26

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

src/main/java/net/itarray/automotion/internal/ResponsiveUIChunkValidatorBase.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@ private void validateSameWidth(List<UIElement> elements) {
375375
if (!element.hasSameWidthAs(elementToCompare, getContext())) {
376376
errors.add(String.format("Element %s has different width than element %s.", element.getQuotedName(), elementToCompare.getQuotedName()));
377377
errors.draw(element);
378-
errors.add(String.format("Element %s has different width than element %s.", elementToCompare.getQuotedName(), element.getQuotedName()));
379378
errors.draw(elementToCompare);
380379
}
381380
}
@@ -388,7 +387,6 @@ private void validateSameHeight(List<UIElement> elements) {
388387
if (!element.hasSameHeightAs(elementToCompare, getContext())) {
389388
errors.add(String.format("Element %s has different height than element %s.", element.getQuotedName(), elementToCompare.getQuotedName()));
390389
errors.draw(element);
391-
errors.add(String.format("Element %s has different height than element %s.", elementToCompare.getQuotedName(), element.getQuotedName()));
392390
errors.draw(elementToCompare);
393391
}
394392
}
@@ -399,10 +397,8 @@ private void validateSameSize(List<UIElement> elements) {
399397
UIElement element = elements.get(i);
400398
UIElement elementToCompare = elements.get(i + 1);
401399
if (!element.hasSameSizeAs(elementToCompare, getContext())) {
402-
// todo: one error message + visual feedback
403400
errors.add(String.format("Element %s has different size than element %s.", element.getQuotedName(), elementToCompare.getQuotedName()));
404401
errors.draw(element);
405-
errors.add(String.format("Element %s has different size than element %s.", elementToCompare.getQuotedName(), element.getQuotedName()));
406402
errors.draw(elementToCompare);
407403
}
408404

@@ -415,9 +411,8 @@ private void validateHaveDifferentSizes(List<UIElement> elements) {
415411
for (int secondIndex = firstIndex+1; secondIndex < elements.size(); secondIndex++) {
416412
UIElement elementToCompare = elements.get(secondIndex);
417413
if (element.hasSameSizeAs(elementToCompare, getContext())) {
418-
errors.add(String.format("Element #%d has same size. Element size is: [%s, %s]", (firstIndex + 1), element.getWidth(), element.getHeight()));
414+
errors.add(String.format("Element %s has same size than element %s.", element.getQuotedName(), elementToCompare.getQuotedName()));
419415
errors.draw(element);
420-
errors.add(String.format("Element #%d has same size. Element size is: [%s, %s]", (secondIndex + 1), elementToCompare.getWidth(), elementToCompare.getHeight()));
421416
errors.draw(elementToCompare);
422417
}
423418
}
@@ -430,9 +425,8 @@ private void validateHaveDifferentWidths(List<UIElement> elements) {
430425
for (int secondIndex = firstIndex+1; secondIndex < elements.size(); secondIndex++) {
431426
UIElement elementToCompare = elements.get(secondIndex);
432427
if (element.hasSameWidthAs(elementToCompare, getContext())) {
433-
errors.add(String.format("Element #%d has same width. Element width is: [%s, %s]", (firstIndex + 1), element.getWidth(), element.getHeight()));
428+
errors.add(String.format("Element %s has same width than element %s.", element.getQuotedName(), elementToCompare.getQuotedName()));
434429
errors.draw(element);
435-
errors.add(String.format("Element #%d has same width. Element width is: [%s, %s]", (secondIndex + 2), elementToCompare.getWidth(), elementToCompare.getHeight()));
436430
errors.draw(elementToCompare);
437431
}
438432
}
@@ -445,9 +439,8 @@ private void validateNotSameHeight(List<UIElement> elements) {
445439
for (int secondIndex = firstIndex+1; secondIndex < elements.size(); secondIndex++) {
446440
UIElement elementToCompare = elements.get(secondIndex);
447441
if (element.hasSameHeightAs(elementToCompare, getContext())) {
448-
errors.add(String.format("Element #%d has same height. Element height is: [%s, %s]", (firstIndex + 1), element.getWidth(), element.getHeight()));
442+
errors.add(String.format("Element %s has same height than element %s.", element.getQuotedName(), elementToCompare.getQuotedName()));
449443
errors.draw(element);
450-
errors.add(String.format("Element #%d has same height. Element height is: [%s, %s]", (secondIndex + 2), elementToCompare.getWidth(), elementToCompare.getHeight()));
451444
errors.draw(elementToCompare);
452445
}
453446
}

src/test/java/net/itarray/automotion/tests/errors/ErrorMessagesRegressionTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public void haveEqualWidthChunk() {
245245
createChunkValidator(createElement(100, 200, 505, 405)).haveEqualWidth();
246246
Errors errors = base.getErrors();
247247
assertThat(errors.getLastMessage())
248-
.isEqualTo("Element #2:[(100,200) - 405x205] has different width than element #1:[(100,200) - 400x200].");
248+
.isEqualTo("Element #1:[(100,200) - 400x200] has different width than element #2:[(100,200) - 405x205].");
249249
}
250250

251251
@Test
@@ -269,7 +269,7 @@ public void haveEqualHeightChunk() {
269269
createChunkValidator(createElement(100, 200, 505, 405)).haveEqualHeight();
270270
Errors errors = base.getErrors();
271271
assertThat(errors.getLastMessage())
272-
.isEqualTo("Element #2:[(100,200) - 405x205] has different height than element #1:[(100,200) - 400x200].");
272+
.isEqualTo("Element #1:[(100,200) - 400x200] has different height than element #2:[(100,200) - 405x205].");
273273
}
274274

275275
@Test
@@ -285,7 +285,7 @@ public void haveEqualSizeChunk() {
285285
createChunkValidator(createElement(100, 200, 505, 405)).haveEqualSize();
286286
Errors errors = base.getErrors();
287287
assertThat(errors.getLastMessage())
288-
.isEqualTo("Element #2:[(100,200) - 405x205] has different size than element #1:[(100,200) - 400x200].");
288+
.isEqualTo("Element #1:[(100,200) - 400x200] has different size than element #2:[(100,200) - 405x205].");
289289
}
290290

291291
@Test

0 commit comments

Comments
 (0)