Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added Test for Annotations
  • Loading branch information
x7airworker committed Dec 5, 2021
commit 3cf2d9e34ce78f7114cb0bf4f2a97f11c63bb12d
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
public @interface AlphaDashRule {
class Validator implements ValidationRule {
public Validator(AlphaDashRule rule) {}
public Validator() {}

@Override
public String validate(ValidationContext context, Field field, AbstractElement value) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
public @interface AlphaNumRule {
class Validator implements ValidationRule {
public Validator(AlphaNumRule rule) {}
public Validator() {}

@Override
public String validate(ValidationContext context, Field field, AbstractElement value) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
public @interface AlphaRule {
class Validator implements ValidationRule {
public Validator(AlphaRule rule) {}
public Validator() {}

@Override
public String validate(ValidationContext context, Field field, AbstractElement value) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
public @interface EmailRule {
class Validator implements ValidationRule {
public Validator(EmailRule rule) {}
public Validator() {}

@Override
public String validate(ValidationContext context, Field field, AbstractElement value) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
class Validator implements ValidationRule {
public Validator(RequiredRule rule) {} // needed

public Validator() {}

public String validate(ValidationContext context, Field field, AbstractElement value) {
return !value.isNull() ? null : "Missing required field";
}
Expand Down
31 changes: 31 additions & 0 deletions src/test/java/test/org/javawebstack/validator/AnnotationTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package test.org.javawebstack.validator;


import org.javawebstack.abstractdata.AbstractMapper;
import org.javawebstack.validator.ValidationContext;
import org.javawebstack.validator.Validator;
import org.javawebstack.validator.rule.IntegerRule;
import org.javawebstack.validator.rule.RequiredRule;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

public class AnnotationTest {
@Test
public void testIntegerAnnotation () {
Validator validator = Validator.getValidator(TestObject1.class);
TestObject1 test = new TestObject1();
assertFalse(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
test.x = 6;
assertTrue(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
test.x = 1338;
assertFalse(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
}

private static class TestObject1 {
@IntegerRule(min = 5, max = 1337)
@RequiredRule
int x;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import org.javawebstack.validator.Validator;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

public class IPv6RuleTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
import org.javawebstack.validator.Validator;
import org.junit.jupiter.api.Test;

import java.util.Arrays;

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

Expand Down