Test consolidation

Author: aabashkin

src/test/java/org/owasp/esapi/reference/validation/annotations/StringValidationAnnotationTest.java

@@ -5,12 +5,15 @@
 
 import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.ConstraintViolation;
+import javax.validation.Valid;
 import javax.validation.Validation;
 import javax.validation.Validator;
 
@@ -192,6 +195,33 @@ public void testValidURI() {
         assertViolations(bean, 1);
     }
 
+    @Test
+    public void testValidString() {
+        Person person = new Person("John");
+        assertViolations(person, 0);
+    }
+
+    @Test
+    public void testInvalidStringType() {
+        Person person = new Person("John<script>");
+        assertViolations(person, 1);
+    }
+
+    @Test
+    public void testInvalidStringLength() {
+        Person person = new Person("John John John John John John John");
+        assertViolations(person, 1);
+    }
+
+    @Test
+    public void testInvalidStringCascading() {
+        Person person = new Person("John John John John John John John");
+        List<Person> people = new ArrayList<>();
+        people.add(person);
+        Department department = new Department(people);
+        assertViolations(department, 1);
+    }
+
     @Test
     public void testValidHTTPRequestParameterSet() {
         MockHttpServletRequest validRequest = new MockHttpServletRequest();
@@ -382,6 +412,24 @@ private static class UriBean {
         }
     }
 
+    private static class Person {
+        @ValidString(context = "name", type = "SafeString", maxLength = 32, allowNull = false)
+        private String name;
+
+        Person(String name) {
+            this.name = name;
+        }
+    }
+
+    private static class Department {
+        @Valid
+        private List<Person> people;
+
+        Department(List<Person> people) {
+            this.people = people;
+        }
+    }
+
     private static class HttpRequestBean {
         @ValidHTTPRequestParameterSet(
             context = "params",