shared ChunkDefs and support for different find methods

Author: Torsten-Mumme

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

@@ -15,5 +15,6 @@
 public @interface Chunk {
     Element[] value() default {};
     String name() default "";
-    String parameters() default "";
+    String[] params() default {""};
+    boolean oneOrMore() default false;
 }

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

@@ -35,16 +35,15 @@ public interface ChunkUIElementValidator {
     // ? filled needs to be expressed somehow
     // areAlignedInColumns(numberOfColumns)
     @ValidChunks({
-            @Chunk(parameters = "3", name = "empty"),
-            @Chunk(parameters = "1", name = "one element"),
-            @Chunk(parameters = "3", name="three elements with different sizes in a row with different gutters"),
-            @Chunk(parameters = "4", name="three elements with different sizes in a row with different gutters"),
-            @Chunk(parameters = "3", name = "seven elements in three rows with different sizes and gutters"),
+            @Chunk(name = "empty", params = {"3"}),
+            @Chunk(name = "one element", params = {"1"}),
+            @Chunk(name = "three elements with different sizes in a row with different gutters", params = {"3", "4"}),
+            @Chunk(name = "seven elements in three rows with different sizes and gutters", params = {"3"}),
     })
     @InvalidChunks({
-            @Chunk(parameters = "2", name="three elements with different sizes in a row with different gutters"),
-            @Chunk(parameters = "2", name = "seven elements in three rows with different sizes and gutters"),
-            @Chunk(parameters = "4", name = "seven elements in three rows with different sizes and gutters"),
+            @Chunk(name = "empty", params = {"3"}, oneOrMore = true),
+            @Chunk(name = "three elements with different sizes in a row with different gutters", params = {"2"}),
+            @Chunk(name = "seven elements in three rows with different sizes and gutters", params = {"2", "4"}),
     })
     ChunkUIElementValidator alignedAsGrid(int horizontalGridSize);
 
@@ -62,25 +61,23 @@ public interface ChunkUIElementValidator {
             @Chunk(name = "seven elements in three rows with different sizes and gutters"),
     })
     @InvalidChunks({
+            @Chunk(name = "empty", oneOrMore = true),
             @Chunk(name = "two overlapping elements"),
     })
     ChunkUIElementValidator areAlignedAsGridCells();
 
 
     // area
     @ValidChunks({
-            @Chunk(parameters = "1, 1", name = "one element"),
-            @Chunk(parameters = "3, 1", name="three elements with different sizes in a row with different gutters"),
-            @Chunk(parameters = "4, 1", name="three elements with different sizes in a row with different gutters"),
-            @Chunk(parameters = "3, 3", name = "seven elements in three rows with different sizes and gutters"),
+            @Chunk(name = "one element", params = {"1, 1"}),
+            @Chunk(name = "three elements with different sizes in a row with different gutters", params = {"3, 1", "4, 1"}),
+            @Chunk(name = "seven elements in three rows with different sizes and gutters", params = {"3, 3"}),
     })
     @InvalidChunks({
-            @Chunk(parameters = "3, 3", name = "empty"),
-            @Chunk(parameters = "3, 2", name="three elements with different sizes in a row with different gutters"),
-            @Chunk(parameters = "4, 2", name="three elements with different sizes in a row with different gutters"),
-            @Chunk(parameters = "3, 2", name = "seven elements in three rows with different sizes and gutters"),
-            @Chunk(parameters = "3, 4", name = "seven elements in three rows with different sizes and gutters"),
-            @Chunk(parameters = "4, 1", name = "seven elements in three rows with different sizes and gutters"),
+            @Chunk(name = "empty", params = {"3, 3"}, oneOrMore = true),
+            @Chunk(name = "empty", params = {"3, 3"}),
+            @Chunk(name = "three elements with different sizes in a row with different gutters", params = {"3, 2", "4, 2"}),
+            @Chunk(name = "seven elements in three rows with different sizes and gutters", params = {"3, 2", "3, 4", "4, 1"}),
     })
     ChunkUIElementValidator alignedAsGrid(int horizontalGridSize, int verticalGridSize);
 

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

