Avaje Digits use integer() property, Avaje Max/Min use long type

Author: rbygrave

blackbox-test/src/test/java/example/avaje/ANums.java

@@ -0,0 +1,30 @@
+package example.avaje;
+
+import io.avaje.validation.ValidPojo;
+import io.avaje.validation.constraints.*;
+
+@ValidPojo
+public class ANums {
+
+  @Digits(integer = 5, fraction = 3)
+  public String digits = "1234.12";
+
+  @Positive
+  public int positive = 3;
+
+  @PositiveOrZero
+  public int positiveOrZero = 0;
+
+  @Negative
+  public int negative = -3;
+
+  @NegativeOrZero
+  public int negativeOrZero = 0;
+
+  @Max(20)
+  public int max = 0;
+
+  @Min(5)
+  public int min = 6;
+
+}

blackbox-test/src/test/java/example/avaje/ANumsTest.java

@@ -0,0 +1,118 @@
+package example.avaje;
+
+import io.avaje.validation.ConstraintViolation;
+import io.avaje.validation.ConstraintViolationException;
+import io.avaje.validation.Validator;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Locale;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
+class ANumsTest {
+
+  final Validator validator = Validator.builder().build();
+
+  @Test
+  void valid() {
+    validator.validate(new ANums());
+  }
+
+  @Test
+  void digits() {
+    var bean = new ANums();
+    bean.digits = "12345678";
+    var violation = one(bean);
+    assertThat(violation.message()).isEqualTo("numeric value out of bounds (<5 digits>.<3 digits> expected)");
+  }
+
+  @Test
+  void digitsDE() {
+    var bean = new ANums();
+    bean.digits = "12345678";
+    var violation = one(bean, Locale.GERMAN);
+    assertThat(violation.message()).isEqualTo("numerischer Wert außerhalb des gültigen Bereichs (<5 digits>.<3 digits> erwartet)");
+  }
+
+  @Test
+  void positive() {
+    var bean = new ANums();
+    bean.positive = -1;
+    var violation = one(bean);
+    assertThat(violation.message()).isEqualTo("must be greater than 0");
+  }
+
+  @Test
+  void positiveDE() {
+    var bean = new ANums();
+    bean.positive = -1;
+    var violation = one(bean, Locale.GERMAN);
+    assertThat(violation.message()).isEqualTo("muss größer als 0 sein");
+  }
+
+  @Test
+  void positiveOrZero() {
+    var bean = new ANums();
+    bean.positiveOrZero = -1;
+    var violation = one(bean);
+    assertThat(violation.message()).isEqualTo("must be greater than or equal to 0");
+  }
+
+  @Test
+  void positiveOrZeroDE() {
+    var bean = new ANums();
+    bean.positiveOrZero = -1;
+    var violation = one(bean, Locale.GERMAN);
+    assertThat(violation.message()).isEqualTo("muss größer-gleich 0 sein");
+  }
+
+  @Test
+  void negative() {
+    var bean = new ANums();
+    bean.negative = 1;
+    var violation = one(bean);
+    assertThat(violation.message()).isEqualTo("must be less than 0");
+  }
+
+  @Test
+  void negativeDE() {
+    var bean = new ANums();
+    bean.negative = 1;
+    var violation = one(bean, Locale.GERMAN);
+    assertThat(violation.message()).isEqualTo("muss kleiner als 0 sein");
+  }
+
+  @Test
+  void negativeOrZero() {
+    var bean = new ANums();
+    bean.negativeOrZero = 1;
+    var violation = one(bean);
+    assertThat(violation.message()).isEqualTo("must be less than or equal to 0");
+  }
+
+  @Test
+  void negativeOrZeroDE() {
+    var bean = new ANums();
+    bean.negativeOrZero = 1;
+    var violation = one(bean, Locale.GERMAN);
+    assertThat(violation.message()).isEqualTo("muss kleiner-gleich 0 sein");
+  }
+
+  ConstraintViolation one(Object any) {
+    return one(any, Locale.ENGLISH);
+  }
+
+  ConstraintViolation one(Object any, Locale locale) {
+    try {
+      validator.validate(any, locale);
+      fail("not expected");
+      return null;
+    } catch (ConstraintViolationException e) {
+      var violations = new ArrayList<>(e.violations());
+      assertThat(violations).hasSize(1);
+      return violations.get(0);
+    }
+  }
+}

validator-constraints/src/main/java/io/avaje/validation/constraints/Digits.java

@@ -10,7 +10,7 @@
 
     Class<?>[] groups() default {};
 
-    int value();
+    int integer();
 
     int fraction() default 0;
 

validator-constraints/src/main/java/io/avaje/validation/constraints/Max.java

@@ -10,7 +10,7 @@
 
     Class<?>[] groups() default {};
 
-    double value();
+    long value();
 
     @Target({ElementType.METHOD, ElementType.FIELD})
     @Retention(RetentionPolicy.RUNTIME)

validator-constraints/src/main/java/io/avaje/validation/constraints/Min.java

@@ -10,7 +10,7 @@
 
     Class<?>[] groups() default {};
 
-    double value();
+    long value();
 
     @Target({ElementType.METHOD, ElementType.FIELD})
     @Retention(RetentionPolicy.RUNTIME)