add tests from code review

Author: ewaostrowska

modules/swagger-core/src/test/java/io/swagger/v3/core/converting/ModelPropertyTest.java

@@ -15,9 +15,14 @@
 import io.swagger.v3.oas.models.media.StringSchema;
 import org.testng.annotations.Test;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
@@ -141,6 +146,37 @@ public void testIssue1743() {
         assertEquals(is.getEnum().get(1), new Integer(2));
     }
 
+    @Test
+    public void testNotNullWithNotBlankAndNotEmpty() {
+        final Map<String, Schema> models = ModelConverters.getInstance().readAll(NotNullWithNotBlankNotEmptyModel.class);
+        Schema model = models.get("NotNullWithNotBlankNotEmptyModel");
+        assertTrue(model.getRequired().contains("notNullAndNotBlank"));
+        assertTrue(model.getRequired().contains("notNullAndNotEmptyList"));
+        assertTrue(model.getRequired().contains("notNullAndNotEmptySet"));
+    }
+
+    @Test
+    public void testCollectionWithNotEmpty() {
+        final Map<String, Schema> models = ModelConverters.getInstance().readAll(CollectionWithNotEmptyModel.class);
+        Schema model = models.get("CollectionWithNotEmptyModel");
+        ArraySchema listSchema = (ArraySchema) model.getProperties().get("notEmptyList");
+        assertNotNull(listSchema);
+        assertEquals(listSchema.getMinItems(), Integer.valueOf(1));
+        ArraySchema setSchema = (ArraySchema) model.getProperties().get("notEmptySet");
+        assertNotNull(setSchema);
+        assertEquals(setSchema.getMinItems(), Integer.valueOf(1));
+    }
+
+    @Test
+    public void testStringWithNotBlankAndSize() {
+        final Map<String, Schema> models = ModelConverters.getInstance().readAll(StringWithNotBlankAndSizeModel.class);
+        Schema model = models.get("StringWithNotBlankAndSizeModel");
+        Schema strSchema = (Schema) model.getProperties().get("notBlankAndSized");
+        assertNotNull(strSchema);
+        assertEquals(strSchema.getMinLength(), Integer.valueOf(5));
+        assertEquals(strSchema.getMaxLength(), Integer.valueOf(10));
+    }
+
     class Family {
         public Date membersSince;
         public List<Person> members;
@@ -164,4 +200,32 @@ class IsModelTest {
         public Boolean is_happy;
         public String name;
     }
+
+    static class NotNullWithNotBlankNotEmptyModel {
+        @NotNull
+        @NotBlank
+        public String notNullAndNotBlank;
+
+        @NotNull
+        @NotEmpty
+        public List<String> notNullAndNotEmptyList;
+
+        @NotNull
+        @NotEmpty
+        public Set<String> notNullAndNotEmptySet;
+    }
+
+    static class CollectionWithNotEmptyModel {
+        @NotEmpty
+        public List<String> notEmptyList;
+
+        @NotEmpty
+        public Set<String> notEmptySet;
+    }
+
+    static class StringWithNotBlankAndSizeModel {
+        @NotBlank
+        @Size(min = 5, max = 10)
+        public String notBlankAndSized;
+    }
 }