Introduced specifying annotations ValidChunks and InvalidChunks.

Author: Torsten-Mumme

…itarray/automotion/tests/grid/Chunk.java …itarray/automotion/validation/Chunk.javasrc/test/java/net/itarray/automotion/tests/grid/Chunk.java renamed to src/main/java/net/itarray/automotion/validation/Chunk.java src/test/java/net/itarray/automotion/tests/grid/Chunk.java renamed to src/main/java/net/itarray/automotion/validation/Chunk.java

@@ -1,4 +1,6 @@
-package net.itarray.automotion.tests.grid;
+package net.itarray.automotion.validation;
+
+import net.itarray.automotion.validation.Element;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -12,4 +14,5 @@
 @Inherited
 public @interface Chunk {
     Element[] value() default {};
+    String name() default "";
 }

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

@@ -20,6 +20,19 @@ public interface ChunkUIElementValidator {
      *
      * @return this
      */
+    @ValidChunks({
+            @Chunk(name = "empty chunk", value={
+            }),
+            @Chunk(name = "single element chunk", value={
+                    @Element({10, 20, 30, 35}),
+            }),
+    })
+    @InvalidChunks({
+            @Chunk(name = "chunk with two overlapping elements", value={
+                    @Element({10, 20, 30, 35}),
+                    @Element({15, 25, 35, 50}),
+            }),
+    })
     ChunkUIElementValidator areAlignedAsGridCells();
 
     // area

…array/automotion/tests/grid/Element.java …array/automotion/validation/Element.javasrc/test/java/net/itarray/automotion/tests/grid/Element.java renamed to src/main/java/net/itarray/automotion/validation/Element.java src/test/java/net/itarray/automotion/tests/grid/Element.java renamed to src/main/java/net/itarray/automotion/validation/Element.java

@@ -1,4 +1,4 @@
-package net.itarray.automotion.tests.grid;
+package net.itarray.automotion.validation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

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

@@ -0,0 +1,15 @@
+package net.itarray.automotion.validation;
+
+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.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+public @interface InvalidChunks {
+    Chunk[] value() default {};
+}

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

@@ -0,0 +1,15 @@
+package net.itarray.automotion.validation;
+
+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.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+public @interface ValidChunks {
+    Chunk[] value() default {};
+}

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

@@ -0,0 +1,63 @@
+package net.itarray.automotion.tests.grid;
+
+import com.google.common.collect.Lists;
+import net.itarray.automotion.validation.Chunk;
+import net.itarray.automotion.validation.ChunkUIElementValidator;
+import net.itarray.automotion.validation.InvalidChunks;
+import net.itarray.automotion.validation.ValidChunks;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@RunWith(Parameterized.class)
+public class AnnotatedSpecificationTest {
+
+    @Parameters(name = "{2}")
+    public static Collection<Object[]> data() {
+        Collection<Object[]> result = Lists.newArrayList();
+        for (Method method : ChunkUIElementValidator.class.getDeclaredMethods()) {
+            ValidChunks validChunks = method.getAnnotation(ValidChunks.class);
+            if (validChunks != null) {
+                for (Chunk chunk : validChunks.value()) {
+                    String name = String.format("%s is valid on %s", method.getName(), chunk.name());
+                    result.add(new Object[]{method, chunk, name});
+                }
+            }
+            InvalidChunks invalidChunks = method.getAnnotation(InvalidChunks.class);
+            if (validChunks != null) {
+                for (Chunk chunk : invalidChunks.value()) {
+                    String name = String.format("%s is invalid on %s", method.getName(), chunk.name());
+                    result.add(new Object[]{method, chunk, name});
+                }
+            }
+        }
+        return result;
+    }
+
+    @Parameter
+    public Method method;
+
+    @Parameter(1)
+    public Chunk chunk;
+
+    @Parameter(2)
+    public String name;
+
+    @Test
+    public void valid() {
+
+        System.out.println("method = " + method);
+    }
+}

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

@@ -1,7 +1,9 @@
 package net.itarray.automotion.tests.grid;
 
 import net.itarray.automotion.internal.ResponsiveUIValidatorBase;
+import net.itarray.automotion.validation.Chunk;
 import net.itarray.automotion.validation.ChunkUIElementValidator;
+import net.itarray.automotion.validation.Element;
 import net.itarray.automotion.validation.ResponsiveUIValidator;
 import net.itarray.automotion.validation.UISnapshot;
 import org.junit.Before;

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

@@ -1,5 +1,6 @@
 package net.itarray.automotion.tests.grid;
 
+import net.itarray.automotion.validation.Chunk;
 import org.junit.Test;
 
 @Chunk

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

@@ -1,5 +1,6 @@
 package net.itarray.automotion.tests.grid;
 
+import net.itarray.automotion.validation.Chunk;
 import org.junit.Test;
 
 @Chunk

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

@@ -1,5 +1,7 @@
 package net.itarray.automotion.tests.grid;
 
+import net.itarray.automotion.validation.Chunk;
+import net.itarray.automotion.validation.Element;
 import org.junit.Test;
 
 @Chunk({