Merge pull request #29 from ITArray/1.4.2-fix-grid-validation

1.4.2 fix grid validation

Author: dzaiats

src/main/java/util/validator/ResponsiveUIValidator.java

@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.atomic.AtomicLong;
 
 import static environment.EnvironmentFactory.*;
@@ -312,7 +313,7 @@ void validateElementsAreNotOverlapped(List<WebElement> rootElements) {
 
     void validateGridAlignment(int columns, int rows) {
         if (rootElements != null) {
-            ConcurrentHashMap<Integer, AtomicLong> map = new ConcurrentHashMap<>();
+            ConcurrentSkipListMap<Integer, AtomicLong> map = new ConcurrentSkipListMap<>();
             for (WebElement el : rootElements) {
                 Integer y = el.getLocation().y;
 
@@ -328,12 +329,16 @@ void validateGridAlignment(int columns, int rows) {
             }
 
             if (columns > 0) {
+                int errorLastLine = 0;
                 int rowCount = 1;
                 for (Map.Entry<Integer, AtomicLong> entry : map.entrySet()) {
                     if (rowCount <= mapSize) {
                         int actualInARow = entry.getValue().intValue();
                         if (actualInARow != columns) {
-                            putJsonDetailsWithoutElement(String.format("Elements in a grid are not aligned properly in row #%d. Expected %d elements in a row. Actually it's %d", rowCount, columns, actualInARow));
+                            errorLastLine ++;
+                            if (errorLastLine > 1) {
+                                putJsonDetailsWithoutElement(String.format("Elements in a grid are not aligned properly in row #%d. Expected %d elements in a row. Actually it's %d", rowCount, columns, actualInARow));
+                            }
                         }
                         rowCount++;
                     }