Skip to content

Commit d91e2fc

Browse files
JanHolgerJanHolger
committed
Fixed tests
1 parent bb1a136 commit d91e2fc

9 files changed

Lines changed: 39 additions & 39 deletions

File tree

‎src/test/java/test/org/javawebstack/validator/AnnotationTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package test.org.javawebstack.validator;
22

33

4-
import org.javawebstack.abstractdata.AbstractMapper;
4+
import org.javawebstack.abstractdata.mapper.Mapper;
55
import org.javawebstack.validator.ValidationContext;
66
import org.javawebstack.validator.Validator;
77
import org.javawebstack.validator.rule.IntegerRule;
@@ -16,11 +16,11 @@ public class AnnotationTest {
1616
public void testIntegerAnnotation () {
1717
Validator validator = Validator.getValidator(TestObject1.class);
1818
TestObject1 test = new TestObject1();
19-
assertFalse(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
19+
assertFalse(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2020
test.x = 6;
21-
assertTrue(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
21+
assertTrue(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2222
test.x = 1338;
23-
assertFalse(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
23+
assertFalse(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2424
}
2525

2626
private static class TestObject1 {

‎src/test/java/test/org/javawebstack/validator/DoubleRuleTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package test.org.javawebstack.validator;
22

3-
import org.javawebstack.abstractdata.AbstractMapper;
3+
import org.javawebstack.abstractdata.mapper.Mapper;
44
import org.javawebstack.validator.ValidationContext;
55
import org.javawebstack.validator.Validator;
66
import org.javawebstack.validator.rule.DoubleRule;
@@ -13,19 +13,19 @@ public void testSimple() {
1313
Validator validator = Validator.getValidator(SimpleTest.class);
1414
SimpleTest test = new SimpleTest();
1515
test.value = "hello world";
16-
assertFalse(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
16+
assertFalse(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
1717
test.value = "13.37";
18-
assertTrue(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
18+
assertTrue(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
1919
}
2020

2121
@Test
2222
public void testEdgeCases() {
2323
Validator validator = Validator.getValidator(EdgeTest.class);
2424
EdgeTest test = new EdgeTest();
2525
test.value = 9.9;
26-
assertFalse(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
26+
assertFalse(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2727
test.value = 10.1;
28-
assertTrue(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
28+
assertTrue(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2929
}
3030

3131
private class SimpleTest {

‎src/test/java/test/org/javawebstack/validator/EmailRuleTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package test.org.javawebstack.validator;
22

3-
import org.javawebstack.abstractdata.AbstractMapper;
3+
import org.javawebstack.abstractdata.mapper.Mapper;
44
import org.javawebstack.validator.Rule;
55
import org.javawebstack.validator.ValidationContext;
66
import org.javawebstack.validator.Validator;
@@ -16,9 +16,9 @@ public void testSimpleEMailRule() {
1616
Validator validator = Validator.getValidator(TestObject1.class);
1717
TestObject1 test = new TestObject1();
1818
test.email = "Test";
19-
assertFalse(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
19+
assertFalse(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2020
test.email = "info@javawebstack.org";
21-
assertTrue(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
21+
assertTrue(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2222
}
2323

2424
private static class TestObject1 {

‎src/test/java/test/org/javawebstack/validator/IPv4RuleTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package test.org.javawebstack.validator;
22

3-
import org.javawebstack.abstractdata.AbstractMapper;
3+
import org.javawebstack.abstractdata.mapper.Mapper;
44
import org.javawebstack.validator.Rule;
55
import org.javawebstack.validator.ValidationContext;
66
import org.javawebstack.validator.Validator;
@@ -17,13 +17,13 @@ public void testSimpleIPV4Rules() {
1717
TestObject1 test = new TestObject1();
1818

1919
test.ip = "ThisIsNotAnIP";
20-
assertFalse(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
20+
assertFalse(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2121
test.ip = "0.0.0.0";
22-
assertTrue(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
22+
assertTrue(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2323
test.ip = "255.255.255.255";
24-
assertTrue(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
24+
assertTrue(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2525
test.ip = "256.455.275.295";
26-
assertFalse(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
26+
assertFalse(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2727
}
2828

2929

‎src/test/java/test/org/javawebstack/validator/IPv6RuleTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package test.org.javawebstack.validator;
22

3-
import org.javawebstack.abstractdata.AbstractMapper;
3+
import org.javawebstack.abstractdata.mapper.Mapper;
44
import org.javawebstack.validator.Rule;
55
import org.javawebstack.validator.ValidationContext;
66
import org.javawebstack.validator.Validator;
@@ -17,11 +17,11 @@ public void testSimpleIPV4Rules() {
1717

1818
// FIX IT
1919
//test.ip = "ThisIsNotAnIP";
20-
//assertFalse(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
20+
//assertFalse(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2121
test.ip = "::1/128";
22-
assertTrue(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
22+
assertTrue(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2323
test.ip = "0:0:0:0:0:0:0:0";
24-
assertTrue(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
24+
assertTrue(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2525
}
2626

2727

‎src/test/java/test/org/javawebstack/validator/MultipleRequiredFieldTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package test.org.javawebstack.validator;
22

3-
import org.javawebstack.abstractdata.AbstractMapper;
3+
import org.javawebstack.abstractdata.mapper.Mapper;
44
import org.javawebstack.validator.Rule;
55
import org.javawebstack.validator.ValidationContext;
66
import org.javawebstack.validator.Validator;
@@ -15,7 +15,7 @@ public void testSimpleMultipleRules() {
1515
Validator validator = Validator.getValidator(TestObject1.class);
1616
TestObject1 test = new TestObject1();
1717
test.name = "Test";
18-
assertFalse(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
18+
assertFalse(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
1919
}
2020

2121

‎src/test/java/test/org/javawebstack/validator/MultipleRuleTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package test.org.javawebstack.validator;
22

3-
import org.javawebstack.abstractdata.AbstractMapper;
3+
import org.javawebstack.abstractdata.mapper.Mapper;
44
import org.javawebstack.validator.Rule;
55
import org.javawebstack.validator.ValidationContext;
66
import org.javawebstack.validator.Validator;
@@ -15,11 +15,11 @@ public class MultipleRuleTest {
1515
public void testSimpleMultipleRules() {
1616
Validator validator = Validator.getValidator(TestObject1.class);
1717
TestObject1 test = new TestObject1();
18-
assertFalse(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
18+
assertFalse(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
1919
test.name = "Test";
20-
assertFalse(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
20+
assertFalse(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2121
test.name = "123";
22-
assertTrue(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
22+
assertTrue(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2323
}
2424

2525

‎src/test/java/test/org/javawebstack/validator/NumericRuleTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package test.org.javawebstack.validator;
22

3-
import org.javawebstack.abstractdata.AbstractMapper;
3+
import org.javawebstack.abstractdata.mapper.Mapper;
44
import org.javawebstack.validator.Rule;
55
import org.javawebstack.validator.ValidationContext;
66
import org.javawebstack.validator.Validator;
@@ -16,9 +16,9 @@ public void testSimpleNumericRule() {
1616
Validator validator = Validator.getValidator(TestObject1.class);
1717
TestObject1 test = new TestObject1();
1818
test.email = "abc";
19-
assertFalse(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
19+
assertFalse(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2020
test.email = "123";
21-
assertTrue(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
21+
assertTrue(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2222
}
2323

2424
private static class TestObject1 {

‎src/test/java/test/org/javawebstack/validator/RequiredRuleTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package test.org.javawebstack.validator;
22

3-
import org.javawebstack.abstractdata.AbstractMapper;
3+
import org.javawebstack.abstractdata.mapper.Mapper;
44
import org.javawebstack.validator.Rule;
55
import org.javawebstack.validator.ValidationContext;
66
import org.javawebstack.validator.Validator;
@@ -16,36 +16,36 @@ public class RequiredRuleTest {
1616
public void testSimpleRequiredRule() {
1717
Validator validator = Validator.getValidator(TestObject1.class);
1818
TestObject1 test = new TestObject1();
19-
assertFalse(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
19+
assertFalse(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2020
test.name = "Test";
2121
test.password = "123456";
22-
assertTrue(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
22+
assertTrue(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
2323
}
2424

2525
@Test
2626
public void testEmptyStringOption() {
2727
Validator validator = Validator.getValidator(TestObject1.class);
2828
TestObject1 test = new TestObject1();
2929
test.name = "";
30-
assertFalse(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
30+
assertFalse(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
3131
test.name = "Test";
3232
test.password = "";
33-
assertTrue(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
33+
assertTrue(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
3434
}
3535

3636
@Test
3737
public void testInnerRequiredRule() {
3838
Validator validator = Validator.getValidator(TestObject2.class);
3939
TestObject2 test = new TestObject2();
40-
assertTrue(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
40+
assertTrue(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
4141
test.inners = new TestObject2.Inner[0];
42-
assertTrue(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
42+
assertTrue(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
4343
test.inners = new TestObject2.Inner[]{
4444
new TestObject2.Inner()
4545
};
46-
assertFalse(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
46+
assertFalse(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
4747
test.inners[0].name = "Test";
48-
assertTrue(validator.validate(new ValidationContext(), new AbstractMapper().toAbstract(test)).isValid());
48+
assertTrue(validator.validate(new ValidationContext(), new Mapper().map(test)).isValid());
4949
}
5050

5151

0 commit comments

Comments
 (0)