@@ -30,7 +30,6 @@
 import static rectangles.DummyWebElement.createElement;
 
 @RunWith(Parameterized.class)
-@PageSize
 public class AnnotatedSpecificationTest {
 
     protected ChunkUIElementValidator chunkValidator;
@@ -39,18 +38,14 @@ public class AnnotatedSpecificationTest {
     public void setUp() {
         DummyDriverFacade driverFacade = new DummyDriverFacade();
 
-        PageSize pageSize = getClass().getAnnotation(PageSize.class);
-        driverFacade.setPageSize(new Dimension(pageSize.xy()[0], pageSize.xy()[1]));
+        driverFacade.setPageSize(new Dimension(2000, 1000));
 
         ResponsiveUIValidator uiValidator = new ResponsiveUIValidator(driverFacade);
         UISnapshot snapshot = uiValidator.snapshot();
 
         List<WebElement> webElements = chunk;
-        boolean allowEmpty = true;
         chunkValidator =
-                allowEmpty ?
-                        snapshot.findZeroOrMoreElements(webElements) :
-                        snapshot.findElements(webElements);
+                this.oneOrMore ? snapshot.findElements(webElements) : snapshot.findZeroOrMoreElements(webElements);
     }
 
     public static List<WebElement> toWebElements(Chunk chunk) {
@@ -77,19 +72,23 @@ public static Collection<Object[]> data() {
             ValidChunks validChunks = method.getAnnotation(ValidChunks.class);
             if (validChunks != null) {
                 for (Chunk chunk : validChunks.value()) {
-                    String name = String.format("%s(%s) is valid on %s chunk", method.getName(), chunk.parameters(), chunk.name());
-                    Optional<List<WebElement>> repositoryChunk = repository.getChunk(chunk.name());
-                    List<WebElement> webElements = repositoryChunk.orElse(toWebElements(chunk));
-                    result.add(new Object[]{method, webElements, name, true, parseArgs(chunk.parameters())});
+                    for (String parameters : chunk.params()) {
+                        String name = String.format("%s(%s) is valid on %s chunk", method.getName(), parameters, chunk.name());
+                        Optional<List<WebElement>> repositoryChunk = repository.getChunk(chunk.name());
+                        List<WebElement> webElements = repositoryChunk.orElse(toWebElements(chunk));
+                        result.add(new Object[]{method, webElements, name, true, parseArgs(parameters), chunk.oneOrMore()});
+                    }
                 }
             }
             InvalidChunks invalidChunks = method.getAnnotation(InvalidChunks.class);
             if (invalidChunks != null) {
                 for (Chunk chunk : invalidChunks.value()) {
-                    String name = String.format("%s(%s) is not valid on %s chunk", method.getName(), chunk.parameters(), chunk.name());
-                    Optional<List<WebElement>> repositoryChunk = repository.getChunk(chunk.name());
-                    List<WebElement> webElements = repositoryChunk.orElse(toWebElements(chunk));
-                    result.add(new Object[]{method, webElements, name, false, parseArgs(chunk.parameters())});
+                    for (String parameters : chunk.params()) {
+                        String name = String.format("%s(%s) is not valid on %s chunk", method.getName(), parameters, chunk.name());
+                        Optional<List<WebElement>> repositoryChunk = repository.getChunk(chunk.name());
+                        List<WebElement> webElements = repositoryChunk.orElse(toWebElements(chunk));
+                        result.add(new Object[]{method, webElements, name, false, parseArgs(parameters), chunk.oneOrMore()});
+                    }
                 }
             }
         }
@@ -121,6 +120,10 @@ public static Object[] parseArgs(String parameters1) {
     @Parameter(4)
     public Object[] arguments;
 
+    @Parameter(5)
+    public boolean oneOrMore;
+
+
     @Test
     public void valid() {
         try {