introduced useElements, allowing for empty chunks

Author: Torsten-Mumme

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

@@ -12,19 +12,17 @@
 import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
-import java.util.concurrent.ConcurrentSkipListMap;
-import java.util.concurrent.atomic.AtomicLong;
 
 import static net.itarray.automotion.internal.UIElement.*;
 
 public class ResponsiveUIChunkValidatorBase extends ResponsiveUIValidatorBase implements ChunkUIElementValidator {
 
     private final List<UIElement> rootElements;
 
-    public ResponsiveUIChunkValidatorBase(UISnapshot snapshot, List<WebElement> webElements) {
+    public ResponsiveUIChunkValidatorBase(UISnapshot snapshot, List<WebElement> webElements, boolean allowEmpty) {
         super(snapshot);
         rootElements = asElements(webElements);
-        if (webElements.isEmpty()) {
+        if (!allowEmpty && webElements.isEmpty()) {
             String message = "Set root web element";
             addError(message);
         }

src/main/java/net/itarray/automotion/validation/UISnapshot.java

@@ -52,7 +52,11 @@ public UIElementValidator findElement(WebElement webElement, String readableName
     }
 
     public ChunkUIElementValidator findElements(List<WebElement> webElements) {
-        return new ResponsiveUIChunkValidatorBase(this, webElements);
+        return new ResponsiveUIChunkValidatorBase(this, webElements, false);
+    }
+
+    public ChunkUIElementValidator useElements(List<WebElement> webElements) {
+        return new ResponsiveUIChunkValidatorBase(this, webElements, true   );
     }
 
     public File takeScreenshot() {

src/main/java/util/validator/ResponsiveUIChunkValidator.java

@@ -16,7 +16,7 @@
 public class ResponsiveUIChunkValidator extends AbstractValidator implements ChunkValidator {
 
     public ResponsiveUIChunkValidator(UISnapshot snapshot, DriverFacade driver, List<WebElement> webElements) {
-        super(driver, new ResponsiveUIChunkValidatorBase(snapshot, webElements));
+        super(driver, new ResponsiveUIChunkValidatorBase(snapshot, webElements, false));
         if (webElements.isEmpty()) {
             String message = "Set root web element";
             addError(message);

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

@@ -0,0 +1,14 @@
+package net.itarray.automotion.tests.grid;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+public @interface AllowEmpty {
+}

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

@@ -39,7 +39,11 @@ public void setUp() {
                     element.value()[3]
             ));
         }
-        chunkValidator = snapshot.findElements(webElements);
+        boolean allowEmpty = getClass().getAnnotation(AllowEmpty.class) != null;
+        chunkValidator =
+                allowEmpty ?
+                        snapshot.useElements(webElements) :
+                        snapshot.findElements(webElements);
     }
 
     public void assertValid() {

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

@@ -0,0 +1,27 @@
+package net.itarray.automotion.tests.grid;
+
+import org.junit.Test;
+
+@Chunk
+public class NoElementsTest extends ChunkTest {
+
+    @Test
+    public void areAlignedAsGridCells() {
+        chunkValidator.areAlignedAsGridCells();
+        assertInvalid();
+    }
+
+    @Test
+    public void areNotAlignedInThreeColumns() {
+        chunkValidator.alignedAsGrid(3);
+        assertInvalid();
+    }
+
+    @Test
+    public void areNotAlignedInThreeColumnsAndThreeRows() {
+        chunkValidator.alignedAsGrid(3, 3);
+        assertInvalid();
+    }
+
+
+}

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

@@ -0,0 +1,28 @@
+package net.itarray.automotion.tests.grid;
+
+import org.junit.Test;
+
+@Chunk
+@AllowEmpty
+public class NoElementsWithUseElementsTest extends ChunkTest {
+
+    @Test
+    public void areAlignedAsGridCells() {
+        chunkValidator.areAlignedAsGridCells();
+        assertValid();
+    }
+
+    @Test
+    public void areNotAlignedInThreeColumns() {
+        chunkValidator.alignedAsGrid(3);
+        assertValid();
+    }
+
+    @Test
+    public void areNotAlignedInThreeColumnsAndThreeRows() {
+        chunkValidator.alignedAsGrid(3, 3);
+        assertInvalid();
+    }
+
+
+}

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

@@ -0,0 +1,51 @@
+package net.itarray.automotion.tests.grid;
+
+import org.junit.Test;
+
+@Chunk({
+        @Element({10, 20, 40, 50})
+})
+public class OneElementTest extends ChunkTest {
+
+    @Test
+    public void areAlignedAsGridCells() {
+        chunkValidator.areAlignedAsGridCells();
+        assertValid();
+    }
+
+    @Test
+    public void areAlignedInTOneColumn() {
+        chunkValidator.alignedAsGrid(1);
+        assertValid();
+    }
+
+    @Test
+    public void areAlignedInOneColumnAndOneRow() {
+        chunkValidator.alignedAsGrid(1, 1);
+        assertValid();
+    }
+
+    @Test
+    public void areTopAligned() {
+        chunkValidator.areTopAligned();
+        assertValid();
+    }
+
+    @Test
+    public void areBottomAligned() {
+        chunkValidator.areBottomAligned();
+        assertValid();
+    }
+
+    @Test
+    public void areLeftAligned() {
+        chunkValidator.areLeftAligned();
+        assertValid();
+    }
+
+    @Test
+    public void areRightAligned() {
+        chunkValidator.areRightAligned();
+        assertValid();
+    }
+}