Revert "Merge pull request #74 from ITArray/GridAlignment"

This reverts commit a44487d, reversing
changes made to a8ae908.

revert because of bug

Author: dzaiats

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

@@ -1,7 +1,5 @@
 package net.itarray.automotion.internal;
 
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 import net.itarray.automotion.internal.geometry.Scalar;
 import net.itarray.automotion.validation.ChunkUIElementValidator;
 import net.itarray.automotion.validation.UISnapshot;
@@ -12,7 +10,6 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentSkipListMap;
@@ -257,22 +254,13 @@ private void validateElementsAreNotOverlapped(List<UIElement> elements) {
     }
 
     private void validateGridAlignment(List<UIElement> elements, int columns, int rows) {
-        SortedMap<Scalar, Integer> countByYCoordinate = new TreeMap<>();
+        SortedMap<Scalar, Integer> map = new TreeMap<>();
         for (UIElement element : elements) {
-            int oldCount = countByYCoordinate.getOrDefault(element.getY(), 0);
-            countByYCoordinate.put(element.getY(), oldCount + 1);
+            int oldCount = map.getOrDefault(element.getY(), 0);
+            map.put(element.getY(), oldCount + 1);
         }
 
-        Set<Scalar> xCoordinates = Sets.newHashSet();
-        for (UIElement element : elements) {
-            xCoordinates.add(element.getX());
-        }
-
-        if (xCoordinates.size() > columns) {
-            addError(String.format("Elements in a grid are not aligned properly. Looks like grid has wrong amount of columns. Expected is %d. Actual is %d", columns, xCoordinates.size()));
-        }
-
-        int mapSize = countByYCoordinate.size();
+        int mapSize = map.size();
         if (rows > 0) {
             if (mapSize != rows) {
                 addError(String.format("Elements in a grid are not aligned properly. Looks like grid has wrong amount of rows. Expected is %d. Actual is %d", rows, mapSize));
@@ -282,7 +270,7 @@ private void validateGridAlignment(List<UIElement> elements, int columns, int ro
         if (columns > 0) {
             int errorLastLine = 0;
             int rowCount = 1;
-            for (Map.Entry<Scalar, Integer> entry : countByYCoordinate.entrySet()) {
+            for (Map.Entry<Scalar, Integer> entry : map.entrySet()) {
                 if (rowCount <= mapSize) {
                     int actualInARow = entry.getValue();
                     if (actualInARow != columns) {

src/test/java/net/itarray/automotion/tests/grid/GridTest.java

@@ -16,22 +16,79 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static rectangles.DummyWebElement.createElement;
 
-public class SevenElementsInThreeRowsWithDifferentSizesAndGuttersTest extends GridTest {
+public class SevenElementsInThreeRowsWithDifferentSizesAndGuttersTest {
 
-    public List<WebElement> createElemements() {
-        return newArrayList(
-                    createElement(100, 50, 300, 60),
-                    createElement(900, 50, 1200, 80),
-                    createElement(1300, 50, 1800, 80),
-                    createElement(100, 150, 300, 160),
-                    createElement(400, 150, 700, 170),
-                    createElement(1300, 150, 1800, 180)
-                    );
+    private ChunkUIElementValidator chunkValidator;
+
+    @Before
+    public void setUp() {
+        DummyDriverFacade driverFacade = new DummyDriverFacade();
+        driverFacade.setPageSize(new Dimension(2000, 1000));
+        ResponsiveUIValidator uiValidator = new ResponsiveUIValidator(driverFacade);
+        UISnapshot snapshot = uiValidator.snapshot();
+        List<WebElement> elements = newArrayList(
+                createElement(100, 50, 300, 60),
+                createElement(400, 50, 700, 70),
+                createElement(900, 50, 1200, 80),
+                createElement(100, 150, 300, 160),
+                createElement(400, 150, 700, 170),
+                createElement(900, 150, 1200, 180),
+                createElement(100, 250, 300, 160)
+                );
+        chunkValidator = snapshot.findElements(elements);
+    }
+
+    @Test
+    public void areNotAlignedInTwoColumns() {
+        chunkValidator.alignedAsGrid(2);
+        assertInvalid();
+    }
+
+    @Test
+    public void areAlignedInThreeColumns() {
+        chunkValidator.alignedAsGrid(3);
+        assertValid();
+    }
+
+    @Test
+    public void areAlignedInThreeColumnsAndThreeRows() {
+        chunkValidator.alignedAsGrid(3, 3);
+        assertValid();
     }
 
     @Test
     public void areNotAlignedInThreeColumnsAndTwoRows() {
         chunkValidator.alignedAsGrid(3, 2);
         assertInvalid();
     }
+
+    @Test
+    public void areNotAlignedInThreeColumnsAndTwoFour() {
+        chunkValidator.alignedAsGrid(3, 4);
+        assertInvalid();
+    }
+
+    @Test
+    public void areNotAlignedInFourColumns() {
+        chunkValidator.alignedAsGrid(4);
+        assertInvalid();
+    }
+
+    @Test
+    public void areNotAlignedInFourColumnsAndOneRow() {
+        chunkValidator.alignedAsGrid(4, 1);
+        assertInvalid();
+    }
+
+    public void assertValid() {
+        ResponsiveUIValidatorBase base = (ResponsiveUIValidatorBase) chunkValidator;
+        String lastMessage = base.getErrors().getLastMessage();
+        assertThat(lastMessage).isNull();
+    }
+
+    public void assertInvalid() {
+        ResponsiveUIValidatorBase base = (ResponsiveUIValidatorBase) chunkValidator;
+        String lastMessage = base.getErrors().getLastMessage();
+        assertThat(lastMessage).isNotNull();
+    }
 }

src/test/java/net/itarray/automotion/tests/grid/SevenElementsInThreeRowsWithDifferentSizesAndGuttersTest.java

@@ -17,13 +17,21 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static rectangles.DummyWebElement.createElement;
 
-public class ThreeElementsInARowWithDifferentSizesAndGuttersTest extends GridTest {
+public class ThreeElementsInARowWithDifferentSizesAndGuttersTest {
 
-    public List<WebElement> createElemements() {
-        return newArrayList(
-                    createElement(100, 50, 300, 60),
-                    createElement(400, 50, 700, 60),
-                    createElement(900, 50, 1200, 60));
+    private ChunkUIElementValidator chunkValidator;
+
+    @Before
+    public void setUp() {
+        DummyDriverFacade driverFacade = new DummyDriverFacade();
+        driverFacade.setPageSize(new Dimension(2000, 1000));
+        ResponsiveUIValidator uiValidator = new ResponsiveUIValidator(driverFacade);
+        UISnapshot snapshot = uiValidator.snapshot();
+        List<WebElement> elements = newArrayList(
+                createElement(100, 50, 300, 60),
+                createElement(400, 50, 700, 60),
+                createElement(900, 50, 1200, 60));
+        chunkValidator = snapshot.findElements(elements);
     }
 
     @Test
@@ -67,4 +75,16 @@ public void areNotAlignedInFourColumnsAndTwoRows() {
         chunkValidator.alignedAsGrid(4, 2);
         assertInvalid();
     }
+
+    public void assertValid() {
+        ResponsiveUIValidatorBase base = (ResponsiveUIValidatorBase) chunkValidator;
+        String lastMessage = base.getErrors().getLastMessage();
+        assertThat(lastMessage).isNull();
+    }
+
+    public void assertInvalid() {
+        ResponsiveUIValidatorBase base = (ResponsiveUIValidatorBase) chunkValidator;
+        String lastMessage = base.getErrors().getLastMessage();
+        assertThat(lastMessage).isNotNull();
+    }
 }